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
|
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 |
Duncan Sommerville
|
fcbb1c2ee7
|
String updates
|
2014-11-14 10:01: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 |
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 |
|
Albert Santoni
|
7b1cd5c908
|
CC-5354: Remove PHP short open tags for better compatibility
|
2013-10-04 14:15:23 -04:00 |
Martin Konecny
|
bd3d12bd26
|
CC-4849: 2.3.x-saas: Empty page for Support feedback
-fixed
|
2013-01-16 12:34:20 -05:00 |
|
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
|
542434d9f0
|
CC-1960: Internationalize Airtime / Support translations
-got rid of spaces at beginning of strings
-removed empty string translations
-overwrote Zend_Validate_Between object error messages
|
2012-11-28 16:16:39 -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 |
Rudi Grinberg
|
a69ff167d4
|
mass string change to _
|
2012-11-20 11:33:37 -05:00 |
|
Rudi Grinberg
|
15741bdfa9
|
renamed links
|
2012-11-20 11:29:56 -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 |
Daniel James
|
f77ec31a8d
|
CC-4552: Small formatting improvement
|
2012-10-11 17:44:08 +01:00 |
|
Daniel James
|
843a456b3b
|
CC-4552: Fixed various errors in Support Feedback page
|
2012-10-11 17:03:09 +01:00 |
denise
|
f57d316b6c
|
CC-3920: Phone home stats: explain to the user the benefits to them to clicking YES
-changed support feedback message
-fixed whitespace in register-dialog.phtml
|
2012-06-06 11:10:29 -04:00 |
|
denise
|
e3bacba39b
|
CC-3920: Phone home stats: explain to the user the benefits to them to clicking YES
-done
|
2012-06-05 11:20:00 -04:00 |
James
|
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 |
Yuchen Wang
|
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 |
martin
|
929e29182b
|
CC-2908: Add "Live Stream" title to live stream popup window
-custom logo
|
2011-10-04 17:18:36 -04:00 |
|
James
|
b682c2cd10
|
CC-2902: Broken link in interface: "Click the box below to advertise
your station on Sourcefabric.org"
- fixed
|
2011-10-04 12:04:09 -04:00 |
|
James
|
405edcc5fa
|
CC-2718: Changes to the support page
- "Help Airtime" button is enanbled solely depending on feedback checkbox
when user already agreed to Terms and condition
|
2011-08-23 16:46:29 -04:00 |
|
James
|
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 |
|
James
|
bb97a0eede
|
CC-2704: Support Setting UI tweak
- move station name under publicise
- make it required field
|
2011-08-19 13:09:10 -04:00 |
|
James
|
db225dd610
|
CC-2704: Support settings UI tweaks
- Move station name to "Support Settins" page
|
2011-08-19 12:19:35 -04:00 |
|
James
|
d83f9f1b96
|
CC-2701: Separate Support Settings from Preference page
- done.
|
2011-08-18 18:58:59 -04:00 |