Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
12955 commits 3 branches 0 tags 405 MiB
Commit graph

4253 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
a0f5e33855 Added "Help Center" link to Help menu for Josh 2014-12-17 16:10:04 -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
ad56d6cafb Show the plan and station URL in Live Chat 2014-12-11 17:40:34 -05: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
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
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
11a31375df Slightly more robust fix for the last issue 2014-11-18 17:41:44 -05:00
Albert Santoni
162995bb49 Merge branch 'cc-5709-airtime-analyzer' into saas 2014-11-18 17:14:01 -05:00
Duncan Sommerville
6460854fda Fixed 'clear' button not working when files failed to import 2014-11-18 17:13:48 -05:00
Albert Santoni
e7e1926896 CC-5950: Fix for issue where clear button in Recent Uploads didn't work 
sometimes
 2014-11-18 17:11:09 -05:00
Albert Santoni
21ea2a2933 Merge branch '2.5.x' into saas 
Conflicts:
	airtime_mvc/application/models/Show.php
 2014-11-13 14:22:25 -05:00
Albert Santoni
864352c6a7 Merge branch 'cc-5709-airtime-analyzer' into saas 
Conflicts:
	python_apps/airtime_analyzer/airtime_analyzer/status_reporter.py
 2014-11-12 17:04:00 -05:00
drigato
95517cac87 Fix exception thrown when the analyzer doesn't return filesize with the metadata 2014-11-12 14:45:50 -05:00
Duncan Sommerville
c580e8a569 Removed references to show instance description 2014-11-11 19:07:33 -05:00
Duncan Sommerville
769e0e1d82 Fixed 'clear' button not working when files failed to import 2014-11-10 16:07:51 -05:00
Duncan Sommerville
af8c6c2f48 Merged 2.5.x into saas 2014-11-10 09:08:03 -05:00
Duncan Sommerville
f6bf2f8cc5 Changed tabs to spaces 2014-11-07 12:05:29 -05:00
Duncan Sommerville
8fc7178d82 Added several global constants for reoccurring strings in Airtime to aid dynamic translations 2014-11-06 18:40:19 -05:00
Duncan Sommerville
efd05c4b77 Added the _initTranslationGlobals function to bind PHP globals to javascript vars for dynamic translation purposes 2014-11-06 18:40:06 -05:00
Duncan Sommerville
795e239ff3 Made several reoccurring strings into application constants and altered any static strings containing them to use these constants in string format calls. 2014-11-06 18:39:48 -05:00
Duncan Sommerville
62a915f109 Added global define for application name 2014-11-06 11:57:05 -05:00
Duncan Sommerville
4d263ce897 Merged 2.5.x into saas 2014-11-05 17:36:58 -05:00
Duncan Sommerville
e5e7942b42 Added getUserLocale function to pull locale data into the Login form 2014-11-05 17:24:54 -05:00
Duncan Sommerville
eecd3fa188 Added setDefaults call to initialize the locale field to user's locale, or the station default; removed unnecessary field 2014-11-05 17:24:08 -05:00