Duncan Sommerville
a84e0761ca
Updated file deletion to remove cc_files rows properly when deleting from the Library
2014-10-08 18:01:06 -04:00
Duncan Sommerville
365184c2b1
Merging upstream pull
2014-09-19 13:15:53 -04:00
Duncan Sommerville
9952c2b58f
Auto generated schema file updates
2014-09-19 13:03:09 -04:00
Duncan Sommerville
2630d88a03
Updated SQL queries to include instance descriptions for API calls
2014-09-19 13:00:44 -04:00
Duncan Sommerville
be90839dbe
Added description field to database calls for getting API information
2014-09-18 18:21:27 -04:00
Duncan Sommerville
17ea198ea4
Added accessor function for Show image path
2014-09-17 19:49:22 -04:00
Duncan Sommerville
3f754c032a
Updated Show model to include show image path
2014-09-16 18:28:39 -04:00
Duncan Sommerville
8494f813ee
Updated sql schema to include image_path in Cc_Show table
2014-09-16 18:13:46 -04:00
Duncan Sommerville
cb80423fdd
Work on adding image upload to add-show form
2014-09-12 18:05:24 -04:00
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
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
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
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
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
81357bc51f
CC-5904: New linked show instances may get an old copy of the schedule
2014-08-25 18:31:20 -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
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
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
b9ecd00d33
CC-5904: New linked show instances may get an old copy of the schedule
2014-08-18 18:10:45 -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
2bc8f6d403
Logging memory usage
2014-08-15 15:36:13 -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
drigato
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
drigato
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
drigato
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
drigato
520387fcad
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-16 11:05:55 -04:00
Albert Santoni
4b4554476a
Error checking if a locale isn't installed
2014-07-28 11:35:19 -04:00
Albert Santoni
490a9c0d06
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-07-15 16:46:20 -04:00
Albert Santoni
7438ecd2b4
Use track metadata from Airtime in playout engine
...
* Resolves CC-5893: Metadata not updated on Airtime Pro
* Report track metadata in the schedule API, and make pypo pass that
along to Liquidsoap via annotations.
* Move HTTP response sanitization for file metadata out of the REST module and into CcFiles
* Slightly improved the terrible exception handling in pypo
2014-07-15 16:41:55 -04:00
Albert Santoni
1aa99e2896
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
2014-07-15 16:41:29 -04:00
Albert Santoni
9b3a26c19a
Fix user deletion, remove spurious logging
2014-07-08 17:45:22 -04:00
Albert Santoni
35e98e468d
Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas
...
Conflicts:
airtime_mvc/application/controllers/LoginController.php
2014-07-02 13:43:09 -04:00
Albert Santoni
54fdb34fc4
Disable APC cache clearing on SaaS
2014-07-02 12:49:37 -04:00
Albert Santoni
f068d5bd9a
Fixed cache merge
2014-07-02 12:36:03 -04:00
Albert Santoni
2794ca1355
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
...
Conflicts:
airtime_mvc/application/controllers/UpgradeController.php
airtime_mvc/application/models/Cache.php
2014-07-02 12:34:33 -04:00
Albert Santoni
728fccc2fe
Fixed Upgrade caching bugs
2014-07-02 12:30:52 -04:00
Albert Santoni
4157c21b28
Merge branch '2.5.x' into saas
2014-06-25 11:25:50 -04:00
Albert Santoni
6c11ef2769
Even better fix, fixes unit tests too
2014-06-25 11:24:19 -04:00
Albert Santoni
bb21f08d87
Merge branch '2.5.x' into saas
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/models/Auth.php
2014-06-25 11:18:56 -04:00
Albert Santoni
15013afa40
Better session handling fix
2014-06-25 11:15:14 -04:00
Albert Santoni
8a5a796858
Undo session fix temporarily until issues resolved
2014-06-24 16:46:10 -04:00
Albert Santoni
72ef576f03
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-23 15:28:50 -04:00
Albert Santoni
24d842c4a6
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/controllers/LoginController.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
2014-06-23 15:26:53 -04:00