c1843f9d6b
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2014-08-27 16:47:26 -04:00
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
6843b528b6
updated translation resources
2014-08-27 01:20:18 +00:00
d1971b6d2b
Remove cc_locale table and add Selenium running script
...
* Fixes CC-5906
2014-08-26 13:32:35 -04:00
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
20a5649dbe
Removed unused code.
...
Changed linked show warning message in the edit show form.
2014-08-25 18:33:29 -04:00
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
32e06a7456
Clean up and simplifcation of linked show filling
2014-08-25 18:33:00 -04:00
e3596dfed3
Added comments and removed some unused code
2014-08-25 18:32:41 -04:00
29c07f2438
Removed old comments
2014-08-25 18:32:27 -04:00
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
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
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
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
81357bc51f
CC-5904: New linked show instances may get an old copy of the schedule
2014-08-25 18:31:20 -04:00
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
afc3d981e8
Commented out unnecessary functions using too much memory
2014-08-25 18:26:46 -04:00
192c4e884f
Bugfix in LocaleController
2014-08-25 18:19:11 -04:00
c55a3a4d74
Use SSL with Recaptcha to fix it
2014-08-25 18:19:00 -04:00
845cabc699
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2014-08-25 10:09:47 -04:00
fb4699433b
updated translation resources
2014-08-25 02:35:12 +00:00
8851efaecf
updated translation resources
2014-08-21 14:12:15 +00:00
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
7bd443f668
CC-5898: Future repeating shows may not get generated and/or filled with content
...
Commented function
2014-08-15 11:09:05 -04:00
20bd2ad9d5
CC-5898: Future repeating shows may not get generated and/or filled with content
...
Refactored show creation into separate function
2014-08-15 11:08:55 -04:00
fe8e004d87
CC-5898: Future repeating shows may not get generated and/or filled with content
...
Create and fill show instances when pypo requests the schedule
Changed getCcShowInstancess function to return all instances
Changed some function calls to retrieve only show instances scheduled in the future
2014-08-15 11:07:26 -04:00
e5881f2530
Corrected false comment about how pypo fetches the schedule
2014-08-14 12:29:52 -04:00
3a77931fcd
updated translation resources
2014-07-31 10:12:13 +00:00
606560b187
updated translation resources
2014-07-29 09:56:25 +00:00
8b6d386629
Merget push branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2014-07-28 21:46:34 -04:00
bf3fa981d5
Added Selenium tests
2014-07-28 21:46:19 -04:00
08cc19749b
updated translation resources
2014-07-28 13:38:07 +00:00
46e5625444
updated translation resources
2014-07-28 11:50:20 +00:00
c2deeb5a5f
updated translation resources
2014-07-28 11:17:15 +00:00
a888eb6b00
updated translation resources
2014-07-28 11:02:06 +00:00
f985ff868e
updated translation resources
2014-07-28 10:53:06 +00:00
cec7c86ce4
updated translation resources
2014-07-28 10:42:19 +00:00
d15d58f6d1
Fix translation script, make it read UTF-8 source files correctly
2014-07-24 16:50:44 -04:00
3b6b0f8b69
updated translation resources
2014-07-02 12:02:12 +00:00
6c11ef2769
Even better fix, fixes unit tests too
2014-06-25 11:24:19 -04:00
15013afa40
Better session handling fix
2014-06-25 11:15:14 -04:00
a2bef67d33
Fix user session storage in multi-tenancy mode
2014-06-23 15:22:44 -04:00
f573257dc6
updated translation resources
2014-06-23 12:32:13 +00:00
7d3bbe00a4
Merge pull request #59 from danielhjames/2.5.x
...
Remove INSTALL file, this information is more up to date in README
2014-06-17 10:28:54 -04:00
8f6a152a77
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2014-06-09 15:36:01 -04:00
9c4b254bab
CC-5756: Scheduler: Different results between Show contents and Add/Remove Contents
2014-06-09 15:35:50 -04:00
23126b49ac
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2014-06-09 15:04:56 -04:00
a7a7df4236
CC-5668: Weekly recordings get overwritten
2014-06-09 15:04:35 -04:00
94f1c95934
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2014-06-09 12:07:45 -04:00
66e6c23311
CC-5634: Can add/remove content to a linked show while one instance is currently playing
2014-06-09 12:07:27 -04:00
Albert Santoni
localizer
drigato
Albert Santoni