drigato
|
92feacd46f
|
SAAS-501: Re-jig cloud_storage.conf
|
2014-11-27 15:50:40 -05:00 |
drigato
|
8601452c71
|
Merge conflict
|
2014-11-27 15:46:39 -05:00 |
drigato
|
2f9382679a
|
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-cloud-storage
|
2014-11-27 15:45:26 -05:00 |
drigato
|
6cb993cc80
|
SAAS-504: Store provider in db
|
2014-11-27 15:44:53 -05:00 |
drigato
|
e59cd11370
|
Close the session when a track is previewed or downloaded.
Close the file pointer when we are down with it.
|
2014-11-27 13:48:34 -05:00 |
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 |
localizer
|
b5575d9953
|
updated translation resources
|
2014-11-14 10:53:06 +00:00 |
localizer
|
9d29b84081
|
updated translation resources
|
2014-11-14 10:49:07 +00:00 |
localizer
|
ee0d89913b
|
updated translation resources
|
2014-11-14 09:59:25 +00:00 |
Albert Santoni
|
0a0e7cb8f3
|
Regenerate the .po files...
|
2014-11-13 14:31:41 -05:00 |
localizer
|
9e74b26fc4
|
updated translation resources
|
2014-11-13 19:07:10 +00:00 |
Albert Santoni
|
0681e80afd
|
Regenerated the .po files
|
2014-11-13 13:56:47 -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
|
4dab2abf4e
|
Replaced reoccurring strings with string formatting to aid dynamic translations
|
2014-11-06 18:40:19 -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
|
3046003a1b
|
Removed unnecessary cookie declaration for default locale
|
2014-11-05 17:27:41 -05:00 |
Duncan Sommerville
|
3b588dcce8
|
Removed unnecessary call to set locale data on the Login page
|
2014-11-05 17:27:08 -05:00 |
Duncan Sommerville
|
534b56351e
|
Added styles to completely hide csrf elements on the page; changed tabs to spaces
|
2014-11-05 17:26: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 |
Duncan Sommerville
|
273afaa126
|
Added Japanese language text files to js i18n datatables
|
2014-11-05 16:47:09 -05:00 |