Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,681 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

2642 Commits

Author SHA1 Message Date
Duncan Sommerville 02be09b5ff Fixed issue with improper array initialization 2014-11-05 10:15:16 -05:00
Duncan Sommerville 5275669211 Updated i18n to use multiple domains 2014-11-04 17:03:52 -05:00
drigato 0a45de7fba Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas 
Conflicts:
	.gitignore
	airtime_mvc/application/configs/airtime-conf.php
	airtime_mvc/application/configs/classmap-airtime-conf.php
	airtime_mvc/application/models/RabbitMq.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/application/models/airtime/map/CcShowInstancesTableMap.php
	airtime_mvc/application/models/airtime/map/CcShowTableMap.php
	airtime_mvc/application/models/airtime/om/BaseCcShow.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstances.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstancesPeer.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstancesQuery.php
	airtime_mvc/application/models/airtime/om/BaseCcShowPeer.php
	airtime_mvc/application/models/airtime/om/BaseCcShowQuery.php
	airtime_mvc/application/modules/rest/Bootstrap.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/build/sql/schema.sql
	airtime_mvc/public/index.php
 2014-11-03 12:29:58 -05:00
drigato b871b32175 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 2014-10-30 12:17:34 -04:00
drigato 54d1bcf81e Merge branch '2.5.x' into cc-5709-airtime-analyzer 2014-10-30 12:15:41 -04:00
drigato e23649173d Added comments to CcFiles and CloudFile classes. 2014-10-30 12:12:47 -04:00
drigato 10f3c0a290 Merge branch '2.5.x' into saas 2014-10-28 10:29:42 -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 64a68c972d Merge branch '2.5.x' into saas 2014-10-28 10:26:14 -04:00
drigato eae1b4e17c CC-5932: Update is_scheduled query is too slow 2014-10-28 10:25:40 -04:00
Duncan Sommerville 275ca5eed6 Resolved differences merging 2.5.x into saas 2014-10-27 16:25:42 -04:00
Duncan Sommerville d4e8eed51d Marked old functions for API calls as deprecated 2014-10-27 15:52:58 -04:00
drigato 7018f45c0a Check filesize is greater than zero before deleteing a file from library 2014-10-27 12:39:02 -04:00
drigato 7edd993fa3 Reverted pypo's copy file method to how it was without cloud files 
and instead directly call the cloud file's downloader method.
 2014-10-24 15:50:52 -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 70ff67374b Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 
Conflicts:
	python_apps/airtime_analyzer/airtime_analyzer/filemover_analyzer.py
 2014-10-22 17:16:46 -04:00
drigato 8134687c24 Merge branch '2.5.x' into cc-5709-airtime-analyzer 2014-10-22 17:13:42 -04:00
drigato 9726fb80d2 Removed amazon s3 signature from pypo cache file name. 
Stopped pyppo from downloading amazon s3 files if it already exists in the pypo cache dir.
 2014-10-22 14:17:44 -04:00
Robert Elder f29f30e3ac Include base_dir in session namespaces. 2014-10-22 14:37:47 +00:00
drigato f775bedb49 Stopped returning filesize in delete functions. 
Created an Amazon S3 wrapper class around Zend_Service_Amazon_S3 to add more functionality.
 2014-10-21 16:05:50 -04:00
Robbt fe291cdc8c Added sort tracks by upload time to smart blocks criteria 2014-10-19 23:02:40 -04:00
drigato 544d20ebc2 Replaced spaces with dashes in resource_id generation 
Fixed track preview and download signed urls
Removed cloud_storage_deleter.py file
Changed cloud_storage settings in airtime.conf
 2014-10-17 17:16:53 -04:00
drigato a10e287368 Fixed a fresh install bug that wasn't using composer installs. 
Fixed a cloud file download bug where it was downloading the wrong track.
Working on amazon s3 signed urls for private objects.
Added cloud storage configuration to install script.
 2014-10-14 16:54:58 -04:00
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
drigato 2423ea6787 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 2014-10-08 11:46:30 -04: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
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
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 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
drigato ca62086e16 Removed cloud file deletion from Airtime Analyzer. Deletion is done from PHP now. 2014-08-12 12:59:50 -04:00
drigato 879e776c8d CC-5888: Handle file deletion if the file is stored in the cloud 2014-08-12 12:32:49 -04:00
drigato 46228341b2 Audio preview fix 2014-08-12 11:39:29 -04:00
drigato 35c450be3f Audio preview fix 2014-08-12 11:33:10 -04:00
drigato dd37ffbdd7 CC-5888: Handle file deletion if the file is stored in the cloud 
Execute a python script that deletes a file from the cloud
 2014-07-31 23:11:49 -04:00
drigato 8c2754972e CC-5896: Store cloud files in separate table, inherited from cc_files 
Refactored storedfile->delete()
Added a deletePhysicalFile function to CcFile and CloudFile
Cleaned up schedule events that get passed to Pypo
 2014-07-29 15:07:51 -04:00
drigato 6fa7ddba9a CC-5896: Store cloud files in separate table, inherited from cc_files 
Added delete on cascade for cloud files
 2014-07-28 16:03:57 -04:00
drigato f6aa2e5a3b CC-5896: Store cloud files in separate table, inherited from cc_files 
For cloud files, return the original filename when downloading a file instead of the cloud object name
 2014-07-28 16:02:06 -04:00
Albert Santoni 4b4554476a Error checking if a locale isn't installed 2014-07-28 11:35:19 -04:00
drigato f1ea100411 CC-5896: Store cloud files in separate table, inherited from cc_files 2014-07-24 16:56:15 -04:00
drigato 41ff0cce67 CC-5896: Store cloud files in separate table, inherited from cc_files 
Using Class Table Inheritance - delegate behaviour, created a cloud_file
table to store cloud files
 2014-07-23 15:22:42 -04:00
drigato 72841de714 CC-5895: Upgrade Propel to 1.7 
Used composer to download Propel 1.7
The Propel library will no longer be stored in the Airtime repo
 2014-07-23 15:03:51 -04:00
Albert Santoni c09457ce7c Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 2014-07-16 15:03:39 -04:00
drigato 7ca6b91cdf CC-5888: Handle file deletion if the file is stored in the cloud 2014-07-16 12:03:22 -04:00
drigato aaee522ec6 CC-5888: Handle file deletion if the file is stored in the cloud 2014-07-15 17:20:04 -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
drigato 8e714bcb64 CC-5888: Handle file deletion if the file is stored in the cloud 2014-07-15 07:26:39 -04:00
drigato 039a51121b CC-5885: Factor out cloud storage code into separate class 2014-07-11 16:16:30 -04:00
drigato c2411b6f41 CC-5884: Modify Pypo -> Download files from cloud storage 2014-07-10 17:56:41 -04:00
Albert Santoni 9b3a26c19a Fix user deletion, remove spurious logging 2014-07-08 17:45:22 -04:00
drigato aeb3bb7aa0 SAAS-447: Cloud Storage 
Added resource_id column to cc_files table
 2014-07-04 16:34:00 -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
Albert Santoni a2bef67d33 Fix user session storage in multi-tenancy mode 2014-06-23 15:22:44 -04:00
drigato f40cdbc8cd Merge branch 'saas' into cc-5709-airtime-analyzer-buy-now-saas 2014-06-23 10:59:07 -04:00
Albert Santoni 9a84bdfda1 Fixed syntax error 2014-06-20 17:44:30 -04:00
Albert Santoni 0eab0c609b Permissions fixes for Super Admin users 2014-06-20 17:43:20 -04:00
Albert Santoni faa12c8065 Super Admin edit page points to billing now 
* Also prevent super admin from being deleted
 2014-06-20 13:36:06 -04:00
Albert Santoni 7f6fc7770a Added Super Admin role and WHMCS login 2014-06-17 17:40:55 -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 fa3c7bd67a Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-06-09 11:37:06 -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 1624aa4007 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-30 17:13:00 -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 1db308330b Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-22 18:47:21 -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 fb12ee7e54 CC-5855: Output to zendlog when files are deleted from library 
Added host name to log message
 2014-05-20 14:21:41 -04:00
