Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,439 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

13439 Commits

Author SHA1 Message Date
Duncan Sommerville a7cedbb34f Merge branch '2.5.x-albertenhancements' into saas 2015-03-02 15:10:37 -05:00
Duncan Sommerville b6a6f038a9 Added call to setStationDescription in preferences action 2015-03-02 15:10:04 -05:00
Duncan Sommerville 7a035e91ec Merge branch '2.5.x-albertenhancements' into saas 2015-03-02 14:58:33 -05:00
Duncan Sommerville 13bd0b7589 Fixed removing image when saving preferences with no upload 2015-03-02 14:57:50 -05:00
Albert Santoni 76141b38b8 Merge branch 'saas' into saas-media-refactor 2015-03-02 09:52:05 -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 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 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
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
Albert Santoni edd07c18ae Fixed invalid detection of S3 backend in analyzer 2015-02-26 12:02:02 -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
Albert Santoni 1ad024ca8d Merge branch 'cc-5709-airtime-analyzer' into saas-media-refactor 2015-02-25 16:06:27 -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
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
Albert Santoni a52e2faeb9 SAAS-602: Fix getaddrinfo deadlock (again) 2015-02-24 13:10:20 -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
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