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

292 Commits

Author SHA1 Message Date
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 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
Duncan Sommerville 69d588d2f6 Merge branch '2.5.x' into 2.5.x-albertenhancements 2015-02-24 10:45:52 -05:00
drigato ac8fadfc80 Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas 
Conflicts:
	CREDITS
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/application/views/scripts/form/support-setting.phtml
 2015-01-23 16:36:31 -05:00
drigato ca9750f415 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/configs/ACL.php
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/build/sql/schema.sql
 2015-01-23 11:32:45 -05:00
Albert Santoni fd42c67b0b Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2015-01-21 18:08:05 -05:00
drigato 2fadc8f8f1 Merge branch '2.5.x' into saas 
Conflicts:
	CREDITS
 2015-01-20 11:44:53 -05:00
Albert Santoni 0c3395289d Merge pull request #78 from Robbt/realtime-smart-blocks 
Added sort tracks by upload time to smart blocks criteria
 2015-01-19 15:36:28 -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 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 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 fcbb1c2ee7 String updates 2014-11-14 10:01:06 -05:00
Duncan Sommerville af8c6c2f48 Merged 2.5.x into saas 2014-11-10 09:08:03 -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
Robbt fe291cdc8c Added sort tracks by upload time to smart blocks criteria 2014-10-19 23:02:40 -04:00
Robert Elder 9fb35c448e Resolved merge conflicts for merging cc-5709-airtime-analyzer into saas. 2014-10-10 19:57:22 +00:00
dpsommer 9a21b99fdf Merge pull request #70 from RobertElder/more-tokens 
More tokens
 2014-10-07 10:10:14 -04:00
Robert Elder dbed915469 Tokens for preferences form. 2014-10-01 19:36:17 +00:00
Robert Elder 2be4a5f9d0 Add form tokens to several forms. 2014-09-30 23:09:27 +00:00
Albert Santoni 1c676dee6d Fix user settings again for Super Admins, also Zend routing tweak 
* Better fix for language and interface settings not being able to change for Super Admins
* Fixes Zend routing on Trusty, for whatever reason
 2014-08-01 12:50:02 -04:00
Albert Santoni d320651735 SAAS-461: Re-enable timezone and language settings for Super Admins 2014-07-28 12:37:40 -04:00
drigato f40cdbc8cd Merge branch 'saas' into cc-5709-airtime-analyzer-buy-now-saas 2014-06-23 10:59:07 -04:00
Albert Santoni faa12c8065 Super Admin edit page points to billing now 
* Also prevent super admin from being deleted
 2014-06-20 13:36:06 -04:00
Naomi Aro 49474ab5c4 Merge branch '2.5.x' into 2.5.x-saas 
Conflicts:
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
 2013-12-17 17:20:38 -05:00
denise 55254e88a5 UI text improvements for setting the station/user timezones 
Added info icon in the add-show form for timezone setting
 2013-10-07 14:49:52 -04:00
Albert Santoni 7b1cd5c908 CC-5354: Remove PHP short open tags for better compatibility 2013-10-04 14:15:23 -04:00
denise 107263ae20 CC-5323: User's Timezone Can Improperly Edit Show 2013-09-25 16:22:30 -04:00
Naomi Aro 682a37894b Merge branch 'ryerson-history' into 2.5.x-saas 
Conflicts:
	airtime_mvc/application/views/scripts/menu.phtml
 2013-09-02 15:52:43 -04:00
Naomi Aro 9c0bee3877 adding show instance to the create form if it's already set. 2013-08-31 23:34:37 -04:00
Naomi Aro 0e017374b7 change default text to "No Show" 2013-08-30 01:30:23 -04:00
Naomi Aro 15e27f8166 history records for a show have times validated within show range. 2013-08-30 00:43:43 -04:00
Naomi Aro 5a8957273f removing choice for show instance if in shows tab. 2013-08-29 18:52:40 -04:00
Naomi d50cdd16c2 starting association of a show instance. 2013-08-29 17:40:08 -04:00
Naomi Aro 01370c2124 reverting back to the bootstrap datetime picker since it's nicer to use. 2013-08-22 20:23:17 -04:00
Naomi Aro 9b45b9dc72 converting to a jquery UI based datepicker. 2013-08-16 15:12:00 -04:00
Naomi d83c004fb9 subclassing the template types, files summary table is now fully configurable form wise. 2013-08-12 15:06:26 -04:00
Naomi 46ecdf393d dynamic form rendering for template 
bootstrap datetime widget.

jquery update is needed, testing with hosted jquery first.
 2013-07-26 17:33:17 -04:00
Naomi 69afc715d1 creating templates for validation. 2013-07-22 18:11:44 -04:00
Naomi Aro 29c8570ade editing in progress 2013-07-18 01:31:20 -04:00
Naomi c744d88f23 IM-784 : Create Editing Abilities For History 2013-07-08 18:00:02 -04:00
Martin Konecny 3b9b23a7dd Merge branch '2.3.x-saas' into 2.4.x-saas 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/airtime-playout
 2013-05-21 16:40:10 -04:00
Naomi 7d5177d77d CC-5096 : Add "i" (info) icon to stream output type 2013-05-14 18:14:38 -04:00
Naomi 517bb7557a CC-2301 : testing default crossfade settings 2013-05-02 16:15:21 -04:00
Naomi 410d298272 CC-2301 : creating an offset column to help create crossfades in the playlist. 
changing default fade to be a separate default fade in/out
 2013-04-29 16:55:08 -04:00
Martin Konecny 8bec9dea55 Merge branch '2.3.x' into 2.3.x-saas 2013-02-20 14:41:55 -05:00
Martin Konecny 60d6f5585b CC-4913: System -> Media Folder: Exception happens when media folder's path contains '<' 2013-02-04 16:27:09 -05:00
Martin Konecny 0a198ae424 Merge branch '2.3.x' into 2.3.x-saas 
Conflicts:
	airtime_mvc/application/models/User.php
 2013-01-30 18:31:45 -05:00