Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
12702 commits 3 branches 0 tags 405 MiB
Commit graph

4105 commits

Author SHA1 Message Date
drigato
ac60a927d4 Merge branch '2.5.x' into saas 2014-09-12 16:31:58 -04:00
drigato
2729202dc4 Corrected japanese locale from ja to ja_JP 2014-09-12 16:29:47 -04:00
Albert Santoni
662f9d3486 LocaleController path fix 2014-09-08 21:18:57 -04:00
Albert Santoni
2a96c6ec5b Merge branch '2.5.x' into saas 2014-09-08 20:49:55 -04:00
Albert Santoni
f7b6e3379e Enable Japanese locale 2014-09-08 20:49:08 -04:00
Albert Santoni
142060d600 Merge remote-tracking branch 'origin/2.5.x' into saas 2014-09-08 20:47:38 -04:00
drigato
a21b4f177d Fixed a bug where we weren't checking if a variable was empty before using it 2014-09-08 13:14:23 -04:00
drigato
6598401266 Fixed a bug where we weren't checking if a variable was empty before using it 2014-09-08 11:48:18 -04:00
Albert Santoni
ef46b1facc Whitelist account.sourcefabric.com for CORS 2014-09-04 19:11:09 -04:00
Albert Santoni
4c1e6d3fe3 Fixed base URL 
Conflicts:
	airtime_mvc/application/controllers/LocaleController.php
 2014-09-04 17:09:09 -04:00
Albert Santoni
f157cad877 Fix silly CAPTCHA flow, now only asks if you get your password wrong 4 
times in a row
 2014-09-03 11:43:06 -04:00
drigato
2cc7557cb7 Remove php short tag for better compatibility 2014-08-29 17:10:55 -04:00
drigato
ace883c975 Merge branch 'cc-5709-airtime-analyzer' into saas-fix-modules-bootstrap-14-04 
Conflicts:
	airtime_mvc/application/configs/application.ini
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
	airtime_mvc/application/models/Cache.php
 2014-08-28 17:01:03 -04:00
drigato
0ccc7e7dc9 SAAS-470: Zend Rest module doesn't work on Ubuntu 14.04 
The Bootstrap.php in the modules directory didn't like
short php tags.
 2014-08-28 16:52:47 -04:00
drigato
52f3ed816e Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
 2014-08-28 12:01:42 -04:00
drigato
9fe0830dfd Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LoginController.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
 2014-08-28 11:59:41 -04:00
Albert Santoni
716cc5a754 Disable the APC cache for Ubuntu 14.04. APC is deprecated now so we need a better solution anyways. 2014-08-27 18:51:06 -04:00
Albert Santoni
77ff4ffc3a Merge branch '2.5.x' into saas 2014-08-26 13:34:09 -04:00
Albert Santoni
d1971b6d2b Remove cc_locale table and add Selenium running script 
* Fixes CC-5906
 2014-08-26 13:32:35 -04:00
drigato
20a5649dbe Removed unused code. 
Changed linked show warning message in the edit show form.
 2014-08-25 18:33:29 -04:00
drigato
10cb5484fe Removed unused function. 
Removed commented out code.
Renamed fillNewLinkedInstances to fillLinkedInstances.
Streamline show instance content if a show goes from unlinked to linked.
 2014-08-25 18:33:15 -04:00
Albert Santoni
32e06a7456 Clean up and simplifcation of linked show filling 2014-08-25 18:33:00 -04:00
drigato
e3596dfed3 Added comments and removed some unused code 2014-08-25 18:32:41 -04:00
drigato
29c07f2438 Removed old comments 2014-08-25 18:32:27 -04:00
drigato
d81de5c6eb Better way of getting the linked show schedule and moved that into its own function. 
Store the ids of the new, created show instances so we can pass them to the
fillNewLinkedInstances function
 2014-08-25 18:32:08 -04:00
