Commit graph

159 commits

Author SHA1 Message Date
Robb Ebright
9dae48702f Added some basic javascript based checking to require album override to be enabled for auto smartblock to be enabled 2017-08-23 12:43:48 -04:00
Lucas Bickel
b93a0eccc6 Build form early and reactivate ajaxy replacing
This makes subform validation work for everything again. I also had to slightly unhack the corresponding js. It's still not very nice in that it still reloads even though ajax would have been enough but I could figure out why the mast source field was not getting the proper values (You can reproduce this by commenting the window.location.reload() in the js).
2017-03-19 12:35:58 +01:00
Lucas Bickel
e1cf27664b Cleanup dead code 2017-03-17 15:09:21 +01:00
Robb Ebright
4c8f2ad435 fixed default and override URL settings and removed unused validation 2017-03-16 10:18:43 -04:00
Robb Ebright
f31236fe66 Fixed Override Javascript and Functionality 2017-03-14 23:03:37 -04:00
Albert Santoni
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
Albert Santoni
a86e3ed4a8 Improvements to the preferences screen 2015-09-23 18:21:30 -04:00
Duncan Sommerville
63ce022a8d SAAS-1040 - station logo functionality improvements 2015-09-02 15:28:36 -04:00
Albert Santoni
8aa39ae28d Moved datatables translation stuff to PHP for consistency 2015-08-14 20:00:05 -04:00
Albert Santoni
409e9e2a78 Stream settings, Add Show form CSS revamp, etc. 2015-08-12 16:44:45 -04:00
Duncan Sommerville
755ec79e7d SAAS-876 - frontend tweaks 2015-07-13 15:17:47 -04:00
Duncan Sommerville
c99165a8dd SAAS-876 - better implementation of toggle between Airtime Pro/Custom streaming options 2015-07-10 13:17:20 -04:00
Duncan Sommerville
ac2e1a2d4b SAAS-876 - More work on stream settings page 2015-07-08 16:04:09 -04:00
Duncan Sommerville
457230ba07 SAAS-876 - Initial commit 2015-07-03 13:32:41 -04:00
Duncan Sommerville
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
Duncan Sommerville
6497bc28c5 Show collapsible sections (other than 'dangerous settings') by default on preferences page 2015-06-25 17:43:15 -04:00
Duncan Sommerville
459f9494c3 Merge saas-dev into soundcloud 2015-06-10 16:08:52 -04:00
Duncan Sommerville
b0b6e037ac CC-6046, CC-6045, CC-6047 - New SoundCloud implementation 2015-06-03 16:57:17 -04:00
drigato
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
drigato
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
drigato
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
Duncan Sommerville
15bebc6267 Dangerous options subform on Preferences page and Delete all tracks button 2015-05-13 15:56:08 -04:00
Albert Santoni
d61b75f105 Added a working 4th stream 2015-03-03 16:08:53 -05:00
Duncan Sommerville
936d11b367 Merge branch '2.5.x-albertenhancements' into saas 2015-02-27 17:21:20 -05:00
Duncan Sommerville
78c7170c4e Reformatted logo remove button to use Zend 2015-02-27 17:19:37 -05:00
Albert Santoni
562c2f0100 Remove widget JS snippet animation because it's bugged 2015-02-24 15:18:39 -05:00
Albert Santoni
e13e4413ea Merge remote-tracking branch 'origin/2.5.x-albertenhancements' into saas 2015-02-24 15:03:06 -05:00
Duncan Sommerville
5e256df061 Added remove button for station logo on preferences page 2015-02-24 12:12:30 -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
af8c6c2f48 Merged 2.5.x into saas 2014-11-10 09:08:03 -05:00
Duncan Sommerville
4dab2abf4e Replaced reoccurring strings with string formatting to aid dynamic translations 2014-11-06 18:40:19 -05:00
Duncan Sommerville
4d263ce897 Merged 2.5.x into saas 2014-11-05 17:36:58 -05:00
Duncan Sommerville
3046003a1b Removed unnecessary cookie declaration for default locale 2014-11-05 17:27:41 -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
denise
0b66f62045 Removed old jquery syntax 2013-09-06 11:08:01 -04:00
Martin Konecny
254d3b8950 Merge branch '2.4.x' into 2.4.x-saas 2013-05-22 16:09:02 -04:00
Daniel James
717cda984a Fixed 'steam' typo in stream settings tooltip 2013-05-22 10:21:27 +01:00
Martin Konecny
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
Martin Konecny
ae41a4f9ff more persistent links (won't be invalid if title changes) 2013-05-17 13:20:28 -04:00
Naomi
b0cdc606f8 CC-5096 : Add "i" (info) icon to stream output type 2013-05-15 15:38:46 -04:00
Naomi
393c8abb95 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-14 18:14:51 -04:00
Naomi
7d5177d77d CC-5096 : Add "i" (info) icon to stream output type 2013-05-14 18:14:38 -04:00
Martin Konecny
70a8d3d5dd CC-5146:
Output Stream Settings: Please disable options opus and aac when streaming server is SHOUTcast

-fixed
2013-05-14 16:16:58 -04:00
denise
a3eda62bb2 CC-5113: Preferences -> Mail Server Config: Error present will cause web form read-only 2013-05-10 15:18:54 -04:00
Martin Konecny
43ffa2aece Merge branch '2.3.x' into 2.3.x-saas
Conflicts:
	airtime_mvc/application/controllers/SystemstatusController.php
2013-03-06 13:47:21 -05:00
Martin Konecny
5ceeb88899 Merge branch '2.3.x' into devel 2013-03-06 13:46:01 -05:00
Martin Konecny
0ef1a5ffda CC-4976: Cannot select Ogg/Vorbis output stream after selecting SHOUTcast then selecting Icecast
-fixed
2013-03-05 18:19:08 -05:00
Martin Konecny
8bec9dea55 Merge branch '2.3.x' into 2.3.x-saas 2013-02-20 14:41:55 -05:00