8b33acacd3
Merge branch 'saas-sessionoptimizations' into saas-3.x-sessionoptimizations
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/configs/constants.php
airtime_mvc/application/controllers/LoginController.php
airtime_mvc/application/controllers/UserController.php
airtime_mvc/public/js/airtime/preferences/preferences.js
2015-09-29 18:58:55 -04:00
a86e3ed4a8
Improvements to the preferences screen
2015-09-23 18:21:30 -04:00
63ce022a8d
SAAS-1040 - station logo functionality improvements
2015-09-02 15:28:36 -04:00
c44bae8140
Merge branch 'saas-dev' into soundcloud
...
Conflicts:
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/public/js/airtime/preferences/preferences.js
2015-06-26 10:37:30 -04:00
6497bc28c5
Show collapsible sections (other than 'dangerous settings') by default on preferences page
2015-06-25 17:43:15 -04:00
459f9494c3
Merge saas-dev into soundcloud
2015-06-10 16:08:52 -04:00
b0b6e037ac
CC-6046, CC-6045, CC-6047 - New SoundCloud implementation
2015-06-03 16:57:17 -04:00
a2a9e54553
Merge branch 'saas-dev' into saas-tunein
...
Conflicts:
airtime_mvc/application/views/scripts/form/preferences.phtml
2015-05-19 15:50:16 -04:00
b023f191e3
SAAS-772: Send metadata to Tunein
...
Added form validation by making a test request to the TuneIn API with
the user-entered values
2015-05-14 13:13:33 -04:00
cf24c141fd
SAAS-772: Send metadata to Tunein
...
This is pretty much working for scheduled metadata - just to need to
test with a TuneIn account.
2015-05-13 16:05:37 -04:00
15bebc6267
Dangerous options subform on Preferences page and Delete all tracks button
2015-05-13 15:56:08 -04:00
936d11b367
Merge branch '2.5.x-albertenhancements' into saas
2015-02-27 17:21:20 -05:00
78c7170c4e
Reformatted logo remove button to use Zend
2015-02-27 17:19:37 -05:00
562c2f0100
Remove widget JS snippet animation because it's bugged
2015-02-24 15:18:39 -05:00
e13e4413ea
Merge remote-tracking branch 'origin/2.5.x-albertenhancements' into saas
2015-02-24 15:03:06 -05:00
5e256df061
Added remove button for station logo on preferences page
2015-02-24 12:12:30 -05:00
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
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
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
4d263ce897
Merged 2.5.x into saas
2014-11-05 17:36:58 -05:00
3046003a1b
Removed unnecessary cookie declaration for default locale
2014-11-05 17:27:41 -05:00
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
a3eda62bb2
CC-5113: Preferences -> Mail Server Config: Error present will cause web form read-only
2013-05-10 15:18:54 -04:00
525b2dcb33
CC-4895: Remove all json die() statements from code
...
- removed json_encode
2013-02-07 15:41:47 -05:00
7c327e4c75
Merge branch '2.3.x' into 2.3.x-saas
2013-01-25 12:12:21 -05:00
1873022a13
CC-4876: Default interface language setting does not appear to affect text or drop-down menu on login page?
...
-fixed
2013-01-25 11:21:34 -05:00
c57e19983c
-fix merge mistakes from devel
2013-01-15 14:06:02 -05:00
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
fae3f3a03f
CC-2184: Hardcoded CSS path should be relative path instead
...
-Make '/' the default root
2013-01-14 16:00:38 -05:00
c11edea253
CC-4802: Preferences -> Soundcloud settings: Sub-options can be checked before major one
...
-fixed
2013-01-11 13:13:36 -05:00
b1985e2bdf
SAAS-290: Hosted SaaS widgets + javascript code generation
...
-fix code box not automatically expanding on page refresh
2012-12-04 17:42:28 -05:00
ef8f8dfa75
CC-4688: System -> Preferences: Please expand the Soundcloud settings if warning for wrong settings exists
...
-fixed
2012-11-12 11:45:26 -05:00
4b09b289ce
SAAS-290: Hosted SaaS widgets + javascript code generation
...
Slight improvements to description as well as element
positioning
2012-11-07 15:44:22 -05:00
1b0b124247
SAAS-290: Hosted SaaS widgets + javascript code generation
...
-working code
2012-11-07 12:49:17 -05:00
3a7700eaac
CC-4583: Use AJAX calls instead of refreshing entire page
...
-done
2012-10-26 18:09:30 -04:00
84deda99c5
CC-4440: System -> Streams: Update and Save 'Stream 1/2/3' will make it invisible
...
-fixed
2012-09-14 17:35:14 -04:00
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
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
ca8187c9c2
CC-3718: Please enable user to input the mail server settings
...
-done
2012-06-11 12:53:09 -04:00
701ed82f40
CC-3224: "On-the-fly" stream rebroadcasting
...
- interface implementation. subform within the show form.
2012-03-14 14:41:00 -04:00
f855da0f45
Merge branch '1.9.1' into devel
...
Conflicts:
VERSION
airtime_mvc/application/configs/constants.php
airtime_mvc/application/configs/navigation.php
install_minimal/DoctrineMigrations/Version20110711161043.php
python_apps/api_clients/api_client.py
2011-08-18 19:05:13 -04:00
d83f9f1b96
CC-2701: Separate Support Settings from Preference page
...
- done.
2011-08-18 18:58:59 -04:00
cf55e92aa3
CC-2607: Ability to adjust stream bitrate, type, etc from UI
...
- removed debug code from NowPlayingController
- New Form for streamsetting
- Action created in PreferenceController
2011-08-18 13:53:12 -04:00
acf5dbd6df
CC-2515:Phone Home Metric:prevent parent window refreshing
...
- fixed.
2011-07-06 11:32:57 -04:00
e69c0ea351
CC-2510:Pref screen: able to select promote my stn
...
- fixed
2011-07-06 11:12:13 -04:00
8475326d96
CC-2475:When Promote is checked promote info section has to be
...
expanded by default
- fixed
2011-06-30 12:29:35 -04:00
43c8a28633
CC-2455:Show what i am sending heading
...
-fixed
2011-06-29 17:28:51 -04:00
c5ec6b5a53
CC-2425:Tweak phone home
...
- privacy check box is uncheck by defalut
- 'Yes' button is disabled on popup form by default
- custom error msg is added for privacy checkbox on preference
form
- promote form is hidden by default
2011-06-26 23:13:49 -04:00
cc542797c7
CC-2425:Tweaks to phone home metric
...
- Done
2011-06-24 17:26:37 -04:00
f1893cebe6
CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
...
making separate js file for music dirs page.
2011-06-21 11:57:56 +02:00
Albert Santoni
Duncan Sommerville
Duncan Sommerville
drigato
Martin Konecny
denise
denise
james
James
James
Naomi Aro