drigato
57c1e76dc7 Added criteria parameter to CcShow->getFutureInstanceIds so we can retrieve results from database instead of cache 2014-08-25 18:31:58 -04:00
drigato
08e82cb32e CC-5904: New linked show instances may get an old copy of the schedule 
Change the way get the show stamp
 2014-08-25 18:31:45 -04:00
drigato
9a6e617f7c CC-5904: New linked show instances may get an old copy of the schedule 
Better way of getting show stamp
Renamed variables
 2014-08-25 18:31:33 -04:00
drigato
81357bc51f CC-5904: New linked show instances may get an old copy of the schedule 2014-08-25 18:31:20 -04:00
drigato
ee52c7692c CC-5902: Linked Shows -> Replace content check assumes content of shows have the same number of tracks 
Conflicts:
	airtime_mvc/application/services/SchedulerService.php
 2014-08-25 18:30:27 -04:00
drigato
afc3d981e8 Commented out unnecessary functions using too much memory 2014-08-25 18:26:46 -04:00
Albert Santoni
192c4e884f Bugfix in LocaleController 2014-08-25 18:19:11 -04:00
Albert Santoni
c55a3a4d74 Use SSL with Recaptcha to fix it 2014-08-25 18:19:00 -04:00
Albert Santoni
d438587ddc Merge branch '2.5.x' into saas 
Conflicts:
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/airtime/CcShow.php
	airtime_mvc/application/services/SchedulerService.php
	airtime_mvc/application/services/ShowService.php
 2014-08-25 18:09:51 -04:00
Albert Santoni
80b9bcdfc6 Use SSL with Recaptcha to fix it 2014-08-25 14:45:04 -04:00
Albert Santoni
0fb9429a9e Bugfix in LocaleController 2014-08-25 14:18:23 -04:00
Albert Santoni
55682dc7a9 Bugfix in Airtime 2.5.3 upgrader class 2014-08-25 14:04:25 -04:00
drigato
bc63669853 Removed unused code. 
Changed linked show warning message in the edit show form.
 2014-08-21 17:12:54 -04:00
drigato
6249deb1ac Removed unused function. 
Removed commented out code.
Renamed fillNewLinkedInstances to fillLinkedInstances.
Streamline show instance content if a show goes from unlinked to linked.
 2014-08-21 16:40:01 -04:00
Albert Santoni
11de8bd988 Clean up and simplifcation of linked show filling 2014-08-21 13:39:25 -04:00
drigato
2a2b4bd05a Added comments and removed some unused code 2014-10-15 17:11:38 -04:00
drigato
660b1a0596 Removed old comments 2014-08-21 09:47:54 -04:00
drigato
4c03e12ea1 Better way of getting the linked show schedule and moved that into its own function. 
Store the ids of the new, created show instances so we can pass them to the
fillNewLinkedInstances function
 2014-08-20 16:37:44 -04:00
drigato
a5704eac6e Added criteria parameter to CcShow->getFutureInstanceIds so we can retrieve results from database instead of cache 2014-08-20 16:35:59 -04:00
drigato
4a124a8faf CC-5904: New linked show instances may get an old copy of the schedule 
Change the way get the show stamp
 2014-08-18 19:27:42 -04:00
drigato
3fa15913c0 CC-5904: New linked show instances may get an old copy of the schedule 
Better way of getting show stamp
Renamed variables
 2014-08-18 18:55:03 -04:00
drigato
b9ecd00d33 CC-5904: New linked show instances may get an old copy of the schedule 2014-08-18 18:10:45 -04:00
drigato
62f8a65573 Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 
Conflicts:
	airtime_mvc/application/services/SchedulerService.php
 2014-08-18 13:03:22 -04:00
drigato
2cfc20d0c1 CC-5902: Linked Shows -> Replace content check assumes content of shows have the same number of tracks 2014-08-18 12:59:43 -04:00
Albert Santoni
60f4d112e7 Optimized linked shows schedule filling 
* Fairly big improvement in memory usage and execution time for 24 hour linked
  shows (memory usage no longer grows with show length)
 2014-08-15 18:18:57 -04:00