Commit Graph

13334 Commits

Author SHA1 Message Date
Albert Santoni 31ea92d983 Added VERSION to the .gitignore 2015-02-24 16:36:17 -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
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
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
Albert Santoni 17f1d0e96d Simplify the metadata sanitization and bugfix it
* SAAS-376 and CC-5868
2015-02-18 16:29:08 -05:00
Albert Santoni 2ae921e9d7 Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2015-02-18 16:16:41 -05:00
Albert Santoni 3c064b13a9 Merge branch '2.5.x' into saas
Conflicts:
	airtime_mvc/locale/hy/LC_MESSAGES/airtime.po
	airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.po
2015-02-18 16:03:14 -05:00
Albert Santoni 68cd5b027a CC-5998: Prevent users from spamming the delete button in the library 2015-02-18 15:56:28 -05:00
Albert Santoni 717d322dc8 Fix typo breaking provisioning/create/ 2015-02-18 15:22:47 -05:00
Albert Santoni 3668a60139 Merge branch 'saas-provisioning-controller' into saas 2015-02-18 13:48:34 -05:00
Albert Santoni 12c0617e57 Set up the cc_music_dirs entry in /provisioning/create 2015-02-18 13:27:52 -05:00
Albert Santoni dcac7ab652 Fixed a couple of bugs in the new /provisioning/create API 2015-02-18 12:21:15 -05:00
Albert Santoni b90a7972e1 Merge pull request #95 from danielhjames/2.5.x
Removed obsolete localization files
2015-02-18 10:16:41 -05:00
Daniel James 0c14f51455 Removed more obsolete files, more complete versions are now in ja directory 2015-02-18 11:05:46 +00:00
Daniel James ebf2b49108 Removed obsolete localization files, now in hy_AM 2015-02-18 11:02:36 +00:00
drigato 5bd3371ec2 SAAS-596: Store file size and hash in database
Removed getFileSize from CloudFile.php since it can call the parent
function.
Moved setting filesize metadata from cloud_storage_uploader.
2015-02-17 16:51:25 -05:00
Albert Santoni d2fae5adae Testing out only creating the database tables ... 2015-02-17 16:49:52 -05:00
drigato fe7071b5e3 SAAS-596: Store file size and hash in database
Fixing bad merge ?(not really sure what happened here)
2015-02-17 16:28:33 -05:00
drigato c1086842d3 Merge branch 'cc-5709-airtime-analyzer-store-file-size-and-hash-in-db' into saas-store-file-size-and-hash-in-db
Conflicts:
	airtime_mvc/application/Bootstrap.php

airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-17 16:19:58 -05:00