Commit Graph

314 Commits

Author SHA1 Message Date
denise 2527fa2e1a CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 14:42:01 -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