denise
ad334d9e74
CC-4926: System-> Preference: Please limit the default fade value less than 60
...
- added a range validator of 0 - 59.9 on default fade
2013-02-06 15:44:52 -05:00
Martin Konecny
7c327e4c75
Merge branch '2.3.x' into 2.3.x-saas
2013-01-25 12:12:21 -05:00
denise
0cf8526f87
CC-4878"Send support feedback" button at initial login tries to load " http://showbuilder " and was missing the local host IP.
...
-fixed
2013-01-25 11:51:56 -05:00
Martin Konecny
784cb390d3
Merge branch 'devel' into 2.3.x-saas
2013-01-17 10:56:18 -05:00
denise
f7e8fd33fd
CC-4848: Streaming server passwords should be hidden with dots, once entered
...
-fixed
2013-01-16 14:36:56 -05:00
Martin Konecny
9d8c9149fd
remove code that will never be executed on SaaS branch
2013-01-16 14:06:04 -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
James
9ae3559305
Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel
...
Conflicts:
airtime_mvc/application/Bootstrap.php
2013-01-14 16:19:51 -05:00
James
5a97fb69f2
CC-4384: Remove annoying usage of $CC_CONFIG
...
- done
2013-01-14 16:16:14 -05:00
denise
7b4693e5f9
CC-4831: I18N: Error message of background settings when creating a show is not translated
...
-fixed
2013-01-14 14:13:32 -05:00
denise
f067b952db
CC-4829: Password Verify does not work on Lucid
...
-code cleanup
2013-01-14 12:17:33 -05:00
denise
83a450565e
CC-4829: Password Verify does not work on Lucid
...
-fixed
2013-01-14 12:07:17 -05:00
Martin Konecny
89274e43b3
fix spelling mistake
2013-01-11 13:17:08 -05:00
denise
a129b0b081
CC-4472: User password verify or clear text display.
...
-done with password verify
2013-01-10 17:51:25 -05:00
James
55fa8b8dc1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-10 14:52:45 -05:00
denise
dffe932223
Added missing base directory to urls
2013-01-10 13:58:11 -05:00
denise
2797809c74
CC-4786: Refresh page when language setting changes
...
-done
2013-01-10 13:55:52 -05:00
James
048ee05030
CC-4821: Add option to disable ReplayGain
...
- done
2013-01-10 13:49:41 -05:00
denise
1572955d07
CC-4810: Add language setting to login page
...
-done
2013-01-09 18:03:23 -05:00
denise
db62b538dd
CC-4816: Timezones should be a user preference
...
-done
2013-01-09 13:38:38 -05:00
denise
f308305df8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-07 18:18:59 -05:00
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
Daniel James
771b9b9412
Fixed whitespace in Preferences page between 'Timezone' and colon
2013-01-07 11:41:29 +00:00
Daniel James
a2c1b9c699
Clarify label on default interface language preference
2013-01-07 11:05:38 +00:00
Daniel James
053418d7ac
Added missing colon to the end of 'Language'
2013-01-07 10:42:16 +00:00
James
63c847080f
CC-4732: Ask for admin username + password in Stream Settings page
...
- CRLF
2013-01-03 18:02:19 -05:00
James
5d76bb2d17
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-03 18:00:33 -05:00
James
ae7b6fe092
CC-4732: Ask for admin username + password in Stream Settings page
...
- done
2013-01-03 17:58:50 -05:00
denise
7ea649e063
CC-4783: Username on the edit user form should be readonly
...
-done
2013-01-03 16:27:05 -05:00
denise
e2c87ed8b6
CC-4781: Store localization settings on a per-user basis
...
-done
2013-01-03 16:19:02 -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
denise
adae81bffa
CC-4747: Add User page -> Typo on form labels
2012-12-17 16:53:18 -05:00
denise
bd18039785
CC-4744: Edit user form needs styling
...
-done
2012-12-17 14:12:27 -05:00
denise
f12547dfb4
CC-4736: Let non-admin users update their user info
...
new form
2012-12-10 16:56:25 -05:00
denise
adb966a734
CC-4735: Library: Edit metadata selection should be a popup instead of going to a new page
...
-cancel button does not reload the page anymore
2012-12-05 13:21:18 -05:00
denise
062740ef81
CC-4735: Library: Edit metadata selection should be a popup instead of going to a new page
...
-done
2012-12-05 13:16:25 -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
844246df3a
CC-4730: Support Feedback: Errors are displayed when they shouldn't be
2012-12-04 15:30:56 -05:00
denise
ab55bb73bb
CC-4683: System -> Preference: Save button is old style
...
-support feedback form also had old button style
2012-12-03 14:51:21 -05:00
denise
2f0c6b702a
CC-1960: Internationalize Airtime / Support translations
...
- created locale table
- create locale model
- set default locale in pref table
2012-11-29 18:21:03 -05:00
Martin Konecny
858f03c9ad
-remove rebroadcast code
2012-11-29 15:58:29 -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
Martin Konecny
4983721565
Merge branch '2.2.x' into 2.2.x-saas
...
Conflicts:
airtime_mvc/application/forms/LiveStreamingPreferences.php
2012-11-28 16:10:33 -05:00
denise
9689c75bed
CC-1960: Internationalize Airtime / Support translations
...
-added i18n to serverbrowser.js
-fixed small typo in SmartBlockCriteria.php
2012-11-28 11:54:22 -05:00
denise
e475c2e99e
CC-1960: Internationalize Airtime / Support translations
...
-overwrote zend from stringLength validator
2012-11-27 17:28:27 -05:00
denise
9acfb6c181
CC-1960: Internationalize Airtime / Support translations
...
- overwrote default zend form error messages
2012-11-27 17:11:29 -05:00
denise
42d535a922
CC-1960: Internationalize Airtime / Support translations
...
-unlocalized some strings
2012-11-27 12:33:43 -05:00
denise
b677130a3f
CC-1960Internationalize Airtime / Support translations
...
-added gettext wrapper to strings missing it
-timepicker close button was not getting translated -fixed
2012-11-23 16:39:41 -05:00
denise
dd0e71efcc
CC-1960: Internationalize Airtime / Support translations
...
-added gettext wrapper function to all strings missing it
-i18n of jquery timepicker and datepicker
-i18n of jquery datatables columnFilter input place holder labels
2012-11-22 17:32:24 -05:00
denise
7a9f01458c
CC-1960: Internationalize Airtime / Support translations
...
-fixed langauge label on preferences page
2012-11-21 12:46:52 -05:00
denise
25ddd083bc
CC-1960: Internationalize Airtime / Support translations
...
-added language option in preferences
2012-11-21 12:44:50 -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
denise
33e4d6154d
CC-4693: Preferences: Bottom save button is not aligned
...
-fixed
2012-11-12 14:43:44 -05:00
denise
a727f2bb1e
CC-4638: Stream Settings -> Apache error when setting master source port to same port Airtime is running on
...
-fixed
2012-11-12 14:28:50 -05:00
Martin Konecny
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
Martin Konecny
1b0b124247
SAAS-290: Hosted SaaS widgets + javascript code generation
...
-working code
2012-11-07 12:49:17 -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
27d40ef4df
SAAS-290: Hosted SaaS widgets + javascript code generation
2012-11-06 18:10:53 -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
3f7d8a0c7f
Merge branch '2.2.x' into 2.2.x-saas
2012-11-06 16:11:51 -05:00
denise
41cb6b2b0b
Merge branch '2.2.x-saas' of dev.sourcefabric.org:airtime into 2.2.x-saas
2012-11-05 17:08:49 -05:00
denise
3b58ee1f48
CC-4651: Apache log errors part 1
...
-fixed
-saas doesn't have rebroadcast shows so we don't need to check if they overlap
2012-11-05 17:08:41 -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
Martin Konecny
9609a4e220
Merge branch 'cc-4652' of https://github.com/rgrinberg/Airtime into devel
...
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/views/scripts/library/library.phtml
airtime_mvc/public/js/airtime/showbuilder/main_builder.js
2012-11-02 20:16:54 -04:00
denise
796274e4ef
CC-4642: Default Fade preference should be in seconds and tenths, rather than millionths
...
-fixed
2012-11-02 15:51:36 -04:00
James
1899d588ee
- CRLF fix
2012-10-30 18:03:03 -04:00
James
9d495ebc03
CC-4639: Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit.
...
- done
2012-10-30 17:57:58 -04:00
Rudi Grinberg
dc00528cd5
Merged baseUrl related conflicts
2012-10-29 11:56:20 -04:00
denise
3a7700eaac
CC-4583: Use AJAX calls instead of refreshing entire page
...
-done
2012-10-26 18:09:30 -04:00
denise
0ab1353564
CC-4638: Stream Settings -> Apache error when setting master source port to same port Airtime is running on
...
-fixed
2012-10-26 18:00:48 -04:00
James
b8d6132b52
- saas patch #1
2012-10-23 18:47:15 -04:00
denise
2527fa2e1a
CC-2184: Hardcoded CSS path should be relative path instead
2012-10-19 14:42:01 -04:00
James
3ecde35b7c
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-19 14:28:14 -04:00
James
1146e1f269
CC-4215: Smart Playlist: Exception happens when generate with criteria Length is 2012-08-10 14:00:00
...
- fixed
2012-10-19 14:27:57 -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
a51c3174e0
SAAS-282: Overlap detection prevents creation of a repeating show
...
-fixed
2012-10-19 12:33:12 -04:00
denise
d32495d100
CC-2184: Hardcoded CSS path should be relative path instead
2012-10-19 11:09:34 -04:00
denise
887a86c6a1
CC-4591: Calendar: Cannot change start time for repeating show
...
-fixed
2012-10-18 10:51:24 -04:00
James
45801e5dc4
- fix spelling of some function name
2012-10-17 15:16:03 -04:00
denise
25c28da761
CC-4550: Track should not be a required field in metadata editor
...
-fixed
2012-10-16 15:29:05 -04:00
denise
846af50543
CC-4567: Calendar: Exception in zendphp.log when setting a wrong rebroadcast time from repeating show
...
-fixed
2012-10-16 14:33:45 -04:00
denise
5ff89eeba2
CC-4561: Can create overlapping shows when rebroadcasting a repeating show
...
-fixed
2012-10-15 14:19:52 -04:00
denise
b79e190d3c
-small comment change
2012-10-12 15:42:51 -04:00
denise
e60a23aab4
CC-4555: Can create overlapping shows with a repeating show if another show is on the last repeating day
...
-fixed
2012-10-12 15:34:42 -04:00
denise
8f5830757f
CC-4553: Calendar: Can create overlapping show by repeat show's instances
...
-fixed
2012-10-12 14:26:54 -04:00
denise
2fbd8e868b
CC-4547: Calendar: Create record & rebroadcast show will be blocked by "overlapping error"
...
-fixed
2012-10-10 14:22:09 -04:00
denise
317bb7de69
CC-4479: Buttons in dialog windows are not styled
...
-done
2012-10-03 11:40:40 -04:00
denise
0524e4e5d2
-implemented UI changes for playlist/block/webstream builder
2012-09-14 15:49:39 -04:00
Martin Konecny
e3c1a3ac0e
CC-4434: Make Application_Model_Preference::getValue and setValue private methods
...
-initial commit
2012-09-14 12:09:40 -04:00
Rudi Grinberg
55993352bf
Removed unused variables.
2012-09-13 10:35:24 -04:00
denise
9c8f4fe404
CC-4414: Unused local variables in forms
...
-done
2012-09-12 17:09:00 -04:00
denise
54d18b7bcd
CC-4382: Editing the color of a repeating show gives error message
...
-fixed
2012-09-12 14:27:17 -04:00
denise
58d39d74d4
CC-4355: Smart block criteria do not match library columns or metadata editor
...
-fixed
2012-09-11 17:18:17 -04:00
Martin Konecny
7f8b5ab92e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-29 17:40:07 -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
a7427645d5
CC-4273: Library: Open 'Edit Metadata' page and click 'Cancel' will cause an exception
...
-fixed
2012-08-29 17:01:55 -04:00
Rudi Grinberg
5e180f0ce2
sexified code
2012-08-29 12:57:56 -04:00
Rudi Grinberg
ca66073fb5
did some reformatting.
2012-08-29 12:31:59 -04:00
Martin Konecny
b2327472e8
CC-4090: Make code style PSR compliant - part 4
...
-forms directory
2012-08-28 23:04:55 -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
denise
69b61c4cfe
CC-4285: Playlists-> Smart Block - displays that certain amount meets the criteria while no criteria is specified
...
-fixed
2012-08-28 12:13:58 -04:00
denise
dc8e3da6db
CC-4283: Password Reset: Please let user input username they want to reset
...
-done
2012-08-24 12:40:30 -04:00
denise
7e50a11195
CC-4225: Smart playlists: Sample and bit rate ranges should include entered values
...
-fixed
2012-08-22 16:01:50 -04:00
denise
025656be1c
CC-4205: Smart Playlist Builder: Change text on button mouseovers
...
-changed generate success msg
2012-08-21 10:46:25 -04:00
James
a24da9e324
CC-4256: Smart Playlist: change name to smart block and etc
...
- done
2012-08-20 17:17:48 -04:00
denise
76833344d6
CC-4250: Smart Playlists: Remove save button from form
...
-done
2012-08-17 16:24:11 -04:00
James
2d80131351
CC-4229: Smart Playlist: refactor code
...
- bug fixes
2012-08-15 16:22:56 -04:00
James
9fc5411895
CC-4229: Smart Playlist: refactor code
...
- done
2012-08-15 11:36:41 -04:00
denise
c62d89d5da
CC-4220: Smart Playlists: Change indexing of criteria elements
...
-changed indexing on UI
2012-08-14 10:02:36 -04:00
James
1e36d77857
CC-4213: Smart Playlist -> Criteria Bpm: Cannot find track by 'is in the range'
...
- changed BPM to string type
2012-08-13 11:51:25 -04:00
denise
5e1d8eabb3
Smart Playlists: moved Save button from right side to left side
2012-08-10 12:34:45 -04:00
denise
7d73f0996c
CC-4205: Smart Playlist Builder: Change text on button mouseovers
...
-done
2012-08-10 10:54:13 -04:00
denise
791989faf7
Smart Playlists: changed label 'block' to 'playlist' type
2012-08-08 15:35:28 -04:00
James
fd1628f971
CC-4117: Smart Playlist: radio_station_name criteria doesnot take effect
...
- removing radio_station_name from criteria list
2012-08-08 12:01:10 -04:00
denise
9479aeb3dd
CC-84: Smart Playlists
...
- fixed db column mapping for radio station name and track title
2012-08-01 17:10:56 -04:00
James
27017c7903
CC-84: Smart Playlists
...
- fixed getCriteria() to non static function
2012-07-30 18:21:27 -04:00
denise
f91be9468f
CC-84: Smart Playlists
...
-UI cleanup
2012-07-30 16:42:37 -04:00
denise
e04273c335
CC-84: Smart Playlists
...
- created function that returns an array of block criteria
- fixed form so it displays modifier rows properly
2012-07-29 15:47:42 -04:00
denise
d7cf50b2f4
CC-84: Smart Playlists
...
- changed error handling and criteria saving to handle same criteria rows
2012-07-27 14:32:31 -04:00
James
1f3cbd8aba
CC-84: Smart Playlists
...
- introducing smart-block
2012-07-25 12:44:37 -04:00
denise
722e470f6f
CC-84: Smart Playlists
...
- changed playlist controller to also handle Blocks
- created new view for smart blocks
2012-07-25 11:00:46 -04:00
denise
754187a2b7
CC-84: Smart Playlists
...
- remove subform and combined back into one form
2012-07-24 12:13:51 -04:00
denise
c82ea30809
CC-84: Smart Playlists
...
- removed criteria subform and reverted back to original criteria options design
2012-07-24 12:12:47 -04:00
denise
64185dac95
CC-84: Smart Playlists
...
- subforms now open and close on the click event
- fixed add and remove criteria to work with new subforms
2012-07-23 12:42:00 -04:00
denise
952a584f10
CC-84: Smart Playlists
...
- form cleanup
2012-07-23 10:45:17 -04:00
denise
c99e1b892c
CC-84: Smart Playlists
...
-divided criteria into sub form to handle multiple sets
2012-07-23 10:40:53 -04:00
denise
a67b2fa300
CC-84: Smart Playlists
...
- removed soundcloud_id criteria
- added last_played criteria
2012-07-20 11:25:54 -04:00
denise
9fcc851523
CC-84: Smart Playlists
...
-hides playlist content if dynamic instead of disabling
-show the user how many files match specified criteria
2012-07-19 14:52:39 -04:00
denise
2d8a9188eb
CC-84: Smart Playlists
...
- qtip wasn't showing up on 'new' and 'edit' events
- changed 'Artist' to 'Creator' to be consistent with library
2012-07-18 15:48:15 -04:00
denise
7c5291fe0c
CC-84: Smart Playlists
...
- ui cleanup
2012-07-18 11:55:29 -04:00
James
2a38527161
CC-84: Smart Playlists
...
- propel usage chage
- cleaning up code
- some js changes
2012-07-18 11:52:09 -04:00
denise
0aae7c75ae
CC-84: Smart Playlists
...
- added shuffle button
- moved all callbacks into one function
2012-07-17 15:32:26 -04:00
James
7c07bf146c
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
2012-07-17 11:07:38 -04:00
James
a4ba776b0f
CC-84: Smart Playlists
...
- save playlist type to db
- on edit type is loaded
2012-07-17 11:07:16 -04:00
denise
e0a674a96c
CC-84: Smart Playlists
...
-added save button for static playlists
2012-07-16 18:24:46 -04:00
denise
1bb97c8603
CC-84: Smart Playlists
...
- ui clean-up
2012-07-16 14:44:50 -04:00
denise
2dae5f30f7
CC-84: Smart Playlists
...
- code cleanup
- adds 'Add' button to last row, always
2012-07-16 11:01:34 -04:00
James
ae9442d7f5
CC-84: Smart Playlists
...
- editing playlist
2012-07-13 15:58:23 -04:00
James
207582eb7e
CC-84: Smart Playlists
...
- temp commit
2012-07-13 14:23:30 -04:00
denise
d81253cccc
CC-84: Smart Playlists
...
- send playlist id on generate/save action
- fixed some small UI bugs
2012-07-12 17:19:53 -04:00
denise
31bb07b4f0
CC-84: Smart Playlists
...
- removed modifier array list from form and populate in javascript
- fixed remove functionality to handle the extra criteria value used
for 'is in the range' modifier
- moved 'add' button to last row
2012-07-12 13:02:02 -04:00
denise
e8a2f23856
CC-84: Smart Playlists
...
- dynamically change modifier list depending on criteria type
- added extra text box for 'is in the range' modifier
2012-07-11 18:53:28 -04:00
denise
c27b886817
CC-84: Smart Playlists
...
-0-indexed form elements
2012-07-11 16:15:44 -04:00
denise
4842f1a5a1
CC-84: Smart Playlists
...
-removed limit checkbox
2012-07-11 15:52:46 -04:00
denise
7358b00c81
CC-84: Smart Playlists
...
-disabled non-visible form elements
2012-07-11 15:18:47 -04:00
denise
5fb0364f2d
CC-84: Smart Playlists
...
-switched action names for static/dynamic
2012-07-11 11:57:13 -04:00