Commit Graph

3750 Commits

Author SHA1 Message Date
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 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 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 aa8a26271c Fix zend routing on Trusty (weird error due to REST module) 2014-08-01 11:51: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 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
Albert Santoni e5a74e7285 Fix error due to bad exception throwing 2014-06-11 13:35:10 -04:00
drigato 9c4b254bab CC-5756: Scheduler: Different results between Show contents and Add/Remove Contents 2014-06-09 15:35:50 -04:00
drigato 94f1c95934 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2014-06-09 12:07:45 -04:00
drigato 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 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 a07121787f CC-5833: Update airtime demo w/o o.p.s. 2014-06-06 17:12:55 -04:00
drigato ee489b39f9 CC-5869: Changing a repeating show to non-repeating and changing start time does not work 2014-06-06 14:51:01 -04:00
drigato e4bb97bcc4 CC-5867: Can't edit show instance 2014-06-06 12:22:59 -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 a12ebf2cb1 CC-5836: Status page still reports media-monitor even AA enabled 2014-06-04 18:23:18 -04:00
Albert Santoni e3c2ae03b3 Fixed upload file count being wrong in Add Media page (lemma to CC-5863) 2014-06-04 14:15:36 -04:00
Albert Santoni a969f8fc44 CC-5856: Analyzer metadata exception
* Fixed parsing of metadata when there's empty lists returned (mutagen's
  API is awful)
* Return HTTP 422 if there's any exception in validating the metadata
2014-06-03 12:43:01 -04:00
Albert Santoni 2e6d3821ae CC-5863: Deleted files still shown in Recent Uploads view
* Fixed
2014-06-02 14:14:09 -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
Albert Santoni 1373d4984f CC-5862: Invalid UTF-8 chars cause DB error
* Strip and validate UTF-8 strings in the Media API
* Also properly parse track numbers containing "-"
2014-05-30 13:02:19 -04:00
drigato 9eb0f2f3b3 CC-5859: Airtime Analyzer: format fields before writing to db 2014-05-26 17:13:45 -04:00
Albert Santoni e1a0429939 Handle error case that could cause invalid disk usage reading 2014-05-22 19:16:42 -04:00
Albert Santoni 091be8cea3 SAAS-439: Genres longer than 64 characters cause Media API exception
* Truncate the genre field in the Media API
2014-05-22 18:40:05 -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