Albert Santoni
670a63df87
Error handling for if propel isn't found / composer wasn't run
2014-11-26 18:04:46 -05:00
Albert Santoni
8fbe7dd649
Report an error and die if amazon.conf is missing
2014-11-26 17:50:59 -05:00
drigato
884a4c493d
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
airtime_mvc/application/models/StoredFile.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
2014-11-26 11:42:40 -05:00
drigato
f08535cc10
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
2014-11-26 10:35:48 -05:00
drigato
544767a775
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-cloud-storage
2014-11-20 17:11:50 -05:00
drigato
8e8fe2d288
SAAS-489: Cannot preview tracks stored on disk
2014-11-20 17:11:23 -05:00
Albert Santoni
7db571d103
Remove clearAction from the media REST API for security
2014-11-20 16:47:02 -05:00
Albert Santoni
8ffd70781b
Remove clearAction from the media REST API for security
2014-11-20 16:46:21 -05:00
drigato
00fbda193e
Schedule->removeItems optimization fix for deleting the current playing track
2014-11-20 09:57:37 -05:00
drigato
48ae8ac69c
Scheduler->removeItems optimization
2014-11-19 15:13:33 -05:00
Albert Santoni
c829b6bf95
Fix bad merge
2014-11-18 18:17:19 -05:00
Albert Santoni
dd3b54f8ed
Actually delete files from the database via the media REST API
2014-11-18 18:15:45 -05:00
Albert Santoni
11a31375df
Slightly more robust fix for the last issue
2014-11-18 17:41:44 -05:00
Duncan Sommerville
6460854fda
Fixed 'clear' button not working when files failed to import
2014-11-18 17:13:48 -05:00
Albert Santoni
e7e1926896
CC-5950: Fix for issue where clear button in Recent Uploads didn't work
...
sometimes
2014-11-18 17:11:09 -05:00
drigato
3c73abc786
SAAS-491: Edit meta data not working
...
Fixed: Propel 1.7 does not cast string types to integers
2014-11-18 10:32:03 -05:00
drigato
7d86ea3115
Better error handling on media PUT request
2014-11-13 09:41:46 -05:00
drigato
2827db8ba3
Fix bad merge
2014-11-13 09:05:02 -05:00
drigato
95517cac87
Fix exception thrown when the analyzer doesn't return filesize with the metadata
2014-11-12 14:45:50 -05:00
drigato
c132cac43d
Code cleanup
2014-11-12 14:42:34 -05:00
Duncan Sommerville
c580e8a569
Removed references to show instance description
2014-11-11 19:07:33 -05:00
drigato
5cf5ff4fa1
code cleanup
2014-11-11 16:29:54 -05:00
drigato
b304e2fa34
Bug fix
2014-11-11 13:56:17 -05:00
Duncan Sommerville
f6bf2f8cc5
Changed tabs to spaces
2014-11-07 12:05:29 -05:00
drigato
1dc72d5ebe
Changed Amazon S3 download URL format so it works with S3_EU_WEST region.
...
Updated amazon config file path in the downloader class
2014-11-07 11:51:11 -05:00
Duncan Sommerville
8fc7178d82
Added several global constants for reoccurring strings in Airtime to aid dynamic translations
2014-11-06 18:40:19 -05:00
Duncan Sommerville
efd05c4b77
Added the _initTranslationGlobals function to bind PHP globals to javascript vars for dynamic translation purposes
2014-11-06 18:40:06 -05:00
Duncan Sommerville
795e239ff3
Made several reoccurring strings into application constants and altered any static strings containing them to use these constants in string format calls.
2014-11-06 18:39:48 -05:00
Duncan Sommerville
62a915f109
Added global define for application name
2014-11-06 11:57:05 -05:00
Duncan Sommerville
e5e7942b42
Added getUserLocale function to pull locale data into the Login form
2014-11-05 17:24:54 -05:00
Duncan Sommerville
eecd3fa188
Added setDefaults call to initialize the locale field to user's locale, or the station default; removed unnecessary field
2014-11-05 17:24:08 -05:00
Duncan Sommerville
b94d34f719
Removed calls to set user locale and timezone on user creation; these calls were updating the current user instead of the created user, and so served no purpose
2014-11-05 17:22:13 -05:00
Duncan Sommerville
564e8d9311
Replaced hardcoded locale defaults with the station default locale
2014-11-05 17:21:19 -05:00
Duncan Sommerville
90626a2fcb
Formatting; Changed tabs to spaces
2014-11-05 17:04:18 -05:00
drigato
e24b4f43fd
Made AirtimeAnalyzerServer.read_config_file static so CloudStorageUploader can use it.
...
Reverted MessageListener.msg_received_callback and MessageListener.spawn_analyzer_process back to static methods.
Moved cloud storage settings out of MessageListener and into CloudStorageUploader
2014-11-05 16:25:11 -05:00
Duncan Sommerville
00e85de3c8
Updated preEditShowValidationCheck to behave properly when dealing with shows with cc_show_days rows in the past, updated serialized form data in add-show to accommodate the change
2014-11-05 10:06:59 -05:00
Duncan Sommerville
0f3c1914e1
CC-5948 - Fixed bug where user couldn't edit repeating instances of a show while another instance was playing
2014-11-04 18:38:31 -05:00
drigato
27b8f0ac13
Removed delete-success view script because action no longer exists.
2014-11-03 13:15:04 -05:00
drigato
5f98151009
Removed unused route from rest Media Controller
2014-11-03 12:57:41 -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
Albert Santoni
c590869311
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2014-10-29 17:57:25 -04:00
Albert Santoni
fd39db2e24
Merge pull request #75 - Saas relder csrf delete file
2014-10-29 17:55: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
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
e6cf1c7cb9
Updated occurrence of GetPlayOrderRange to use old version for backwards compatibility
2014-10-27 15:52:14 -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