272e428fa7
Merge branch '2.2.x' into 2.2.x-saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/forms/EmailServerPreferences.php
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/forms/LiveStreamingPreferences.php
airtime_mvc/application/forms/Preferences.php
airtime_mvc/application/forms/SupportSettings.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
airtime_mvc/application/views/scripts/menu.phtml
airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
2012-11-06 17:23:32 -05:00
fd3305bc4c
SAAS-289: Remove all isSaaS checks
...
-done
2012-11-06 17:10:47 -05:00
38d28d3346
SAAS-289: Remove all isSaaS checks
2012-11-06 16:48:34 -05:00
e3c1a3ac0e
CC-4434: Make Application_Model_Preference::getValue and setValue private methods
...
-initial commit
2012-09-14 12:09:40 -04:00
b2327472e8
CC-4090: Make code style PSR compliant - part 4
...
-forms directory
2012-08-28 23:04:55 -04:00
7ce4934cdc
CC-4090: Make code style PSR compliant
...
-removed all trailing whitespace in forms directory
-replace all tabs with 4 spaces
2012-07-10 18:55:44 -04:00
e91c96b90e
CC-4090: Make code style PSR compliant
...
StreamSetting.php
2012-07-09 23:32:21 -04:00
12be26925e
-set p_keepData parameter to true when Application_Model_Preference::GetSystemInfo is called
...
-this will keep all the cc_live_log data in tact if support-settings are saved
2012-05-14 15:38:04 -04:00
20f0f5e523
CC-2926: Clicking "Choose File" in support settings to upload image defaults to "Audio/MPEG" type in Chrome
...
-Fixed.
2011-12-05 12:04:02 -05:00
a723430462
SAAS-69: Support Settings: Change/hide some sections for SaaS
...
- Some sections are hidden when saas is enabeld
as described in the ticket.
2011-11-15 16:10:40 -05:00
5d741d84ee
CC-3001: Preferences->"Submit" button renamed to "Save", and should be at the top and the bottom of the screen
...
Changed all other buttons that says "Submit" to "Save.
Also added some CSS stuff so that the "Save" button at the top of Preference page
have some space between itself and the form below.
2011-11-09 16:03:32 -05:00
8f75bf1870
CC-2966: Remove minimum and maximum logo sizes - make them recommended instead
...
Fixed by:
1. change wording
2. attach custom filter to the logo upload form, the filter scales down the image
if it's larger than 600x600
2011-11-09 15:35:14 -05:00
5d4486b08f
CC-2926: Clicking "Choose File" in support settings to upload image
...
defaults to "Audio/MPEG" type in Chrome
- done
2011-10-27 10:14:39 -04:00
b90b69ebde
CC-2926: Clicking "Choose File" in support settings to upload image
...
defaults to "Audio/MPEG" type in Chrome
- fixed
- extra fix: removing debugging code from api_client.py
2011-10-05 11:21:13 -04:00
4c4b57fd31
CC-2718: Changes to the support page
...
- overriding isValid in RegisterAirtimeForm
2011-08-23 16:09:11 -04:00
796a762908
CC-2718: Changes to the support page
...
- only need to validate publicise fields when publicise is on
2011-08-23 15:42:36 -04:00
3e3391dfba
CC-2718: Changes to the support page
...
- stroing and retreving new value "privact" to DB
- Displaying "Terms and Condition" link when user agrees it
2011-08-23 15:11:21 -04:00
bb97a0eede
CC-2704: Support Setting UI tweak
...
- move station name under publicise
- make it required field
2011-08-19 13:09:10 -04:00
db225dd610
CC-2704: Support settings UI tweaks
...
- Move station name to "Support Settins" page
2011-08-19 12:19:35 -04:00
d83f9f1b96
CC-2701: Separate Support Settings from Preference page
...
- done.
2011-08-18 18:58:59 -04:00
Martin Konecny
denise
Martin Konecny
James
Yuchen Wang