drigato f684ce4ab9 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-20 14:16:24 -04:00
drigato 4cdd855a21 CC-5855: Output to zendlog when files are deleted from library 2014-05-20 14:15:51 -04:00
Albert Santoni e963157a22 Merge branch 'cc-5709-airtime-analyzer-saas' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-saas 2014-05-05 12:42:49 -04:00
Albert Santoni f89c66922b Merge branch '2.5.x-saas' into cc-5709-airtime-analyzer-saas 2014-05-05 12:42:42 -04:00
drigato 5762bb9df5 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-05 12:26:01 -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
drigato a8c428bfb0 Fix disk quota message 2014-05-05 11:52:13 -04:00
drigato e11afd4e71 Fix for new saas instances getting created with a 'disk quota reached' message 2014-05-05 11:41:43 -04:00
Albert Santoni 250d5d083e Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-02 16:06:15 -04:00
Albert Santoni 2d6748457c Remove database credentials from application.ini 2014-05-02 15:50:37 -04:00
drigato b4a9882e9c Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-28 10:27:07 -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
Albert Santoni 446eca057c Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po
	airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
	airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
	airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po
	airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
	airtime_mvc/locale/fr_FR/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/it_IT/LC_MESSAGES/airtime.po
	airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
	airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po
	airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
	airtime_mvc/locale/template/airtime.po
	airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po
 2014-04-25 00:43:22 -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
Albert Santoni 43483dc112 Added dev env to RabbitMQ stuff for Analyzer (fixed) 2014-04-22 12:28:20 -04:00
Albert Santoni a79f53758f Fixed the RabbitMQ thingy 2014-04-22 11:40:35 -04:00
Albert Santoni f106bf8fad Separate RabbitMQ settings by development environment 2014-04-22 11:13:15 -04:00
drigato 411af6838b Remove logging statement 2014-04-17 17:02:14 -04:00
drigato 64ebd9e720 Logging statement 2014-04-17 16:15:04 -04:00
drigato 8979e4e5a9 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-17 16:09:03 -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 edeb4b052a Remove logging statements 2014-04-16 16:53:17 -04:00
drigato f33317ebee Logging for testing 2014-04-16 16:44:31 -04:00
drigato 7c39ab294d Logging for testing 2014-04-16 16:37:38 -04:00
drigato 837decb5c3 Logging for testing 2014-04-16 16:36:19 -04:00
drigato 284a1b8895 Upgrade logging test 2014-04-16 16:29:36 -04:00
drigato db62ffff90 Log statment for testing upgrades 2014-04-16 16:01:48 -04:00
drigato 634b429391 Logging statment for testing upgrades - will be removed 2014-04-16 15:56:45 -04:00
drigato d05eae629a Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-16 12:16:08 -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 10cf16f53a Logging statments 2014-04-16 12:04:18 -04:00
drigato 87f365038f Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-14 12:22:15 -04:00
drigato 53ffa29b6b CC-5786: Quota Enforcement in the File Upload API 
small fix
 2014-04-14 12:21:59 -04:00
drigato 9041801103 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-14 12:09:48 -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 8fb95316f2 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
	airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
 2014-04-09 15:01:11 -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 e044187aed Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	python_apps/airtime_analyzer/setup.py
 2014-04-04 19:48:22 -04:00
drigato cdcdf7d912 SAAS-382: Reimplement Storage Quota 
Changed status page to use new disk_usage value from cc_pref table.
 2014-04-04 13:30:46 -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
Albert Santoni e3757d892b CC-5709: Airtime Analyzer 
* Fix hack for Airtime Pro
 2014-04-02 17:27:10 -04:00
Albert Santoni a6e80e2789 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-01 12:29:20 -04:00
Albert Santoni 7ea2eef233 CC-5709: Airtime Analyzer 
* Use system-wide config for Airtime PHP->airtime_analzyer RabbitMQ
  communication on Airtime Pro
 2014-04-01 12:07:29 -04:00
drigato 70228a675e Changed default import_status value on cc_files table to 1 (pending) 2014-04-01 11:28:33 -04:00
Albert Santoni 1c5e2d6205 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/public/index.php

* Reverted some SaaS-only thing Martin did a year ago. Looks benign but
  only one way to find out...
 2014-03-27 16:38:03 -04:00
Albert Santoni db2b52a1bf CC-5709: Airtime Analyzer 
* Some cleanup and refactoring for file deletion in the Media REST API
* Fix the refresh timer on the Add Media page when there's pending
  imports.
 2014-03-24 17:14:04 -04:00
Albert Santoni efca227388 SAAS-417: Disable Live Chat for Starter Plans 
* Disable Live Chat for Starter Plans
 2014-03-21 14:30:41 -04:00
Albert Santoni 8f7ecafcf6 CC-5709: Airtime Analyzer 
* A bunch of changes that somehow didn't make it into my last commit...
* confused
 2014-03-21 14:03:17 -04:00
drigato 7800cb1e15 SAAS-382: Reimplement Storage Quota 
Storing disk usage in cc_pref
Add/subtract filesize to/from disk usage total when a file is uploaded or deleted
TODO: Hook this into the ftp server
 2014-03-21 09:50:03 -04:00
Albert Santoni 2a783f3825 Merge branch '2.5.x' into 2.5.x-saas 2014-03-17 15:41:14 -04:00
Albert Santoni 50a42f12bb CC-5709: Airtime Analyzer 
* File import via the Add Media page now works!
* Reworked StoredFile::copyFileToStor() because it's still needed.
* Reworked the way file paths are reported in airtime_analyzer
  and in the RESTful media API
 2014-03-17 10:19:39 -04:00
Albert Santoni 451b19150b CC-5709: Airtime Analyzer 
* Notify airtime_analyzer of new uploads with RabbitMQ
* Use a durable exchange for airtime-uploads
 2014-03-13 13:35:48 -04:00
