drigato
54d1bcf81e
Merge branch '2.5.x' into cc-5709-airtime-analyzer
2014-10-30 12:15:41 -04:00
drigato
1d3180cc80
CC-5932: Update is_scheduled query is too slow
...
Forgot to remove some debugging statements
2014-10-28 10:29:25 -04:00
drigato
eae1b4e17c
CC-5932: Update is_scheduled query is too slow
2014-10-28 10:25:40 -04:00
Duncan Sommerville
d4e8eed51d
Marked old functions for API calls as deprecated
2014-10-27 15:52:58 -04:00
Duncan Sommerville
e6b9a71d00
Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x
2014-10-24 15:12:17 -04:00
Duncan Sommerville
598b18b65a
Added live-info-v2 and station metadata api calls
2014-10-24 15:11:27 -04:00
drigato
8134687c24
Merge branch '2.5.x' into cc-5709-airtime-analyzer
2014-10-22 17:13:42 -04:00
Robert Elder
f29f30e3ac
Include base_dir in session namespaces.
2014-10-22 14:37:47 +00:00
drigato
c4692cc0d7
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/controllers/PluploadController.php
airtime_mvc/application/views/scripts/plupload/index.phtml
2014-10-08 11:46:08 -04:00
drigato
3c797c044a
Undoing make API on by default for now. This needs to be done in the db
2014-09-19 15:41:55 -04:00
drigato
66b97158b7
Make API on by default - fix
2014-09-19 15:30:06 -04:00
drigato
2729202dc4
Corrected japanese locale from ja to ja_JP
2014-09-12 16:29:47 -04:00
Albert Santoni
f7b6e3379e
Enable Japanese locale
2014-09-08 20:49:08 -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
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
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
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
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
6c11ef2769
Even better fix, fixes unit tests too
2014-06-25 11:24:19 -04:00
Albert Santoni
15013afa40
Better session handling fix
2014-06-25 11:15:14 -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
Albert Santoni
a2bef67d33
Fix user session storage in multi-tenancy mode
2014-06-23 15:22:44 -04:00
drigato
9c4b254bab
CC-5756: Scheduler: Different results between Show contents and Add/Remove Contents
2014-06-09 15:35:50 -04:00
Albert Santoni
560d1a9b14
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
2014-06-09 11:36:51 -04:00
Albert Santoni
345c782eb9
Fixed the unit tests and changed ops->zu
2014-06-09 11:34:25 -04:00
Albert Santoni
cc19b18d7f
CC-5588: Specific user can't see Library because ColReorder is null for
...
their account
2014-06-05 18:04:42 -04:00
Albert Santoni
9f9c32aec3
Merge branch '2.5.x' into cc-5709-airtime-analyzer
2014-05-30 17:12:42 -04:00
Albert Santoni
61be4875fb
CC-5343: Missing files can be scheduled via playlists
...
* Fixed it by adding a check for this.
2014-05-30 17:11:12 -04:00
drigato
8432799b9a
CC-5853: Tracks marked as 'hidden' won't be marked as unavailable in Now Playing page
2014-05-22 14:47:14 -04:00
drigato
4cdd855a21
CC-5855: Output to zendlog when files are deleted from library
2014-05-20 14:15:51 -04:00
drigato
16fb9d75d3
Changed GetDiskUsage so it will always return 0 if the value has not been set yet
2014-05-05 12:25:42 -04:00
Albert Santoni
2d6748457c
Remove database credentials from application.ini
2014-05-02 15:50:37 -04:00
drigato
d081ff10b2
CC-5807: Disk Space will be updated when file is not actually deleted
2014-04-28 10:25:36 -04:00
Naomi
fe20cc7f63
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
2014-04-23 15:58:39 -04:00
Naomi
578f758274
CC-5810 : Installation can have race conditions with the cache
...
Preferences.php is used to set values since it will save the value to cache there as well.
defaultdata.sql is used where possible.
2014-04-23 15:41:15 -04:00
drigato
df9482f2ff
CC-5795: Airtime Analyzer: "Delete file" in Library doesnt remove it from path
...
Media monitor was still being used to delete the file from stor
2014-04-17 16:08:02 -04:00
drigato
f5a2e59b6d
Removed disk space check from StoredFile. This is now done in the Media controller
2014-04-16 12:15:34 -04:00
drigato
53ffa29b6b
CC-5786: Quota Enforcement in the File Upload API
...
small fix
2014-04-14 12:21:59 -04:00
drigato
63e2eda64b
CC-5786: Quota Enforcement in the File Upload API
...
Tweaked this so it will work on self-hosted instances
2014-04-14 12:09:15 -04:00
Albert Santoni
e4af3a5a0e
CC-5709: Airtime Analyzer
...
* Better SIGTERM handling for airtime_analyzer
* Nuke the .identifier files saved by Airtime
2014-04-08 17:28:50 -04:00
Albert Santoni
95b369c54d
CC-5709: Airtime Analyzer
...
* Remove awful StoredFile::uploadFile() function
* Massive airtime_analyzer commenting and cleanup
* Cleaned up the upload code
* Temporarily disabled the liquidsoap playability test.
2014-04-03 16:13:26 -04:00
drigato
70228a675e
Changed default import_status value on cc_files table to 1 (pending)
2014-04-01 11:28:33 -04:00