Commit Graph

12909 Commits

Author SHA1 Message Date
Albert Santoni f40357f972 Added missing git config stuff 2014-08-27 16:51:37 -04:00
Albert Santoni c1843f9d6b Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2014-08-27 16:47:26 -04:00
Albert Santoni 2ac3633f69 3-way git merge driver for PO files and development bootstrapping script (the start of it anyways) 2014-08-27 16:43:54 -04:00
localizer 6843b528b6 updated translation resources 2014-08-27 01:20:18 +00: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 871ddb47d8 Removed database test that confirms the is_linkable is set to false after a show is un-linked.
Since we removed this behaviour from Airtime, and a show can be linked and unlinked as many
times as the user wants, this test is deprecated.
2014-08-25 18:33:41 -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 474f12117b Added Airtime Pro-specific Selenium tests 2014-08-25 18:22:20 -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
Albert Santoni 845cabc699 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2014-08-25 10:09:47 -04:00
localizer fb4699433b updated translation resources 2014-08-25 02:35:12 +00:00
drigato daaff1e68a Removed database test that confirms the is_linkable is set to false after a show is un-linked.
Since we removed this behaviour from Airtime, and a show can be linked and unlinked as many
times as the user wants, this test is deprecated.
2014-08-21 17:56:00 -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
localizer 8851efaecf updated translation resources 2014-08-21 14:12:15 +00: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
Albert Santoni f072d60ff1 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:17:23 -04:00
drigato 33f397f577 remove memory usage log statements 2014-08-15 16:25:37 -04:00
drigato f863f4dfcf More mem usage logs 2014-08-15 15:41:00 -04:00
drigato 2bc8f6d403 Logging memory usage 2014-08-15 15:36:13 -04:00
drigato 26b210ded9 Commented out unnecessary functions using too much memory 2014-08-15 15:32:52 -04:00
drigato f2929d02f6 CC-5898: Future repeating shows may not get generated and/or filled with content
Commented function
2014-08-15 15:41:55 -04:00
drigato 22218079af CC-5898: Future repeating shows may not get generated and/or filled with content
Refactored show creation into separate function
2014-08-15 15:35:58 -04:00