Commit graph

13349 commits

Author SHA1 Message Date
Duncan Sommerville
016c89ea96 Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas 2015-02-26 13:35: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
e099d1867f Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2015-02-26 13:06:49 -05:00
Albert Santoni
d82f461f35 Fix missing filesize and md5 for WAVE imports 2015-02-26 13:06:29 -05:00
Duncan Sommerville
93f62eaadd Added check to hide LiveChat for existing hobbyist users 2015-02-26 12:49:52 -05:00
drigato
48b4e3fb62 Also need to diable disk usage in media controller 2015-02-25 16:11:52 -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
68948e3bb5 Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2015-02-24 17:05:04 -05:00
Albert Santoni
37f9f273c7 Fixed the airtime_analyzer unit tests 2015-02-24 17:03:38 -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
31ea92d983 Added VERSION to the .gitignore 2015-02-24 16:36:17 -05:00
drigato
d843de80cc Remove log statements 2015-02-24 16:22:20 -05:00
drigato
6113dff182 Debugging logs 2015-02-24 15:19:46 -05:00
Albert Santoni
562c2f0100 Remove widget JS snippet animation because it's bugged 2015-02-24 15:18:39 -05:00
Albert Santoni
e13e4413ea Merge remote-tracking branch 'origin/2.5.x-albertenhancements' into saas 2015-02-24 15:03:06 -05:00
Albert Santoni
a6579e4d09 Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2015-02-24 13:14:40 -05:00
Albert Santoni
702de0f5f5 SAAS-602: Fix getaddrinfo deadlock (again)
Conflicts:
	python_apps/airtime_analyzer/airtime_analyzer/cloud_storage_uploader.py
2015-02-24 13:14:21 -05:00
drigato
86ba5c547e SAAS-596: Store file size and hash in database
Fixed exception handling in pypo
2015-02-24 12:32:46 -05:00
Duncan Sommerville
5e256df061 Added remove button for station logo on preferences page 2015-02-24 12:12:30 -05:00
Albert Santoni
b2a2153572 Merge branch '2.5.x' into saas 2015-02-24 12:04:11 -05:00
Albert Santoni
8a88b4b733 Reduce the pypo POLL_INTERVAL to lessen impact of RabbitMQ or web server outages 2015-02-24 12:03:35 -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
Albert Santoni
8aaf300491 Attempt a workaround for unicode hostname resolution deadlock in the
analyzer
2015-02-23 18:22:16 -05:00
drigato
47a7b0245e Merge branch 'saas' into saas-store-file-size-and-hash-in-db 2015-02-23 10:29:34 -05:00
Duncan Sommerville
33ebca00db Small fix to BPM sanitization 2015-02-20 14:23:36 -05:00
localizer
19851efbe5 updated translation resources 2015-02-20 11:24:14 +00: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
drigato
58f9ffd0eb Merge branch 'cc-5709-airtime-analyzer-store-file-size-and-hash-in-db' into saas-store-file-size-and-hash-in-db 2015-02-19 15:40:27 -05:00
drigato
b6acfb2dce SAAS-596: Store file size and hash in database
Renamed metadata md5 value to match cc_files column
2015-02-19 15:39:55 -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
0f921cb481 Merge branch 'cc-5709-airtime-analyzer-store-file-size-and-hash-in-db' into saas-store-file-size-and-hash-in-db 2015-02-19 10:51:53 -05:00
drigato
cc9e6efbca SAAS-596: Store file size and hash in database
Removed try/except while getting file size and hash
2015-02-19 10:38:30 -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
70f5bd3748 Fixed the unit tests 2015-02-19 10:17:42 -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
Albert Santoni
5a644ae0b8 Merge branch 'cc-5709-airtime-analyzer' into saas 2015-02-19 09:31:58 -05:00
Albert Santoni
487ab9bd99 CC-5868: Make the BPM field less strict 2015-02-19 09:31:23 -05:00
Albert Santoni
ddab1943f6 Merge branch '2.5.x' into saas 2015-02-19 09:20:57 -05:00
Albert Santoni
b3a46b948f CC-5999: Unknown file type: audio/vorbis 2015-02-19 09:19:27 -05:00
Albert Santoni
961cdfc2ee CC-5849: Audio preview audio/x-wav exception 2015-02-18 19:41:56 -05:00
Albert Santoni
857ad9615e CC-5849: Audio preview audio/x-wav exception 2015-02-18 19:40:27 -05:00
Albert Santoni
d0bd4bfe81 Merge branch 'saas' into saas-store-file-size-and-hash-in-db
Conflicts:
	airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-18 19:29:45 -05:00
Albert Santoni
08c53a9292 Fixed incorrect authorization for ShowImage API 2015-02-18 18:34:52 -05:00
Albert Santoni
0535626df1 Merge branch 'saas-file-sanitization' into saas
Conflicts:
	airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-18 17:19:26 -05:00
Albert Santoni
9098e204e5 Merge branch 'cc-5709-airtime-analyzer' into saas-file-sanitization
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-18 17:18:43 -05:00
Albert Santoni
b76ab27230 Fixed the unit tests: Ensure key in $_SERVER exists. 2015-02-18 17:03:16 -05:00
Albert Santoni
964d7d1326 Merge branch 'cc-5709-airtime-analyzer' into saas
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-18 16:42:04 -05:00