Duncan Sommerville
13bd0b7589
Fixed removing image when saving preferences with no upload
2015-03-02 14:57:50 -05:00
Duncan Sommerville
936d11b367
Merge branch '2.5.x-albertenhancements' into saas
2015-02-27 17:21:20 -05:00
Duncan Sommerville
78c7170c4e
Reformatted logo remove button to use Zend
2015-02-27 17:19:37 -05:00
Albert Santoni
2e2f1f9762
Fixed SAAS-612: Recreating a station can wipe its database
2015-02-26 17:14:46 -05:00
Albert Santoni
ac3ad3d23b
Prevent overwriting the database if it already exists
2015-02-26 15:33:35 -05:00
Albert Santoni
f1a311dad6
Merge branch 'saas' into saas-media-refactor
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-26 14:26:33 -05:00
Albert Santoni
6047670dbd
Fix corner case where failed uploads could show up in the library
2015-02-26 14:12:51 -05:00
Albert Santoni
0b1af01822
Better exception logging and small pypo exception fix
2015-02-26 13:52:51 -05:00
Duncan Sommerville
c57d4e3fc4
Check if station is on a trial plan before displaying the trial box
2015-02-26 13:30:35 -05:00
Albert Santoni
ab6d83f49d
Merge branch 'saas' into saas-media-refactor
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-26 13:10:13 -05:00
Duncan Sommerville
93f62eaadd
Added check to hide LiveChat for existing hobbyist users
2015-02-26 12:49:52 -05:00
Albert Santoni
bfd6ef72b1
Fixed download URLs for non-cloud files
2015-02-26 11:29:08 -05:00
Albert Santoni
3885abbdb8
Fixed webstream previewing
2015-02-26 11:09:43 -05:00
Albert Santoni
7d534d1cda
Airtime Pro SSL compatibility hack
2015-02-25 16:19:01 -05:00
drigato
48b4e3fb62
Also need to diable disk usage in media controller
2015-02-25 16:11:52 -05:00
Albert Santoni
5acad059de
Insert leading slash into basedir for station URL
2015-02-25 16:09:08 -05:00
drigato
7e167e5a47
Temporarily disabling disk quota limit until all file sizes have been set
2015-02-25 15:28:48 -05:00
drigato
e0a050ac60
Fix file deletion bug
2015-02-25 15:09:02 -05:00
Albert Santoni
3a1141d4c8
Merge branch 'saas' into saas-media-refactor
...
Conflicts:
airtime_mvc/application/cloud_storage/ProxyStorageBackend.php
airtime_mvc/application/controllers/ApiController.php
2015-02-25 13:02:11 -05:00
drigato
38aa1d1cd9
Merge branch 'saas' into saas-store-file-size-and-hash-in-db
2015-02-24 16:44:17 -05:00
Albert Santoni
e13e4413ea
Merge remote-tracking branch 'origin/2.5.x-albertenhancements' into saas
2015-02-24 15:03:06 -05:00
Duncan Sommerville
5e256df061
Added remove button for station logo on preferences page
2015-02-24 12:12:30 -05:00
Albert Santoni
c0db309e32
Merge branch 'cc-5709-airtime-analyzer-refactor' into saas-media-refactor
...
Conflicts:
airtime_mvc/application/controllers/plugins/Acl_plugin.php
2015-02-24 11:18:49 -05:00
Albert Santoni
7600b8ae82
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-refactor
2015-02-24 11:16:44 -05:00
Albert Santoni
90aa1faea4
Merge branch '2.5.x' into cc-5709-airtime-analyzer
2015-02-24 11:16:19 -05:00
Albert Santoni
e2130df51c
Merge branch 'cc-5709-airtime-analyzer-csrf' into cc-5709-airtime-analyzer
2015-02-24 11:15:27 -05:00
Albert Santoni
73e5fb938f
Use more secure random number generation for CSRF auth tokens
...
* Also cleaned up pull request
2015-02-24 11:13:39 -05:00
drigato
be7a6854f0
SAAS-596: Store file size and hash in database
...
Have pypo fetch the file size and md5, if necessary, and make request to
Airtime to set these values
2015-02-24 11:00:41 -05:00
Duncan Sommerville
69d588d2f6
Merge branch '2.5.x' into 2.5.x-albertenhancements
2015-02-24 10:45:52 -05:00
drigato
47a7b0245e
Merge branch 'saas' into saas-store-file-size-and-hash-in-db
2015-02-23 10:29:34 -05:00
Albert Santoni
51aa846a4c
Merge branch 'cc-5709-airtime-analyzer-refactor' into saas-media-refactor
...
Conflicts:
airtime_mvc/application/models/RabbitMq.php
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
python_apps/airtime_analyzer/airtime_analyzer/message_listener.py
2015-02-20 18:25:38 -05:00
Albert Santoni
c868136d26
Make airtime_analyzer respect the storage_backend setting passed to it
...
by Airtime
2015-02-20 18:21:49 -05:00
Albert Santoni
0c537194ec
Merge branch 'cc-5709-airtime-analyzer-refactor' into saas-media-refactor
2015-02-20 17:36:15 -05:00
Albert Santoni
909cbae5f4
Added new parameter to CcFiles::createFromLocalFile() for flexibility
2015-02-20 17:34:58 -05:00
Albert Santoni
6858316dfc
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2015-02-20 17:26:53 -05:00
Duncan Sommerville
ce36c1be18
Removed unnecessary call to BaseCcFiles->delete
2015-02-20 16:58:09 -05:00
Albert Santoni
903de66349
Merge branch 'cc-5709-airtime-analyzer-refactor' into saas-media-refactor
...
Conflicts:
airtime_mvc/application/cloud_storage/ProxyStorageBackend.php
airtime_mvc/application/configs/conf.php
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/application/models/airtime/CcFiles.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/application/services/MediaService.php
2015-02-20 16:52:00 -05:00
Albert Santoni
84f0f135ef
More refactoring: Allow files to be imported from disk directly
2015-02-20 16:36:36 -05:00
Albert Santoni
2e2c3d6276
Merge of cc-5709-airtime-analyzer-saas-refactor into saas
2015-02-20 14:27:16 -05:00
Duncan Sommerville
33ebca00db
Small fix to BPM sanitization
2015-02-20 14:23:36 -05:00
Duncan Sommerville
61a47aeb27
Small fix to BPM sanitization
2015-02-20 14:01:29 -05:00
Albert Santoni
2a89e4d5a0
Massive refactor of the analyzer branch and sync it back up with the
...
cloud storage branch (for the last time)
* Backported all the bugfixes from cc-5709-airtime-analyzer-cloud-storage
* Backported missing FileStorageBackend.php
* Fixed CC-6001: Track titles and artist names with slashes break audio preview
* Refactored all the MediaController code, pulling out the logic into MediaService
* Fixed an API key leak to guests in the Media API
* Made this branch work without cloud_storage.conf (defaults to file storage)
* Made ApiController's getMediaAction use the MediaService code
2015-02-20 14:01:06 -05:00
Duncan Sommerville
be7cae4408
Fixed CSRF prevention checks for REST calls, moved CSRF initialization to Bootstrap
2015-02-20 13:12:49 -05:00
Albert Santoni
6d00da89db
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/models/airtime/CcFiles.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-20 11:14:11 -05:00
drigato
fd0db11450
SAAS-596: Store file size and hash in database
...
Added upgrader class to add new filesize column
2015-02-19 16:27:50 -05:00
Albert Santoni
0177e40083
Pull the logic for Media REST API out of the controller
2015-02-19 15:10:01 -05:00
drigato
6ef085f460
Merge branch 'saas' into saas-store-file-size-and-hash-in-db
2015-02-19 11:43:34 -05:00
drigato
2905d0394b
Merge branch 'saas-store-file-size-and-hash-in-db' of https://github.com/sourcefabric/Airtime into saas-store-file-size-and-hash-in-db
2015-02-19 10:35:07 -05:00
drigato
e5d6797ce7
SAAS-596: Store file size and hash in database
...
Removed md5_hash column from cc_files since there is already a md5
column
2015-02-19 10:34:35 -05:00
Albert Santoni
73cb14155c
Replace the version hashing with git revision hashing to fix browser
...
caching
2015-02-19 10:01:09 -05:00
