Commit graph

241 commits

Author SHA1 Message Date
denise
a65e72941f CC-4805: Localization -> Changing default language changes datatables and add media language setting
-fixed
2013-01-07 18:18:40 -05:00
James
6e241fd3ec CC-4512: Allow changing stream "Offline" message via Web UI
- fixed
2013-01-07 18:14:57 -05:00
james
cf38e2c596 CC-4754: Replay gain modifier
- done
2012-12-27 22:58:41 -05:00
james
c0665e4748 CC-4754: Replay gain modifier
- Initial commit
2012-12-27 00:36:11 -05:00
Martin Konecny
3086bde17e -cleanup parsing for form elements that weren't provided by the client in our SaaS implementation 2012-12-04 16:22:03 -05:00
denise
1846f17bbc CC-4731: Cannot save support feedback settings 2012-12-04 16:21:45 -05:00
denise
ee086fe43a CC-4730: Support Feedback: Errors are displayed when they shouldn't be 2012-12-04 14:46:06 -05:00
denise
89e0458500 CC-4728: Support Feedback save action does not use ajax
-done
2012-12-03 17:15:47 -05:00
denise
25ddd083bc CC-1960: Internationalize Airtime / Support translations
-added language option in preferences
2012-11-21 12:44:50 -05:00
denise
10b6dd202e Merge branch 'devel' into cc-1960-internationalize-airtime
Conflicts:
	airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
2012-11-21 11:44:40 -05:00
Rudi Grinberg
20855c73b5 refactoring + fix typo 2012-11-20 15:10:38 -05:00
denise
2ce530c5bd CC-1960: Internationalize Airtime / Support translations
- fix to some controller strings
2012-11-20 11:33:37 -05:00
denise
5adadc2e91 CC-1960: Internationalize Airtime / Support translations
- added gettext wrapper function to all strings in controllers
2012-11-20 11:33:37 -05:00
denise
bd482a0a75 CC-4583: Use AJAX calls instead of refreshing entire page
-fixed
2012-11-07 15:17:47 -05:00
denise
b817684972 Merge branch '2.2.x' into devel
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/public/js/bootstrap/bootstrap.js
2012-11-07 11:21:36 -05:00
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
Martin Konecny
d467abe509 Merge branch 'cc-4585' of https://github.com/rgrinberg/Airtime into devel 2012-11-05 11:27:34 -05:00
Rudi Grinberg
5d3aa68c72 written method to unhide all files in a music dir 2012-11-03 01:09:36 -04:00
Rudi Grinberg
2ae3c0ac03 Line wrapping 2012-11-02 16:06:12 -04:00
Rudi Grinberg
1111fd8163 align 2012-11-02 16:04:47 -04:00
Rudi Grinberg
ac9b47f5e2 made rescanWatchDirectoryAction more concise 2012-11-02 16:02:05 -04:00
Rudi Grinberg
226bdbf738 added todo 2012-10-31 17:41:50 -04:00
denise
3a7700eaac CC-4583: Use AJAX calls instead of refreshing entire page
-done
2012-10-26 18:09:30 -04:00
James
b8d6132b52 - saas patch #1 2012-10-23 18:47:15 -04:00
denise
7d8079f770 Merge branch '2.2.x' into devel
Conflicts:
	airtime_mvc/application/controllers/ShowbuilderController.php
	airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
	airtime_mvc/public/js/airtime/common/common.js
2012-10-19 12:50:36 -04:00
denise
d32495d100 CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 11:09:34 -04:00
James
45801e5dc4 - fix spelling of some function name 2012-10-17 15:16:03 -04:00
Martin Konecny
859445c766 CC-3301: Add ability to switch stereo/mono stream in stream settings
-fixed
2012-08-29 17:39:24 -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
794cf2c845 CC-4090: Make code style PSR compliant
-run psr-cs-fixer
2012-07-15 21:17:13 -04:00
Martin Konecny
d9cde230cd CC-4090: Make code style PSR compliant
-removed all trailing whitespace
2012-07-10 18:53:06 -04:00
Martin Konecny
e91c96b90e CC-4090: Make code style PSR compliant
StreamSetting.php
2012-07-09 23:32:21 -04:00
denise
b0e93005e5 Merge branch '2.1.x' into devel 2012-06-15 15:04:18 -04:00
denise
d02607ed94 CC-3561: Add button to automatically rescan watched folders.
-done
2012-06-15 12:16:19 -04:00
James
73a7a76078 Merge branch 'CC-3963' into 2.1.x
Conflicts:
	airtime_mvc/public/js/airtime/preferences/streamsetting.js
2012-06-14 16:06:53 -04:00
denise
295a8ea5fe CC-3561: Add button to automatically rescan watched folders.
-done
2012-06-14 13:44:56 -04:00
James
b07b83f740 CC-3981: Record Show: Change streams settings during recording will
cause record fail

- added warning message
2012-06-13 14:44:38 -04:00
James
57397312f2 CC-3963: If DJ is scheduled to broadcast for show, then automatically
enable source when DJ connects.

- done
2012-06-12 15:38:03 -04:00
denise
d66ba4074c Merge branch '2.1.x' into devel 2012-06-11 18:11:09 -04:00
denise
81c7eb7763 CC-3941: Overridden connection url in stream settings gets reverted back to default when 'Save' is clicked
-fixed
2012-06-11 18:08:36 -04:00
denise
ca8187c9c2 CC-3718: Please enable user to input the mail server settings
-done
2012-06-11 12:53:09 -04:00
denise
d8a75cf5c6 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-06 17:06:54 -04:00
denise
fda04295a6 CC-3941: Overridden connection url in stream settings gets reverted back to default when 'Save' is clicked
-fixed
2012-06-06 17:06:46 -04:00
James
fb533bed07 CC-3855: System -> Support Feedback: Cannot uncheck 'Promote my station
on Sourcefabric.org' if it's checked then saved.

- fixed
2012-06-06 14:26:23 -04:00
James
b23e3d0a54 CC-3927: Should automatically switch back to Master/Show stream if there is a
connection interruption

- done
2012-06-05 16:41:41 -04:00
denise
f23582612a SAAS-247: Stream settings wipes out master/show source settings if is a SAAS instance
-fixed
2012-05-28 15:41:59 -04:00
Naomi Aro
b6bed6ce7a CC-3667 : Preferences pages should have an option to enable/disable password recovery option 2012-04-25 15:22:38 +02:00
James
1d91d1b11b CC-3659: Override on Master/Show Source connection needs to have
better description about what the override field actually does.

- fixed description
- extra fix:
 - using variable instead of hard coded text
 - removed unnecessary code
2012-04-16 18:21:28 -04:00