Martin Konecny
|
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 |
|
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 |
denise
|
e262d48eec
|
CC-4675: Preferences: Error messages are hidden
-fixed
|
2012-11-06 12:17:45 -05:00 |
denise
|
5b9add360c
|
CC-3718: Please enable user to input the mail server settings
-fixed soundcloud settings from collapsing if there are form input errors
|
2012-06-11 15:18:12 -04:00 |
|
denise
|
ca8187c9c2
|
CC-3718: Please enable user to input the mail server settings
-done
|
2012-06-11 12:53:09 -04:00 |
James
|
48bb19d758
|
CC-3224: "On-the-fly" stream rebroadcasting
- web interface
- auth script for liquidsoap
- DB changes
|
2012-03-14 14:41:00 -04:00 |
|
James
|
ca04a7a686
|
CC-3224: "On-the-fly" stream rebroadcasting
- Form in preference section
|
2012-03-14 14:41:00 -04:00 |
|
James
|
d83f9f1b96
|
CC-2701: Separate Support Settings from Preference page
- done.
|
2011-08-18 18:58:59 -04:00 |
Naomi Aro
|
253eb811c7
|
Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' into devel
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/models/Preference.php
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/public/js/airtime/preferences/preferences.js
|
2011-06-21 11:20:35 +02:00 |
|
Naomi Aro
|
b6888489e0
|
CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
adding music dirs concept to Airtime. New cc_music_dirs table/class.
|
2011-06-21 10:24:02 +02:00 |
|
james
|
cf654f1a45
|
CC-1724:phone-home-statistics
Rebase from devel into this branch
|
2011-06-15 12:06:50 -04:00 |
|
james
|
11b601308e
|
CC-1724:Phone home statistics
Temp commit
|
2011-06-15 11:17:03 -04:00 |
Paul Baranowski
|
b11cbd8159
|
CC-2166: Packaging Improvements. Moved the Zend app into airtime_mvc. It is now installed to /var/www/airtime. Storage is now set to /srv/airtime/stor. Utils are now installed to /usr/lib/airtime/utils/. Added install/airtime-dircheck.php as a simple test to see if everything is install/uninstalled correctly.
|
2011-04-14 18:55:04 -04:00 |