Albert Santoni e6cbbdff33 CC-5709: Airtime Analyzer 
* Added session auth to the Media API (if you're logged in)
* Started reworking our Plupload interaction with the server to be less
  awkward.
* Basic uploading works with the Add Media page again, but messages
  aren't dispatched to airtime_analyzer yet (coming next...)
 2014-03-13 11:14:30 -04:00
drigato bcda9ea5e6 Broke unit test for adding content to single show 2014-03-05 14:50:35 -05:00
drigato ebc68b980c CC-5718: Show content can get scheduled in instances that are in the past 
Disabled scheduled content into instances that have already played out
Removed setting the show's start date to the first repeating instance's start date
because we already fixed that in CC-5697
 2014-03-05 13:12:27 -05:00
drigato b433a529ab CC-5696: Two shows or even three shows playing at once. Unstopable even after reboot 2014-03-03 16:42:52 -05:00
drigato 753003639f CC-5696: Two shows or even three shows playing at once. Unstopable even after reboot 
The problem was that we weren't updating the first show's start time if deleting
a repeat show day changes it. This affected the difference between the original
show start time and the new one.
 2014-02-25 17:22:17 -05:00
drigato cd592827fd CC-5698: Library -> Scheduled column doesn't get updated when bulk adding items 
Array storing file ids of scheduled files was in wrong place
and was getting re-created everytime a file was inserted into a show
 2014-02-24 17:46:16 -05:00
drigato 09040dc021 Merge branch '2.5.x' into 2.5.x-saas 2014-02-03 12:33:57 -05:00
drigato 63ec20d9f1 CC-5681: I18N: Fail to switch language 
Check if Zend_Auth class exists with the autoloader
 2014-02-03 12:33:35 -05:00
drigato b7c79df6ec Merge branch 'unittests' into 2.5.x 2014-01-31 15:02:41 -05:00
Albert Santoni c7c2d37b30 Merge branch '2.5.x' into 2.5.x-saas 2014-01-31 13:21:33 -05:00
drigato 883e8885c7 CC-5677: Library -> Scheduled column gets updated on incorrect file 2014-01-30 12:38:18 -05:00
Albert Santoni d68227939f Merge branch '2.5.x-saas' of github.com:sourcefabric/Airtime into 2.5.x-saas 2014-01-29 17:20:53 -05:00
Albert Santoni 03015a6b69 Nerf the APC cache on SaaS 
* We have multiple webservers on SaaS so we need a distributed data
  cache like memcached.
* Fixes CC-5671: Live streaming: UI won't update connection status unless reload apache2
 2014-01-29 17:19:24 -05:00
drigato 719d582e0f Merge branch '2.5.x' into 2.5.x-saas 2014-01-29 12:13:24 -05:00
drigato 7a04f7d98e CC-5672: Webstream warnings on SaaS 
Don't parse/use header info if get_headers returns false
 2014-01-29 12:09:05 -05:00
Albert Santoni ed78625fce Merge branch '2.5.x' into 2.5.x-saas 2014-01-27 12:01:11 -05:00
Albert Santoni 52c3971fc6 Fixed a bug in Application_Model_SetShowsPopulatedUntil 2014-01-22 17:58:25 -05:00
drigato a648f7fa2d CC-5665: Timeout can occur when scheduling large playlists into linked shows 
Added a temporary fix by extending the php time limit
 2014-01-09 11:57:32 -05:00
Naomi Aro 49474ab5c4 Merge branch '2.5.x' into 2.5.x-saas 
Conflicts:
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
 2013-12-17 17:20:38 -05:00
drigato dc05d9ddaf CC-5649: Remove unused function, Application_Model_Show::populateAllShowsInRange 2013-12-17 17:09:59 -05:00
Albert Santoni 6a468ff549 Fix a rendering problem if a zero length show happens 2013-12-13 18:27:14 -05:00
Albert Santoni 346036a9ca Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 
Conflicts:
	airtime_mvc/application/models/Show.php
 2013-12-13 16:12:26 -05:00
Albert Santoni fa0a190277 Prevent division by zero if show lengths end up being zero 2013-12-13 16:10:36 -05:00
Naomi 99902bc10c CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 2013-12-13 15:16:51 -05:00
Naomi 445f1ebe4f CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 
removing old crappy method.
 2013-12-13 15:14:38 -05:00
Naomi 7a51b8d2ad CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 2013-12-13 15:06:52 -05:00
Naomi a45235d39b CC-5627 : Check all Application_Common_DateHelper calculations that use timezone 2013-12-13 15:03:02 -05:00
Albert Santoni 27f0fa27e9 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-12 13:32:25 -05:00
Albert Santoni a96c2551ef CC-5627 : Check all Application_Common_DateHelper calculations that use 
timezone.

* Fixed GetPlayOrderRange to be consistently return everything in UTC.
* ApiController liveInfoAction now returns everything consistently in
  the station timezone. This fixes negative remaining time that could
  occur in the embeddable JS Airtime widgets if you were logged in to
  Airtime while you viewed your website. (The widgets display in
  the browser's local time.)
* ScheduleController getCurrentPlaylistAction() returns everything
  consistently in the user timezone now.
 2013-12-12 13:28:51 -05:00
drigato 974be86691 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-12 11:48:11 -05:00
drigato 9bbc3cf713 CC-5633: Can schedule overlapping shows 
The overlapping show check was returning false too early
 2013-12-12 11:48:00 -05:00
Albert Santoni f2fe04ba1d Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-12 11:33:28 -05:00
Albert Santoni 8986f1bc4f CC-5627 : Check all Application_Common_DateHelper calculations that use 
timezone.

* Changed getRangeStartAndEnd() to use UTC explictly
 2013-12-12 11:32:40 -05:00
Naomi 37ea29380b Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-11 18:56:29 -05:00
Naomi 67031a75fe CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 2013-12-11 18:56:19 -05:00
Albert Santoni abf3a50694 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-11 18:22:08 -05:00
Albert Santoni a9bd34fbcb CC-5627: Check all Application_Common_DateHelper calculations that use 
timezone.

* Eliminate more strtotime usage, could fix on air light weirdness in
  some circumstances.
 2013-12-11 18:20:40 -05:00
Naomi e6c971387b Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-11 17:35:47 -05:00
Naomi e6d28b250e CC-5629 : Smart Block timestamps aren't saved in UTC time 2013-12-11 17:35:31 -05:00
drigato 3a50f7a6dc Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-11 16:55:47 -05:00
drigato cfb6195523 CC-5632: System preferences don't get saved 2013-12-11 16:55:35 -05:00
Naomi b13d12eaac CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 2013-12-11 15:20:19 -05:00
Naomi 3a2f9a24b5 CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 
working on getting widgets to work properly returning station local time.
 2013-12-10 16:45:05 -05:00
Naomi 0f28e0f1aa Merge branch '2.5.x' into cc-5594-date_default 2013-12-06 18:18:17 -05:00
Albert Santoni 2c7db0e83c CC-5555: Fix user preferences logic in preferences cache 
* Fixes stream settings not dislaying
 2013-12-06 17:11:07 -05:00
Naomi 061897a58b CC-5594 : Remove all date_default_timezone_get() 
never rely on this method.
 2013-12-05 16:00:52 -05:00
Naomi ec6a991090 CC-5594 : Remove all date_default_timezone_get() 
missed a place to set show timezone,
setting UTC timezone in CcSchedule, very important!!
 2013-12-05 15:57:00 -05:00
Naomi ed74470803 CC-5594 : Remove all date_default_timezone_get() 
updating dashbaord information for timezone.
 2013-12-04 17:54:28 -05:00
Naomi e508d141ed CC-5594 : Remove all date_default_timezone_get() 
resizing must calculate from displayed calendar settings.
 2013-12-04 15:48:32 -05:00
Naomi e71f306c7d CC-5594 : Remove all date_default_timezone_get() 
setting display time using user timezone.
last played was never converted properly for display previously.
 2013-12-04 15:24:27 -05:00
Naomi 10d8351f93 CC-5594 : Remove all date_default_timezone_get() 
setting display timezone to be user's timezone for library utime and mtime.
 2013-12-04 15:16:07 -05:00
Naomi aafeeb6aed CC-5594 : Remove all date_default_timezone_get() 
replacing timezone with the user timezone pref.
 2013-12-04 15:11:40 -05:00
Naomi c8cfdadb90 CC-5594 : Remove all date_default_timezone_get() 
removing unused old methods, changing listener stats to use the user timezone for display.
 2013-12-04 15:06:07 -05:00
Naomi 82b40f52e7 Merge branch '2.5.x' into cc-5594-date_default 2013-12-04 14:42:30 -05:00
Naomi 447ad4e3c6 CC-5594 : Remove all date_default_timezone_get() 
correcting show contents timezone.
 2013-12-04 14:39:56 -05:00
Naomi e6808b0c12 CC-5594 : Remove all date_default_timezone_get() 
removing now unused old methods
 2013-12-04 14:31:23 -05:00
drigato 7f8f084c98 CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show 
Refactored cc_show_day->getLocalEndDateAndTime() function
 2013-12-04 14:17:19 -05:00
Naomi c9773d2a0e CC-5594 : Remove all date_default_timezone_get() 2013-12-04 14:13:19 -05:00
drigato 463d286ac5 CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show 
Refactored cc_show->isRepeating() function
 2013-12-04 14:00:31 -05:00
drigato b78fa994f7 CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show 
Removed redundant timestamp var
Removed redundant DateTime object creation
 2013-12-04 12:20:16 -05:00
drigato ef8af1b724 CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show 
- Fixed resizing repeating shows to not include edited instances
- Fixed context menu on repeating shows with edited instances
- Fixed populated the show form when editing a single instance
 2013-12-04 09:00:43 -05:00
drigato a465b5a770 CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show 
Create a new cc_show_day rule instead of a new cc_show
 2013-12-04 09:00:43 -05:00
drigato 4253608948 Small fix to overlapping show check 2013-12-03 15:14:53 -05:00
drigato c18d53f403 CC-5593: Overlapping Show Bug 
Get instance depending on whether instance id is provided or not
 2013-12-03 15:07:40 -05:00
drigato d49131db48 CC-5593: Overlapping Show Bug 
Need to check if the show instance has been deleted
 2013-12-03 14:39:53 -05:00
drigato eae93008b4 CC-5589: SQL error when adding/moving a scheduled item 
Error was occuring when a moved item didn't exist in a linked show instance
Error was also occuring when trying to insert item into a schedule localtion
that does not exist in a linked instance.

Fixed by skipping the move action if the file does not exist in a linked instance,
cleaning up the position numbers after deleting schedule items, and by
setting the insert time to the show start time in a linked instance is empty
 2013-12-02 16:40:15 -05:00
drigato 89feb3d0fb Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-11-22 09:39:37 -05:00
drigato 52f0d5a13b CC-5570: Tracks get scheduled ahead of their show start time 2013-11-22 09:39:19 -05:00
Naomi 757e35aaf9 CC-5555 : Implement simple caching for preferences 
comment out logging to not flood logs.
 2013-11-11 17:22:55 -05:00
Naomi b8a084998e CC-5555 : Implement simple caching for preferences 
cache key creation change.
 2013-11-11 17:08:15 -05:00
Naomi f615e176e2 CC-5555 : Implement simple caching for preferences 
better to include the key in the error message
 2013-11-11 16:36:21 -05:00
Naomi f69dd123ca CC-5555 : Implement simple caching for preferences 
making sure locale/timezone is returned properly in generic calls.
 2013-11-11 16:32:43 -05:00
Naomi 06323a40fd CC-5555 : Implement simple caching for preferences 
fixing up code so user id is never passed in manually to a preference getter.
 2013-11-11 16:20:51 -05:00
Naomi f45708682f CC-5555 : Implement simple caching for preferences 
using apc to save/fetch preferences to/from a cache.
 2013-11-11 15:07:13 -05:00
Naomi 24663d9851 Merge branch '24hourfileimport' into 2.5.x 2013-10-16 17:29:22 -04:00
Naomi 02dbde82ec CC-5429 : importing file > 24 hours doesn't work 2013-10-16 17:27:40 -04:00
Albert Santoni 0d74d744da Merge branch '2.5.x' of https://github.com/danielhjames/Airtime into 2.5.x 2013-10-16 16:49:15 -04:00
Naomi fa5c1018bf CRLF 2013-10-16 16:01:30 -04:00
Naomi 60cbd15381 CC-5428 : Ordering by length not working 2013-10-16 15:56:32 -04:00
Naomi 109b313d37 CC-5424 : Same webstream playing will switch off ON AIR light 2013-10-16 12:26:39 -04:00
denise b62fde46e7 CC-5407: Scheduling problem with global crossfade 
Sometimes we set a flag to not apply the global crossfade value when inserting tracks.
This flag needs to get reset when more than one track is getting inserted or when
inserting an item into a linked show
 2013-10-15 15:20:58 -04:00
Naomi 73e5fa8a90 CC-5410 : Now playing icon should not lag to show up on calendar 2013-10-11 18:15:12 -04:00
denise c85833239c CC-5379: adding a file after a gap in now playing - starts too early 
Fixed the start time in cc_schedule
Track still starts playing later than cue in (CC-5019)
 2013-10-10 12:11:23 -04:00
Daniel James febadd08b9 Updated comment to explain newer repeat types 2013-10-10 10:43:45 +01:00
denise ff28daf28e CC-5378: Subseconds are gone from cc_schedule calulations 
Formatting error
 2013-10-07 16:58:57 -04:00
Naomi c707967567 CRLF 2013-10-02 11:25:40 -04:00
Naomi faa6c7210c Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-02 11:25:08 -04:00
Naomi 4d01e3b11f CC-5347 : isScheduled doesn't work for webstreams 2013-10-02 11:24:48 -04:00
denise 3d9bc85fa0 Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-01 08:49:10 -04:00
Naomi 1fa13eed13 CRLF 2013-09-30 13:59:08 -04:00
Naomi 7d739a0f66 CC-5316 : Playout History: Doesn't support webstream 
adding the webstream metadata to the history table.
 2013-09-30 13:56:27 -04:00
denise af03502592 CC-5323: User's Timezone Can Improperly Edit Show 
-added comments to timezone getters and setters in Prefences model
 to reduce confusion on station timezone and user timezone
 2013-09-25 16:22:30 -04:00
denise 107263ae20 CC-5323: User's Timezone Can Improperly Edit Show 2013-09-25 16:22:30 -04:00
Daniel James 577bbf14b6 Remove swear words from source code 2013-09-23 16:16:51 +01:00
Naomi Aro ae1c41e4ce CC-5333 : Rebroadcast Shows are not created 2013-09-23 12:20:10 +02:00
Naomi Aro 682a37894b Merge branch 'ryerson-history' into 2.5.x-saas 
Conflicts:
	airtime_mvc/application/views/scripts/menu.phtml
 2013-09-02 15:52:43 -04:00
Naomi Aro 60bf334aeb Merge branch '2.4.x' into 2.4.x-saas 2013-09-02 15:46:25 -04:00
Naomi 075342c637 don't delete a history item if a show instance is removed from the database. 2013-08-30 16:43:05 -04:00
Naomi 4fd37a4fa0 Merge branch '2.4.x' into ryerson-history 2013-08-30 16:07:41 -04:00
Naomi Aro 15e27f8166 history records for a show have times validated within show range. 2013-08-30 00:43:43 -04:00
Naomi 8208f8596b ordering by show start time 2013-08-29 15:37:33 -04:00
Naomi 653a6384b9 creating a separate controller for playouthistory templates. 2013-08-28 18:25:46 -04:00
Naomi 5aa983be36 adding an instance id to the playout history table. 2013-08-28 17:15:36 -04:00
Naomi 969889859b improper naming of propel tables in php caused cc_mount_name to not get any generated files, double declaration of some variables for cc_timestamp. 2013-08-28 13:07:55 -04:00
drigato c48f556b7d CC-5303: Interface freezes sometimes when using smart blocks 2013-08-13 16:41:32 -04:00
Naomi 27b079ace9 adding a label to the form fields (Datatables column headers) 2013-08-07 17:55:18 -04:00
Naomi 774027c9bd crlf 2013-08-02 15:30:35 -04:00
Naomi c110b4b4df file summary table now starting to work with templates.need to change query around to be configurable still. 2013-08-02 15:29:39 -04:00
Naomi 7ca3048f36 can add a new list item using the template. 
set a default item template

working on sql to get a table with unified columns for file md and manually entered metadata without a file.
 2013-07-30 19:24:05 -04:00
Naomi 06e21029d0 saving a template to the DB. 2013-07-29 17:35:07 -04:00
Naomi 8eecbb18c0 propel rename done for template fields, template name input. 2013-07-29 17:21:46 -04:00
Naomi 16581088d9 working on configuring an item template UI. 
modified db to have fields concept for templates.
 2013-07-29 16:31:01 -04:00
Naomi 69afc715d1 creating templates for validation. 2013-07-22 18:11:44 -04:00
Naomi Aro ec44b81f6a clrf 2013-07-18 01:37:39 -04:00
Naomi Aro 29c8570ade editing in progress 2013-07-18 01:31:20 -04:00
Naomi e63518f2da IM-733 Create Development timetable for Airtime Development 
IM-777
Database structure for new History Feature

moving original functionality into the service.
 2013-07-03 16:00:48 -04:00
Naomi 328c1f3cac IM-733 Create Development timetable for Airtime Development 
IM-777
Database structure for new History Feature
 2013-07-03 15:19:05 -04:00
Naomi Aro f2d5fa96da Merge branch '2.4.x' into 2.4.x-saas 
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
	utils/phone_home_stat.php
 2013-06-26 01:25:26 -04:00
Naomi Aro e0d2de642d CC-5254 : Listener Status for SHOUTcast doesn't work 
clrf
 2013-06-24 17:26:20 -04:00
Naomi Aro c5221aae6a CC-5254 : Listener Status for SHOUTcast doesn't work 2013-06-24 17:24:43 -04:00
Naomi Aro 3858371b16 CC-5251 : clrf 2013-06-24 11:15:09 -04:00
Naomi Aro a680421281 CC-5251 : Playlist length is not shown in Library 2013-06-24 11:09:03 -04:00
denise 3b353b47b1 CC-5216: Library length does not consider cue points 2013-06-07 14:19:46 -04:00
denise c9b7deba52 CC-5213: Crossfades aren't properly applied in schedule table sometimes 2013-06-07 13:07:08 -04:00
Naomi 2c35a0416a clrf fix 2013-05-30 16:53:03 -04:00
Naomi 61427647d6 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-30 16:52:17 -04:00
Naomi 891cc80069 CC-5190 : Playlist: Copy playlist will lost cue in/out setting 2013-05-30 16:52:03 -04:00
denise afda0c140b CC-5196: L10N: Smartblock only generate 1 file even multiple files are qualified, no matter which limitation is set. 2013-05-30 15:50:35 -04:00
denise 4728a90ce5 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-30 15:43:49 -04:00
denise c1c90a4b9a Smart block fix 2013-05-30 15:43:31 -04:00
Naomi 5fbae77c1f Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-30 15:38:34 -04:00
Naomi 1fa0ee49d6 CC-5190 : Playlist: Copy playlist will lost cue in/out setting 2013-05-30 15:36:55 -04:00
denise 527b1eaf1d CC-5191: I18N: "items" is not translated when expanding dynamic Smartblock in playlist 2013-05-30 15:05:57 -04:00
denise 91ea1f2240 CC-5184: Timeline -> Filter by show option doesn't work 2013-05-29 15:00:35 -04:00
Martin Konecny 2a2fd45567 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-29 13:48:01 -04:00
Martin Konecny 362eba60d5 CC-5181 
Library -> Edit Metadata:Exception in zendphp.log if trying to set a really large number as track number

-fixed
 2013-05-29 13:47:55 -04:00
denise d3355a527a Removed commented out code 2013-05-29 13:18:37 -04:00
denise 90e235350f Small fix 2013-05-29 13:16:14 -04:00
denise 4c2de70256 CC-5185: Liquidsoap: Sometimes the 1st track ends early when crossfading is set 2013-05-29 13:14:44 -04:00
denise 4a7a08a119 CC-5185: Liquidsoap: Sometimes the 1st track ends early when crossfading is set 
Crossfades were not getting applied to the track end time
 2013-05-29 12:49:48 -04:00
denise 0d436d323c CC-5179: Now Playing: Schedule will be incorrect after insert action 
Was not accounting for crossfade value when adjusting schedule times after insert
 2013-05-29 11:42:02 -04:00
denise be59810810 CC-5180: Now Playing: No crossfading effects if inserting tracks one by one 2013-05-29 09:41:06 -04:00
Martin Konecny 4ed7c4ccd3 fix errors reported by Facebook's scheck 2013-05-28 17:30:48 -04:00
denise 6520211b4d Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-28 16:19:30 -04:00
denise 9545d8aacb Removed dropping and recreating cc_schedule table index before inserting into this table. 
We thought it would be a significant performance booster but it isn't
 2013-05-28 16:19:17 -04:00
Naomi Aro 4d1a15b7ca CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar 2013-05-28 14:27:59 -04:00
denise 85ee8aa0b2 Fixed bug where schedule start times were not getting calculated properly 2013-05-28 11:25:37 -04:00
Naomi bf6437cf09 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-27 17:02:46 -04:00
Naomi 28f957be92 CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar 2013-05-27 17:02:34 -04:00
Martin Konecny 84abd78c8f CC-5109: Fix race-condition when updating cc_pref table 
-not a race condition..was a logic error.
 2013-05-27 15:58:29 -04:00
denise 1c452988cf Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-27 15:35:06 -04:00
denise 90ad62e4f9 CC-5138: Linked Show: Time limitation exceeds when adding 24 hours smart block into daily repeating & linked shows 
Refactoring schedule inserts
 2013-05-27 15:34:54 -04:00
Naomi 5ba72d00bc CC-5109 : Fix race-condition when updating cc_pref table 2013-05-27 15:33:53 -04:00
Martin Konecny 63b0d4194a CC-5109: 
Fix race-condition when updating cc_pref table

-not a race condition..was a logic error.
 2013-05-27 12:30:58 -04:00
denise cee74b59f9 CC-5138: Linked Show: Time limitation exceeds when adding 24 hours smart block into daily repeating & linked shows 
Calculate crossfades during insert instead of after
 2013-05-27 10:39:31 -04:00
Martin Konecny f23fc472ef Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-24 17:01:15 -04:00
Martin Konecny daa310ac18 CC-5175: 
Now Playing: SQL syntax error happens when removing and add contents to current show.

-fixed
 2013-05-23 18:37:30 -04:00
Naomi 06fbbe89f2 CLRF fix. 2013-05-23 18:34:35 -04:00
Naomi 6110d47941 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-23 18:33:53 -04:00
Naomi 75e6f21ce0 CC-5108 : Waveform Editor UI 
putting on the timescale for time reference.

fade editor now has cursor playback info.
 2013-05-23 18:33:40 -04:00
denise e104146b9a CC-5138: Linked Show: Time limitation exceeds when adding 24 hours smart block into daily repeating & linked shows 
Removed propel from calculateCrossfades function and used prepared statements instead
 2013-05-23 16:10:00 -04:00
Naomi c57de650e8 CC-5172 : errors from setting cues in waveform editor not handled properly 
Conflicts:
	airtime_mvc/application/models/Playlist.php
 2013-05-23 13:01:38 -04:00
Naomi 02292569f9 CC-5172 : errors from setting cues in waveform editor not handled properly 
Conflicts:
	airtime_mvc/application/models/Playlist.php
 2013-05-23 13:00:37 -04:00
denise 0107f36206 Changed propel to prepared statements 2013-05-23 12:49:15 -04:00
denise 792366e1f5 CC-5100: Now Playing: Editing schedule on-the-fly will cause 2 tracks mixed at the same time. 2013-05-23 11:35:56 -04:00
Martin Konecny 5c11f5fc72 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
 2013-05-22 18:08:14 -04:00
Naomi bb5889e6a5 CC-5172 : errors from setting cues in waveform editor not handled properly 2013-05-22 17:52:02 -04:00
Naomi 0bfcd32554 CC-5172 : errors from setting cues in waveform editor not handled properly 2013-05-22 17:50:34 -04:00
Martin Konecny 254d3b8950 Merge branch '2.4.x' into 2.4.x-saas 2013-05-22 16:09:02 -04:00
Naomi d82725cb54 CLRF fix 2013-05-22 15:35:59 -04:00
Naomi a569d2f3f5 CC-5163 : Waveform - Hard coded api path will cause fail to open file when airtime is put under subfolder 2013-05-22 15:33:49 -04:00
Martin Konecny 3b9b23a7dd Merge branch '2.3.x-saas' into 2.4.x-saas 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/airtime-playout
 2013-05-21 16:40:10 -04:00
denise 3d09747990 CC-5150: Calendar->Add/Remove Show contents: Exception happens when try to adding contents for show 2013-05-16 13:42:06 -04:00
denise 491ea6a32c CC-5138: Linked Show: Time limitation exceeds when adding 24 hours smart block into daily repeating & linked shows 
Made some small optimizations. Still needs more work.
 2013-05-15 15:32:29 -04:00
Martin Konecny 5080807a21 IM-629 
-fix minor SQL syntax error
 2013-05-14 19:18:41 -04:00
Martin Konecny bb36556bb9 IM-629 
-filter by using instance id instead of show id

Conflicts:
	airtime_mvc/application/models/Schedule.php
 2013-05-14 19:18:08 -04:00
Naomi 74c0e390b6 CC-5147 : check builder feed on now playing page updating when not needed 
wrong timestamp used when changing to prepared statement.
 2013-05-14 16:51:34 -04:00
denise c173744929 CC-5090: Unscheduled tracks are still marked at Scheduled in linked show 2013-05-14 10:58:06 -04:00
Naomi d9b6a15fb6 CC-5139 : WaveForm: Click save will cause problem when setting crossfading between track and Smart block 2013-05-13 18:21:24 -04:00
Naomi bd2462170b CC-5121 : fix some SQL statements not being escaped/prepared 2013-05-13 11:42:11 -04:00
denise 6b560eede1 Deleted unused functions in Show.php 2013-05-13 09:55:17 -04:00
Naomi 82945038d5 CRLF fix 2013-05-10 17:44:50 -04:00
Naomi da46757e28 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-10 17:36:18 -04:00
Naomi b0018083c7 CC-5121 : fix some SQL statements not being escaped/prepared 2013-05-10 17:14:10 -04:00
Martin Konecny 6e0a3ffc60 CC-5102: 
Cross Fading: No cross fading effect

-fixed start/end calculations
 2013-05-10 15:24:43 -04:00
Martin Konecny 0c4691f3ea Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-10 13:20:07 -04:00
Martin Konecny 2250d89cbd CC-5013: 
Re-Added watched folder wont update

-fixed
 2013-05-10 13:19:56 -04:00
Martin Konecny c36333ae07 code cleanup 
-user proper method for checking null
-reduce line length to 80 chars
 2013-05-10 12:37:25 -04:00
Naomi 987537fbdc CC-5121 :fix some SQL statements not being escaped/prepared 2013-05-10 12:35:08 -04:00
Naomi d5e7185789 Merge branch 'sql-changes' 
Conflicts:
	airtime_mvc/application/models/StreamSetting.php
	airtime_mvc/application/models/Subjects.php
 2013-05-10 12:23:57 -04:00
Naomi 5666b688a0 CC-5112 : Listen Status: Please clean obsoleted mount point from status report page 
CRLF
 2013-05-10 12:03:33 -04:00
Naomi 263b89295f Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-10 11:59:49 -04:00
Naomi 115af29f2e Merge branch 'CC-5112-status-page' 2013-05-10 11:59:37 -04:00
Naomi 8f31dd3069 CC-5112 : Listen Status: Please clean obsoleted mount point from status report page 2013-05-10 11:56:20 -04:00
Martin Konecny 3948964e8d remove useless log 2013-05-09 16:58:50 -04:00
denise afb24c37ab CC-5121: fix some SQL statements not being escaped/prepared 2013-05-09 16:07:34 -04:00
denise 8cd8d0922f CC-5121: fix some SQL statements not being escaped/prepared 2013-05-09 16:05:04 -04:00
denise b7337d0df3 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-09 15:53:24 -04:00
denise 40eb51b892 CC-5121: fix some SQL statements not being escaped/prepared 2013-05-09 15:53:12 -04:00
Martin Konecny 9c05511613 CC-5121: fix some SQL statements not being escaped/prepared 2013-05-09 15:08:47 -04:00
Naomi 540e817101 fixing sql to be prepared statements. 2013-05-09 13:28:22 -04:00
denise fedf564090 CC-5081: Calendar -> Add a linked show icon 2013-05-09 12:14:49 -04:00
denise 9c8935af47 CC-5114: Calendar: User from different timezone will see the same start/end time when editing show 2013-05-09 09:35:27 -04:00
Naomi a18fc87d97 CC-5065 : Playlist length is not built on actual cue in/out value 2013-05-08 14:19:22 -04:00
Naomi 299dfdc18a Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-08 11:44:50 -04:00
Naomi fe916ec043 CC-2301 : adding in crossfade durations to smart blocks. 2013-05-08 11:43:53 -04:00
Martin Konecny 9f6a1033ea CC-5109: Fix race-condition when updating cc_pref table 2013-05-07 16:21:34 -04:00
Martin Konecny ad82b4ff98 throw exception if we get unexpected numbers of results in cc_pref 2013-05-07 15:36:21 -04:00
denise 92f6ec029f CC-5079: Timeline -> Moving items in linked shows doesn't work 2013-05-07 14:49:24 -04:00
Naomi 75e4e0c9b6 CC-2301 : only showing waveform buttons if the browser supports the audio api. 2013-05-03 14:42:42 -04:00
Naomi 435bb83588 CC-2301 : dos2unix being run 2013-05-02 16:52:30 -04:00
Naomi 3e320f1e2e Merge branch 'master' into CC-2301 2013-05-02 16:15:58 -04:00
Naomi 517bb7557a CC-2301 : testing default crossfade settings 2013-05-02 16:15:21 -04:00
denise 0e5ba2f07f CC-5085: Linked show: Changing a regular show to linked show and updating the weekday, all the contents will lost 2013-05-02 15:36:14 -04:00
denise 5ba5864d8c CC-5078: Wrong start time if dragging dynamic smart block into a show 2013-05-01 11:29:32 -04:00
Naomi 92ef0608d6 Merge branch 'master' into CC-2301 2013-05-01 11:04:14 -04:00
Naomi 2a1ac0ddb9 CC-2301 : updating playlist offsets in playlist builder to reflect crossfade overlaps. 2013-04-30 16:27:31 -04:00
Naomi 2462e4f144 CC-2301 : CRLF fix. 2013-04-30 15:34:20 -04:00
Naomi 0db557a570 CC-2301 : fades editor saving offset to database for playlists and smart blocks. 2013-04-30 15:32:43 -04:00
Martin Konecny decb12f6b8 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-04-30 15:00:45 -04:00
Martin Konecny de4934a317 ensure that uploaded file is UTF-8 encoded 2013-04-30 15:00:31 -04:00
denise 4ca60ca676 CC-5074: Editing a linked instance sets incorrect schedule start times 2013-04-30 13:58:03 -04:00
Naomi 2e03e1982f CC-2301 : changing more CRLF files 2013-04-29 18:11:11 -04:00
Naomi b2a490ac47 CC-2301 : working on creating a crossfade method for waveforms. 2013-04-29 18:09:12 -04:00
Naomi 58957cc919 CC-2301 : running dos2unix on 3 files. 2013-04-29 17:01:08 -04:00
Naomi 410d298272 CC-2301 : creating an offset column to help create crossfades in the playlist. 
changing default fade to be a separate default fade in/out
 2013-04-29 16:55:08 -04:00
denise 71526a94cc Merge branch 'cc-4961-show-linking' 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
 2013-04-29 15:35:16 -04:00
denise de8f7b0ff7 CC-4961: Show linking 2013-04-29 15:27:14 -04:00
denise a5264aac1e CC-4961: Show linking 2013-04-26 16:10:01 -04:00
denise 52655ab375 CC-4961: Show linking 2013-04-26 13:43:30 -04:00
denise 0f1383d541 CC-4961: Show linking 2013-04-25 09:00:37 -04:00
Naomi 179621d687 CC-2301 : fades editor is loading now with a leftoffset for the second track and the cues for both tracks. 2013-04-24 14:15:07 -04:00
Martin Konecny 8f6b583fcb CC-5061: 
Use propel transactions for StoredFile class
 2013-04-19 20:40:31 -04:00
Martin Konecny fd78ad29bf cleanup of function names 2013-04-19 20:24:05 -04:00
Martin Konecny f39f9329cc CC-4992: 
Decouple pypo from Airtime install

-first commit
 2013-04-19 20:10:51 -04:00
denise a9b5d00d87 CC-4961: Show linking 2013-04-18 16:12:26 -04:00
Martin Konecny 479e69de12 CC-5009: 
Use Silan to silently update track length in the background

-done
 2013-04-18 15:40:33 -04:00
denise 1a2a05c3cf CC-4961: Show linking 2013-04-12 16:34:36 -04:00
denise 9b4a0ba9c1 CC-4961: Show linking 
Removed stamp tables
 2013-04-12 10:52:13 -04:00
denise 9b2fb3bece CC-4961: Show linking 2013-04-09 15:55:18 -04:00
denise e64f6fb3fd CC-4961: Show linking 
-modified db
 2013-04-08 14:43:27 -04:00
denise 76bfce21b1 CC-4961: Show linking 
-modified db
 2013-04-08 14:42:37 -04:00
denise 62d1b22fcc CC-4961: Show linking 
created new cc_show_stamp table
 2013-04-05 12:27:54 -04:00
denise f9d7167638 CC-4961: Show linking 2013-04-04 16:30:33 -04:00
Martin Konecny 5ac51e289d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-04-01 19:15:02 -04:00
Martin Konecny 6ae8da98e4 removing logging 2013-04-01 19:14:55 -04:00
denise ab10ae68a2 CC-5036: Add back edit show instance functionality 2013-04-01 14:42:35 -04:00
denise 418bf0b5ff Created calendar service and moved the context menu creation there 2013-03-26 16:03:53 -04:00
denise ef8f87df5d Show linking 2013-03-25 16:28:53 -04:00
denise 6766d208aa CC-4961: Show linking 
Removed logic out of edit-show action
Created new SchedulerService
Fixed overlapping show bug
 2013-03-21 16:31:05 -04:00
denise a7601d290f CC-4961: Show linking 
Refactored services
Removed ShowDaysService and ShowInstanceService
Combined all show actions into one ShowService
 2013-03-21 10:05:11 -04:00
denise 896e03d76b CC-4961: Show linking 
Refactoring all services thus far
 2013-03-15 16:56:22 -04:00
denise f9f4e4f1fb CC-4961: Show linking 
Made some progress on show editing
 2013-03-12 18:01:12 -04:00
denise c721b81a13 CC-4961: Show linking 
Refactoring
 2013-03-12 10:30:31 -04:00
denise 7347be35b1 Created a new service for show days 
Created a new user service
Started refactoring edit show action
 2013-03-11 16:18:40 -04:00
denise 8415dfdf6f Add comments 2013-03-08 12:18:24 -05:00
denise af622eb4b8 CC-4961: Show linking 
Refactored some more show instance creation functions
 2013-03-06 09:58:35 -05:00
denise d497cfa857 Created show service 2013-03-06 09:58:35 -05:00
denise 99c07272fd - Moved all form validation to it's own function in schedule service 
- Moved show creation to it's own function in schedule service
 2013-03-06 09:58:35 -05:00
drigato bdab294fce Added comments to Schedule Service 2013-03-06 09:58:35 -05:00
denise d08f6cf3e1 CC-4961: Show linking 
-initial schedule service experimentation
 2013-03-06 09:58:35 -05:00
Martin Konecny 1c80701488 Merge branch '2.3.x' into 2.3.x-saas 2013-03-05 16:21:47 -05:00
Martin Konecny cc69418215 Merge branch '2.3.x' into devel 2013-03-05 16:21:22 -05:00
Martin Konecny 00d577fd5b CC-4985: Ensure files deleted via the UI are deleted from stor directory. 
-temporary fix. We know rabbitmq received the message, but we don't know
if media-monitor actually acted on it.
 2013-03-04 15:22:09 -05:00
Martin Konecny 8bec9dea55 Merge branch '2.3.x' into 2.3.x-saas 2013-02-20 14:41:55 -05:00
denise c8d7d23d62 CC-4963: Add cue in and cue out to smart block criteria list 
Done
 2013-02-19 16:38:58 -05:00
denise 8bdf3508b0 CC-4951: Add cue in and cue out to library filter columns 
Done
 2013-02-19 13:38:35 -05:00
denise d1301ff676 CC-4954: Please make Library page remember the status per user 
-done
 2013-02-19 10:58:48 -05:00
denise ec159131a8 Merge branch '2.3.x' into devel 2013-02-13 16:09:53 -05:00
denise 76cb04e296 CC-4538: Cannot edit title or change time of repeating show if first instance has ended 
- fixed by populating the edit show form with the next repeating show that is not in the past
 2013-02-13 11:55:27 -05:00
denise 50613dd9a8 CC-4907: Library -> Adding items to show doesn't add the correct item sometimes 
-fixed
 2013-02-12 17:21:21 -05:00
denise 2c1fa283da CC-4941: Dynamic Smart Block ignores the silan check 
-fixed for playlists that contain dynamic blocks
 2013-02-11 14:17:18 -05:00
denise 51ade73e85 CC-4941: Dynamic Smart Block ignores the silan check 
-fixed
 2013-02-11 13:45:51 -05:00
denise 3c73535f70 Convert clip length seconds to interval format before inserting into cc_playlistcontents / cc_blockcontents 2013-02-11 12:37:20 -05:00
denise 6071dea839 CC-4940: Playlist editor in Library ignores cue points set by silence detection when displaying item time 
-small fix on where to set clip length
 2013-02-11 12:32:20 -05:00
denise 69054806c4 CC-4940: Playlist editor in Library ignores cue points set by silence detection when displaying item time 
- fixed by setting length to cue_out - cue_in when tracks get added to playlist/block
 2013-02-11 12:24:06 -05:00
denise e8bde50909 CC-4939: All webstreams in a playlist will have 0 length in Schedule 
- set cuein and cueout of playlist item if it is a webstream
 2013-02-11 11:17:00 -05:00
Martin Konecny c39b99da6c CC-4839: Nginx doesn't allow liquidsoap to check uploaded file, which blocks uploading any file 
-fixed
 2013-02-07 15:42:06 -05:00
denise 8e82db1bc7 CC-4921: Now Playing: Cannot insert items into current playing show 
-filler time in cc_schedule was not setting cue_in and cue_out
-since we made those colunns not null and removed a default value, we always have to set a value
 2013-02-05 17:57:21 -05:00
denise 8db71eac52 CC-4914: Update is_scheduled after tracks play out 
-done
 2013-02-05 16:52:25 -05:00
denise 23c29455d9 Modified schema.xml - made cue_in and cue_out required columns in cc_scheuled and removed default values 2013-02-05 13:18:25 -05:00
denise 74bc485b4b XSS exploit prevention 
- Calendar - Show Contents
- Playlist tooltip in Library page
- Adding track to a show
- Widgets
- Playlist/Webstream title and description
- Smart block expansion
 2013-02-05 10:56:38 -05:00
Martin Konecny 103ad6fe6d CC-4909: php warning 
-fixed
 2013-02-04 16:32:03 -05:00
denise b45f71e8f9 CC-4897: XSS exploit on library page 2013-02-04 12:44:14 -05:00
denise 20a3f674b4 CC-4897: XSS exploit on library page 
-fixed where this was happening on Calendar - show content
 2013-02-04 12:12:57 -05:00
denise 1f0b9fa5dc CC-4897: XSS exploit on library page 2013-02-04 11:06:46 -05:00
Martin Konecny 93ec4c001b Merge branch '2.3.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/models/StoredFile.php
 2013-02-02 21:07:34 -05:00
denise 8309593a0f CC-4904: Library -> Sort by status doesn't work 
- added 2 columns to cc_files (is_scheduled, is_playlist)
- split library status column into two columns (scheduled, playlist)
- is_scheduled gets updated when a track plays out, or when a file gets added/removed from/to a show
- is_playlist gets updated when a file gets added/removed from/to a playlist/block, when a playlist/block gets deleted, or when a playlist/block's contents is cleared
 2013-02-01 17:47:07 -05:00
denise 384298f680 CC-4109: Playlist Builder: Add a button to remove all the items in the current editing playlist 2013-02-01 12:06:01 -05:00
Martin Konecny 0a198ae424 Merge branch '2.3.x' into 2.3.x-saas 
Conflicts:
	airtime_mvc/application/models/User.php
 2013-01-30 18:31:45 -05:00
denise cf2ed25bfb CC-4900: Indicate in the library if a webstream is scheduled in the future or belongs to a playlist 
-done
 2013-01-30 16:53:59 -05:00
denise 4f5d7869d8 Removed html from Library/contents-feed and StoredFile model 
Added new Library column to indicate if a file is scheduled in the future or belongs to a playlist/smart block
 2013-01-30 15:38:25 -05:00
denise 043fbd1dfb CC-4886: Warn if track is part of a playlist when deleting from library. 
-done
 2013-01-30 10:55:24 -05:00
denise 694c54f272 Merge branch 'cc-4887-show-whether-track-is-scheduled-in-the-future-on-Library-page' into devel 2013-01-30 10:35:29 -05:00
denise d4742577c9 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-30 10:20:27 -05:00
drigato c45440482a CC-4887: Show whether track is scheduled in the future on Library page 2013-01-30 08:57:59 -05:00
Martin Konecny b15c4569eb CC-4894: Need to filter output for potential XSS exploits 
-fixed few areas
 2013-01-29 15:17:29 -05:00
denise 5f3f2cd97c CC-4881: Cue in time can be greater than Cue out time in some situations 
-fixed
 2013-01-28 16:46:11 -05:00
denise f1215c10fd CC-4882: Scheduled item does not take into account cue_out - cue_in time 
-fixed
 2013-01-28 14:21:11 -05:00
Martin Konecny d47469be25 read num bytes used from file instead of calculating manually 2013-01-25 16:36:57 -05:00
Martin Konecny 2ef8604c31 remove unnecessary code 2013-01-25 16:23:12 -05:00
Martin Konecny c6493f9d74 remove unecessary saas code 2013-01-25 16:22:08 -05:00
Martin Konecny 6f5ffdc1e7 Merge branch '2.3.x' into 2.3.x-saas 2013-01-24 17:49:08 -05:00
Martin Konecny c3f2bf57de CC-4873: Airtime takes 7 seconds to load 32K (very small) from db 
-further optimization by looking at the preferred time scale
 2013-01-24 14:02:50 -05:00
Martin Konecny ef806b8357 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-24 12:14:12 -05:00
Martin Konecny 091f5ff49f CC-4873: Airtime takes 7 seconds to load 32K (very small) from db 
-we know what month will be the initial view for the user.
-Provide this data ahead of time.
 2013-01-24 12:13:55 -05:00
denise 1e336fa2d7 CC-4875: use a reference when iterating over show events 2013-01-24 12:00:31 -05:00
denise 78f617cacb CC-4873: Airtime takes 7 seconds to load 32K (very small) from db 
- put makeFullCalendarEvent inline with loop
- removed unnecessary epoch time conversion
 2013-01-23 17:33:34 -05:00
denise adaab6ba96 CC-4873: Airtime takes 7 seconds to load 32K (very small) from db 
-added a 5 second grace period for checking if shows are partially filled
 2013-01-23 16:31:20 -05:00
denise 9714b44d7f CC-4873: Airtime takes 7 seconds to load 32K (very small) from db 2013-01-23 16:27:26 -05:00
denise 9fd3b43bb2 CC-4873: Airtime takes 7 seconds to load 32K (very small) from db 
Made improvement by accessing db just once to determine if each show instance is full or not
 2013-01-23 16:12:16 -05:00
denise 77b0c21192 Small refactor 2013-01-22 10:39:20 -05:00
Martin Konecny 909e290bd3 Merge branch 'devel' into 2.3.x-saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
 2013-01-18 17:38:48 -05:00
denise b9c7ea1184 CC-4869: Default fades greater than 99 seconds won't allow you to drag item into block/playlist 
-fixed
 2013-01-18 17:22:54 -05:00
Martin Konecny c1941fea2b Merge branch 'devel' into 2.3.x-saas 2013-01-18 14:45:55 -05:00
denise ad0879996d CC-4855: System->Preferences->Fade in/out settings: Number's format is incorrect. 
-use existing function to convert seconds to time format
 2013-01-18 14:35:17 -05:00
denise 22ecc3f1fc CC-4855: System->Preferences->Fade in/out settings: Number's format is incorrect. 
-fixed
 2013-01-18 14:28:45 -05:00
Martin Konecny f8208a355c Merge branch 'devel' into 2.3.x-saas 2013-01-18 12:22:45 -05:00
James ed7b22118c Merge branch 'silan-script' into devel 2013-01-18 11:54:10 -05:00
James f70ca93b53 CC-4841: Silan script 
done
 2013-01-18 11:53:26 -05:00
james e2b83a0c8c CC-4857: Playlist length will increase every time I duplicate it. 
- fixed
 2013-01-17 22:20:28 -05:00
denise 57629b4eac Changed path to locale directory from absolute to relative 2013-01-17 14:31:40 -05:00
Martin Konecny 784cb390d3 Merge branch 'devel' into 2.3.x-saas 2013-01-17 10:56:18 -05:00
denise e4c2f43d9e CC-4855: System->Preferences->Fade in/out settings: Number's format is incorrect. 
-fixed
 2013-01-16 15:40:50 -05:00
denise f7e8fd33fd CC-4848: Streaming server passwords should be hidden with dots, once entered 
-fixed
 2013-01-16 14:36:56 -05:00
denise 9cb4633823 CC-4850: Upgrade Scripts -> Add default timezone and locale for each user in cc_pref 
-fallback to default settings if user setting is not set
 2013-01-16 12:42:58 -05:00
Martin Konecny 8cd6bd9aa4 Merge branch 'devel' into 2.3.x-saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/forms/SoundcloudPreferences.php
	airtime_mvc/application/forms/SupportSettings.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js
	python_apps/api_clients/api_client.py
	python_apps/pypo/listenerstat.py
 2013-01-15 13:44:44 -05:00
James bb2f9316af CC-4841: Silan script 
- temp commit
 2013-01-15 11:16:50 -05:00
James 9ae3559305 Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel 
Conflicts:
	airtime_mvc/application/Bootstrap.php
 2013-01-14 16:19:51 -05:00
James 5a97fb69f2 CC-4384: Remove annoying usage of $CC_CONFIG 
- done
 2013-01-14 16:16:14 -05:00
Martin Konecny fae3f3a03f CC-2184: Hardcoded CSS path should be relative path instead 
-Make '/' the default root
 2013-01-14 16:00:38 -05:00
James dcf3526000 CC-4384: Remove annoying usage of $CC_CONFIG 
- done
 2013-01-10 18:09:00 -05:00
James 55fa8b8dc1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-10 14:52:45 -05:00
James 048ee05030 CC-4821: Add option to disable ReplayGain 
- done
 2013-01-10 13:49:41 -05:00
denise c20ed7ebad Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-10 12:04:44 -05:00
denise 690a6d2654 Removed user id from cc_pref keystr value 2013-01-10 12:04:27 -05:00
James 4bf9ab60d9 CC-4819: Tracks length in Scheduler is 0.0 all the time 
- fixed in better way
 2013-01-10 11:49:02 -05:00
james 594a38da16 CC-4770: Playlist's length doesn't counts Webstream and Smartblock in 
- the bug was introduced by CC-4668
- fixed
 2013-01-09 22:53:29 -05:00
james 3a72302a3c CC-4819: Tracks length in Scheduler is 0.0 all the time 
- fixed
 2013-01-09 22:19:39 -05:00
denise 1572955d07 CC-4810: Add language setting to login page 
-done
 2013-01-09 18:03:23 -05:00
denise db62b538dd CC-4816: Timezones should be a user preference 
-done
 2013-01-09 13:38:38 -05:00
James 1263c04621 CC-4796: Listener Stat: Authentication exception happens but no warning message on UI 
- done
 2013-01-08 17:32:27 -05:00
James 6d48e1faf0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 15:52:33 -05:00
James adda497bbb CC-4812: Property "off_air_meta" will block airtime-liquidsoap to start 
- fixed
 2013-01-08 15:52:11 -05:00
Martin Konecny 1ee90ed9b9 CC-4790: Media Monitor: Re-added files won't show up in Library 
-fixed
 2013-01-08 15:42:35 -05:00
James 45e3fccae2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 12:31:22 -05:00
James b580a7be73 CC-4812: Property "off_air_meta" will block airtime-liquidsoap to start 
- fixed
 2013-01-08 12:31:14 -05:00
denise f308305df8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-07 18:18:59 -05:00
denise a65e72941f CC-4805: Localization -> Changing default language changes datatables and add media language setting 
-fixed
 2013-01-07 18:18:40 -05:00
James 6e241fd3ec CC-4512: Allow changing stream "Offline" message via Web UI 
- fixed
 2013-01-07 18:14:57 -05:00
James 51425d451f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-07 13:49:09 -05:00
James ecbff94f11 CC-4795: Library -> Playlist: Cannot add Smart Block into Playlist 
- fixed
 2013-01-07 13:48:51 -05:00
denise 82da4dcfe8 CC-4599: Calendar: Add an icon to indicate show is not fully booked 
-done but a new icon is needed
 2013-01-07 12:41:28 -05:00
Daniel James 771b9b9412 Fixed whitespace in Preferences page between 'Timezone' and colon 2013-01-07 11:41:29 +00:00
James 63c847080f CC-4732: Ask for admin username + password in Stream Settings page 
- CRLF
 2013-01-03 18:02:19 -05:00
James 5d76bb2d17 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-03 18:00:33 -05:00
James ae7b6fe092 CC-4732: Ask for admin username + password in Stream Settings page 
- done
 2013-01-03 17:58:50 -05:00
denise e2c87ed8b6 CC-4781: Store localization settings on a per-user basis 
-done
 2013-01-03 16:19:02 -05:00
James a1837366be Merge branch 'cc-3018-silence-detection' into devel 2013-01-03 14:08:21 -05:00
James b8f80866cf CC-3018: Automatically strip out silence from audio tracks 
- done
 2013-01-03 14:02:06 -05:00
Martin Konecny d6eb043899 CC-4765: Webstream of AAC type can't be previewed 
-fixed
 2013-01-02 16:09:32 -05:00
James dcdbc3160d CC-4769: Duplicate Playlist: Fade in/out setting doesn't get copied correctly 
- fixed
 2013-01-02 11:41:33 -05:00
Martin Konecny 17e66f5537 Merge branch 'cc-4759-add-aac-stream-in-support' into 2.2.x-saas 2012-12-27 17:30:10 -05:00
Martin Konecny 0596d1c391 Merge branch 'cc-4759-add-aac-stream-in-support' into devel 
Conflicts:
	python_apps/media-monitor2/media/monitor/pure.py
 2012-12-27 17:29:25 -05:00
Martin Konecny ee8dde07c8 add support for AAC input streams 2012-12-27 17:18:47 -05:00
james c0665e4748 CC-4754: Replay gain modifier 
- Initial commit
 2012-12-27 00:36:11 -05:00
denise 127d0187b7 CC-4706: Calendar -> Context menu -> Show content does not work 
-fixed
 2012-12-03 11:45:06 -05:00
denise b2699fa914 merge from devel 2012-12-03 11:06:56 -05:00
denise 2f0c6b702a CC-1960: Internationalize Airtime / Support translations 
- created locale table
- create locale model
- set default locale in pref table
 2012-11-29 18:21:03 -05:00
denise 542434d9f0 CC-1960: Internationalize Airtime / Support translations 
-got rid of spaces at beginning of strings
-removed empty string translations
-overwrote Zend_Validate_Between object error messages
 2012-11-28 16:16:39 -05:00
Martin Konecny 4983721565 Merge branch '2.2.x' into 2.2.x-saas 
Conflicts:
	airtime_mvc/application/forms/LiveStreamingPreferences.php
 2012-11-28 16:10:33 -05:00
denise 9acfb6c181 CC-1960: Internationalize Airtime / Support translations 
- overwrote default zend form error messages
 2012-11-27 17:11:29 -05:00
denise 42d535a922 CC-1960: Internationalize Airtime / Support translations 
-unlocalized some strings
 2012-11-27 12:33:43 -05:00
denise 3b124e6f5d CC-4668: Blocks/Playlists: Length includes deleted tracks 
-saving block length was including files that do not exist
 2012-11-26 15:05:27 -05:00
denise b677130a3f CC-1960Internationalize Airtime / Support translations 
-added gettext wrapper to strings missing it
-timepicker close button was not getting translated -fixed
 2012-11-23 16:39:41 -05:00
martin 5ba964c783 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-23 14:03:51 -05:00
martin 75adf9b6a1 CC-4701: same webstream played twice in a row does not work. 
-fixed
 2012-11-23 14:03:31 -05:00
denise dd0e71efcc CC-1960: Internationalize Airtime / Support translations 
-added gettext wrapper function to all strings missing it
-i18n of jquery timepicker and datepicker
-i18n of jquery datatables columnFilter input place holder labels
 2012-11-22 17:32:24 -05:00
James 87d0383533 CC-4703: Now Playing duration column ignores any cue point set 
- fixed
 2012-11-22 14:37:57 -05:00
James 8483439551 CC-4709: 
Exception happens when DJ try to click a Webstream not belongs to himself

- fixed
 2012-11-22 10:29:40 -05:00
denise c0e49b69e2 Merge branch 'devel' into cc-1960-internationalize-airtime 2012-11-21 17:17:53 -05:00
denise 2172ee82d3 Merge branch '2.2.x' into devel 2012-11-21 17:17:32 -05:00