Duncan Sommerville
ccb4b1552e
Merge branch '2.5.x-albertenhancements' into saas
2015-03-02 15:26:13 -05:00
Duncan Sommerville
0272eaef44
Changed is_null to empty
2015-03-02 15:25:52 -05:00
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
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
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
drigato
2272451e08
Added placeholders for player embed code and preview
2015-02-25 17:10:41 -05:00
drigato
7e167e5a47
Temporarily disabling disk quota limit until all file sizes have been set
2015-02-25 15:28:48 -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
cf11291877
Merge branch 'saas' into saas-embed-player
2015-02-25 12:13:41 -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
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
drigato
5e9252a562
SAAS-587: Add stream urls to station-metadata API
...
Fix typo
2015-02-20 15:52:13 -05:00
drigato
6dcc7ee2fc
SAAS-587: Add stream urls to station-metadata API
2015-02-20 15:50:40 -05:00
drigato
40d6249229
Merge branch 'saas' into saas-embed-player
2015-02-20 14:47:57 -05:00
Albert Santoni
2e2c3d6276
Merge of cc-5709-airtime-analyzer-saas-refactor into saas
2015-02-20 14:27:16 -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
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
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
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
Duncan Sommerville
72e4a036a4
Cleaning up editFileMD in LibraryController
2015-02-17 15:09:18 -05:00
Duncan Sommerville
29d7e20622
Fixing file metadata sanitization
2015-02-17 12:39:58 -05:00
Duncan Sommerville
29c6ae15b0
Merged cc-5709-airtime-analyzer into saas-file-sanitization
2015-02-17 12:19:11 -05:00
Duncan Sommerville
a07a1edcc0
SAAS-595 - Updated validation and sanitization
2015-02-17 12:17:49 -05:00
Albert Santoni
e603597101
Cleanup and comments
2015-02-17 12:13:37 -05:00
Duncan Sommerville
ad5536dedd
SAAS-582 - Added provisioning class to create database from within Airtime
2015-02-12 15:39:22 -05:00
drigato
c261182c8f
Skeleton player form/view/controller
2015-02-12 14:08:06 -05:00
Duncan Sommerville
dd095e8933
Added create endpoint to provisioning controller, fixed RestAuth helper
2015-02-09 17:41:03 -05:00
Albert Santoni
2cf0f7da7a
Merge branch 'cc-5709-airtime-analyzer' into saas
...
Conflicts:
airtime_mvc/application/configs/ACL.php
2015-02-06 16:06:32 -05:00
