Commit Graph

12955 Commits

Author SHA1 Message Date
Albert Santoni f0bad70cee Merge branch '2.5.x' into saas-pullreq77
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/ApiController.php
2015-01-09 13:10:54 -05:00
Mark Lewis 17a577fbbb use is_numeric instead of is_int as values are strings 2015-01-09 13:02:25 -05:00
Mark Lewis 1b03bd7fbd use new var instaead of calling getShowListContent again 2015-01-09 13:02:25 -05:00
Mark Lewis fc8e65944e added error checked for required params 2015-01-09 13:02:25 -05:00
Mark Lewis 1cc1f8a378 return error for missing instance_id on show-tracks action 2015-01-09 13:02:25 -05:00
Mark Lewis 174cf79d84 clean up shows endpoint, remove dependency on Show model 2015-01-09 13:02:25 -05:00
Mark Lewis a27ca2f583 cleanup new HTTP apiendpoints, added HTTPHelper and getStartEndFromRequest and updated all controllers that called their own versions of this function 2015-01-09 13:02:25 -05:00
Mark Lewis 03dae5be2b fix spacing in ApiController 2015-01-09 13:01:43 -05:00
Mark Lewis 44b4faf6d9 added shows, show-schedules, show-preview, show-history-feed, item-history-feed endpoints to the HTTP api to be used via NewscoopAirtimePlugin 2015-01-09 13:01:42 -05:00
Albert Santoni 8d56e9e1ff Merge branch '2.5.x' into saas 2015-01-09 10:44:47 -05:00
Albert Santoni 05c9e21e48 Recognize audio/aac as a MIME type for webstreams 2015-01-09 10:44:24 -05:00
Albert Santoni f08970822d Merge branch '2.5.x' into saas 2015-01-07 12:37:26 -05:00
Albert Santoni 3225fcc6bc Fix syntax errors in fdkaac.liq 2015-01-07 11:35:43 -05:00
Albert Santoni fc912923ce Force the use of FDK-AAC and significantly boost AAC sound quality 2015-01-06 12:58:11 -05:00
localizer 59d7c23450 updated translation resources 2014-12-23 10:10:38 +00:00
Albert Santoni a0f5e33855 Added "Help Center" link to Help menu for Josh 2014-12-17 16:10:04 -05:00
Albert Santoni e29675a6b4 Remove debian/ directory and gen-snapshot. They're moving to the
packaging repo.
2014-12-17 11:31:10 -05:00
Albert Santoni d5fc90e9d3 Merge branch '2.5.x' into saas 2014-12-15 10:50:25 -05:00
Albert Santoni 8766519c71 Another tweak to Opus sound quality. Liquidsoap picks undocumented poor
defaults for almost every encoder.
2014-12-15 10:49:21 -05:00
Albert Santoni 3b88b0ce22 Boost the Opus sound quality 2014-12-15 10:42:45 -05:00
Albert Santoni 797bafa453 Make the LiveChat changes from yesterday slightly more reslient to
missing database keys.
2014-12-12 11:57:16 -05:00
Albert Santoni b65cf15ddd Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2014-12-12 11:34:00 -05:00
Albert Santoni ad56d6cafb Show the plan and station URL in Live Chat 2014-12-11 17:40:34 -05:00
localizer cceddd57d8 updated translation resources 2014-12-05 10:33:17 +00:00
Albert Santoni 183fa7b3a3 Bind CURL calls to WHMCS to ipv4 adapter because WHMCS IP whitelist
doesn't support IPv6

* Fixes WHMCS login for all airtime.pro users
2014-12-01 16:10:03 -05:00
Albert Santoni 94d9577539 Temporarily disable the Google Tag Manager generation for debugging 2014-12-01 11:34:47 -05:00
localizer 37e358630d updated translation resources 2014-11-27 14:57:16 +00:00
Albert Santoni b037bfdf97 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2014-11-24 13:20:03 -05:00
Albert Santoni 3d0d148169 Fix race condition in selenium tests 2014-11-24 10:44:36 -05:00
Albert Santoni a62e98beb4 Fix logins from WHMCS by disabling CSRF token on login page for trusted
origins
2014-11-20 19:33:11 -05:00
Albert Santoni ca7d0688e7 Merge branch 'cc-5709-airtime-analyzer' into saas
Conflicts:
	airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-11-20 16:47:35 -05:00
Albert Santoni 7db571d103 Remove clearAction from the media REST API for security 2014-11-20 16:47:02 -05:00
Albert Santoni 8ffd70781b Remove clearAction from the media REST API for security 2014-11-20 16:46:21 -05:00
Albert Santoni 29fd728d7d Undo live stream auth action breakage 2014-11-20 14:30:42 -05:00
Albert Santoni 0890de4cdd Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2014-11-20 14:00:12 -05:00
Albert Santoni cea3fc5302 Temporarily fix live stream auth (show source) 2014-11-20 13:59:59 -05:00
drigato 00fbda193e Schedule->removeItems optimization fix for deleting the current playing track 2014-11-20 09:57:37 -05:00
drigato 767562922a Schedule->removeItems optimization fix for deleting the current playing track 2014-11-19 17:09:54 -05:00
drigato 766c827094 Removed undefined index from show info array 2014-11-19 16:04:06 -05:00
drigato 48ae8ac69c Scheduler->removeItems optimization 2014-11-19 15:13:33 -05:00
drigato 5fdca78041 Scheduler->removeItems optimization 2014-11-19 14:30:18 -05:00
Albert Santoni 9087db2043 Removed base URL from saas Selenium tests and added missing Account
Plans tests
2014-11-19 11:30:32 -05:00
Albert Santoni 3bf68bdbe6 Merge branch '2.5.x' into saas 2014-11-19 11:29:34 -05:00
Albert Santoni 12550112fd Remove base URL from selenium tests to make the Selenium IDE happy 2014-11-19 11:28:03 -05:00
Albert Santoni 755df62a00 Merge branch 'cc-5709-airtime-analyzer' into saas
Conflicts:
	airtime_mvc/application/models/StoredFile.php
2014-11-18 18:18:44 -05:00
Albert Santoni c829b6bf95 Fix bad merge 2014-11-18 18:17:19 -05:00
Albert Santoni dd3b54f8ed Actually delete files from the database via the media REST API 2014-11-18 18:15:45 -05:00
Albert Santoni 4f7f64af7a Merge branch 'cc-5709-airtime-analyzer' into saas 2014-11-18 17:45:08 -05:00
Albert Santoni cbb8ac7dc6 Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2014-11-18 17:45:00 -05:00
Albert Santoni 11a31375df Slightly more robust fix for the last issue 2014-11-18 17:41:44 -05:00