Martin Konecny
|
8cd6bd9aa4
|
Merge branch 'devel' into 2.3.x-saas
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/forms/AddShowWhen.php
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/forms/LiveStreamingPreferences.php
airtime_mvc/application/forms/SoundcloudPreferences.php
airtime_mvc/application/forms/SupportSettings.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_general.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
airtime_mvc/public/js/airtime/preferences/preferences.js
python_apps/api_clients/api_client.py
python_apps/pypo/listenerstat.py
|
2013-01-15 13:44:44 -05:00 |
denise
|
e5f67c8b05
|
CC-1960: Internationalize Airtime / Support translations
-added gettext wrapper functions for all strings in view/scripts, and forms
|
2012-11-20 11:33:37 -05:00 |
|
Martin Konecny
|
fd3305bc4c
|
SAAS-289: Remove all isSaaS checks
-done
|
2012-11-06 17:10:47 -05:00 |
|
Martin Konecny
|
38d28d3346
|
SAAS-289: Remove all isSaaS checks
|
2012-11-06 16:48:34 -05:00 |
|
Martin Konecny
|
b2327472e8
|
CC-4090: Make code style PSR compliant - part 4
-forms directory
|
2012-08-28 23:04:55 -04:00 |
denise
|
9d90e8c531
|
CC-4300: System -> Preference: Please add a option let user choose if the SMTP server requires User Authentication
-done
|
2012-08-28 16:17:37 -04:00 |
|
Martin Konecny
|
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 |
|
denise
|
ca8187c9c2
|
CC-3718: Please enable user to input the mail server settings
-done
|
2012-06-11 12:53:09 -04:00 |