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

4879 commits

Author SHA1 Message Date
Albert Santoni
c03dd38c00 Merge branch '2.5.x' into 2.5.x-installer 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/models/Show.php
 2015-01-16 17:27:52 -05:00
Duncan Sommerville
44018b2cbf Changed status page to use config-check (tentative) and removed time-intensive check in index routing 2015-01-16 16:15:16 -05:00
drigato
38882abd1a SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download 2015-01-16 15:15:37 -05:00
drigato
527d2851af SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download 2015-01-16 15:15:14 -05:00
drigato
19626ed4f5 SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download 2015-01-16 13:26:55 -05:00
drigato
775008b274 SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download 2015-01-16 12:13:04 -05:00
drigato
57a7218a79 SAAS-540: Change the Provisioning Controller's terminate endpoint to reflect new S3 file prefix 2015-01-16 11:09:13 -05:00
Duncan Sommerville
04a1d82172 Upgrade step from 2.5.1 installs 2015-01-16 09:32:55 -05:00
Duncan Sommerville
36c889a3a2 Merge branch '2.5.x-installer' of https://github.com/sourcefabric/Airtime into 2.5.x-installer 2015-01-15 17:34:33 -05:00
Duncan Sommerville
4552089c19 Fixes to install & uninstall procedure 2015-01-15 17:33:47 -05:00
Duncan Sommerville
791466b023 Fixes for code review https://github.com/sourcefabric/Airtime/pull/84 2015-01-15 16:33:33 -05:00
Albert Santoni
7c28b66ce9 Merge branch '2.5.x-albertenhancements' into saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/forms/Preferences.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
 2015-01-15 16:32:29 -05:00
Albert Santoni
f9bf71a349 Moved the Station Logo field to GeneralPreferences, and stopped using 
AJAX on the general prefs form
 2015-01-15 16:28:18 -05:00
Albert Santoni
11acca32f9 Update comment at the top of conf.php to reflect config file 
amalgamation
 2015-01-15 15:36:22 -05:00
Albert Santoni
ee9163fa8e 2.5.2: Reorganize upgrade path so that 2.5.2 contains the show art schema changes 
* Also bump the system_version number to 2.5.2. This will be deprecated sooner or later...
 2015-01-15 12:42:36 -05:00
Daniel James
cfe3527b93 Fix link to user manual 2015-01-15 16:33:03 +00:00
Duncan Sommerville
a5cc529c4a Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas 2015-01-15 11:24:16 -05:00
Duncan Sommerville
5e22f929c7 Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
Duncan Sommerville
df2576e5a0 Updated installer to better accommodate running over existing installs 2015-01-14 16:11:49 -05:00
drigato
754c7bfc64 Removed code that was deleting the cloud_file database records in the case of 
station termination. The database will remain as is in case we have to restore
the files.
 2015-01-14 15:15:23 -05:00
Albert Santoni
609a46dfa3 Comment Airtime_Decorator_SuperAdmin_Only 2015-01-14 15:12:20 -05:00
Albert Santoni
c24a040689 Fixed my SuperAdmin_Only decorator 2015-01-14 14:34:14 -05:00
Albert Santoni
d5b969f94f Merge branch '2.5.x' into saas 
Conflicts:
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
 2015-01-13 21:31:57 -05:00
Albert Santoni
3247f6992a Merge branch 'saas-pullreq77' into saas 2015-01-13 20:59:02 -05:00
Albert Santoni
c4d3a8fa62 Massive simplification of the GeneralPreferences dialog 
* The purpose of this was so that we can use Zend_Form_Element
  decorators, which I need.
 2015-01-13 20:51:46 -05:00
Duncan Sommerville
a0e5c975dd Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x 2015-01-13 15:50:38 -05:00
drigato
a4461dc79a Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 2015-01-13 15:50:20 -05:00
drigato
2185fc9ca4 SAAS-536: Check for future scheduled files uses cloud_file id instead of cc_files id 2015-01-13 15:49:57 -05:00
drigato
c264747a54 Removed silly logging statement 2015-01-13 15:25:36 -05:00
drigato
d99147bad4 Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas 2015-01-13 14:23:51 -05:00
Albert Santoni
caf37e1b87 CC-5975: Default fade-in/out, and crossfade time validators don't work 
* Fixed the number formatting and validation in the preferences and streaming preferences
  (the silly 00.5-style numbers are gone)
* Regex decmical validation of the default fade-in, fade-out, and
  crossfade duration was totally broken (you could enter words and it would work). That's fixed now.
 2015-01-13 12:18:57 -05:00
Albert Santoni
9cfcaf2ffd SAAS-537: Fixed the week view of the schedule widgets 
* Also improved the instructions inline for how to use them...
  (this is a stop-gap measure until we get a real iframe widget)
* ALSO renamed the field HTML Code since it's not JS! (it was
  misleading before)
 2015-01-12 22:29:21 -05:00
drigato
e17b330186 Remove just previously added logging statements 2015-01-12 16:26:27 -05:00
drigato
c7c683966d Logging 2015-01-12 16:21:53 -05:00
drigato
7bdf34fcd1 Logging 2015-01-12 15:58:50 -05:00
drigato
8f0f69abd9 More logging 2015-01-12 15:45:33 -05:00
drigato
44b82fdd8a More logging statements 2015-01-12 15:37:48 -05:00
drigato
85557d4886 Logging statements 2015-01-12 15:29:41 -05:00
drigato
02e4c18931 SAAS-531: Finalize S3 folder hierarchy 2015-01-12 14:50:42 -05:00
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