Commit graph

79 commits

Author SHA1 Message Date
denise
135aadf16b Merge branch '2.2.x' into devel
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/public/js/airtime/showbuilder/builder.js
	airtime_mvc/public/js/airtime/showbuilder/main_builder.js
2012-11-02 12:28:21 -04:00
denise
cc208da2fb CC-4536: Smart block criteria use AND logic, but additional modifiers use OR logic, without labels to show the difference
-added labels
2012-11-02 10:48:08 -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
denise
3a7700eaac CC-4583: Use AJAX calls instead of refreshing entire page
-done
2012-10-26 18:09:30 -04:00
Daniel James
7c799cd3af Fixed formatting of tooltip for smart blocks 2012-10-18 13:01:55 +01:00
denise
5003e86eac - changed smart block qtip text 2012-09-18 17:37:38 -04:00
denise
0524e4e5d2 -implemented UI changes for playlist/block/webstream builder 2012-09-14 15:49:39 -04:00
denise
5ac6877e60 CC-4362: Smart Block: error for multiple criteria
-fixed
2012-09-12 16:29:26 -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
denise
fe48780932 CC-4302: Library : Deletion of newly created Smart Block does not prevent you from editing it which leads to small hang up
-fixed
2012-08-29 16:00:58 -04:00
denise
7c5765ccb9 CC-4298: Smart Block: Sometimes criteria value text box doesn't resize properly
-fixed
2012-08-27 16:46:05 -04:00
denise
ffa4c131ee CC-4246: Smart Playlist: Click shuffle button will shuffle the contents multiple times
-code refactor
2012-08-24 11:50:02 -04:00
denise
2e505ee970 CC-4246: Smart Playlist: Click shuffle button will shuffle the contents multiple times
-small code fix
2012-08-24 11:47:32 -04:00
denise
b8571be827 CC-4246: Smart Playlist: Click shuffle button will shuffle the contents multiple times
- small code fix
2012-08-24 11:45:56 -04:00
denise
5f1c6453a5 CC-4246: Smart Playlist: Click shuffle button will shuffle the contents multiple times
-fixed
-disabled shuffle button
2012-08-24 11:44:18 -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
764316a36c CC-4247: Smart Playlist: Lost modifier when delete one from multiple modifiers
-fixed
2012-08-17 15:30:30 -04:00
denise
92408612f6 CC-4246: Smart Playlist: Click shuffle button will shuffle the contents multiple times
-fixed
2012-08-17 15:11:43 -04:00
denise
e2fe6d4284 CC-4243: Playlist Builder: Remove main fade block if there are no fades to set
-fixed
2012-08-17 12:56:45 -04:00
denise
45f08e41d1 Smart playlists: fixed shuffle button activation clause 2012-08-16 15:47:31 -04:00
denise
4ca290320d CC-4236: Smart Playlists: Deactivate shuffle button when playlist contents is empty
-done
-refactor code
2012-08-16 11:26:04 -04:00
James
4783bf121a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-15 16:23:15 -04:00
James
2d80131351 CC-4229: Smart Playlist: refactor code
- bug fixes
2012-08-15 16:22:56 -04:00
denise
3e80781308 Smart playlist:
- fixed modifier selection onchange function
2012-08-15 15:36:06 -04:00
James
9fc5411895 CC-4229: Smart Playlist: refactor code
- done
2012-08-15 11:36:41 -04:00
denise
09f1fe6775 CC-4220: Smart Playlists: Change indexing of criteria elements
-code refactoring
2012-08-14 10:05:13 -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
7911761017 CC-4208: Smart Playlists: Cannot see error messages sometimes after clicking 'Save'
-fixed
2012-08-10 12:22:59 -04:00
denise
23683ccccb Smart Playlists: changed positioning of error message on click 'Save' 2012-08-09 17:43:12 -04:00
denise
ac295243d4 Smart Playlists: changed success message for 'Save' button 2012-08-09 17:34:47 -04:00
denise
e674654cb1 CC-4192: Smart Playlist Builder: make save button save title, description, and criteria
-done
2012-08-09 17:23:52 -04:00
denise
90ec046854 CC-4188: Playlist Builder -> Smart Playlist : sometimes elements do not index properly when add a new criteria row
-fixed
2012-08-08 16:27:03 -04:00
James
ab19d6f511 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-08 15:29:28 -04:00
James
d1e6f8178b CC-4166: Playlist Builder -> Regular Playlist : clicking Fade in/out button for a empty playlist will cause PHP Fatal Error
- fixed. Not displaying fade setting button if the playst/smartplaylist
is empty.
2012-08-08 15:29:09 -04:00
denise
3a4a827f1f CC-4180: Smart Playlist Builder: modifier select boxes do not change when criteria changes
-fixed
2012-08-08 15:24:47 -04:00
denise
5c3701c064 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-08 13:07:12 -04:00
denise
85259e5bba CC-4170: Smart Playlist Builder: elements don't organize properly after deleting a row
-fixed
2012-08-08 13:07:00 -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
9b805f0a01 CC-4159: Playlist Builder -> Smart Playlist : "+" for modifier disappears if 3 or more Criteria
-fixed
2012-08-07 17:40:47 -04:00
James
171825e19a CC-4148: Playlist Builder: Please add a 'Processing' for generating Smart playlist
- added processing box
2012-08-07 15:54:16 -04:00
denise
ef994aa449 CC-84: Smart Playlists
- block options scroll for small screens
2012-08-02 16:40:32 -04:00
Martin Konecny
b9bb87f69d CC-1665: Scheduled stream rebroadcasting and recording
-clicking save now show's webstream save was successful
2012-08-01 15:37:50 -04:00
denise
c9afac239a CC-84: Smart Playlists
- add qtip for smart playlists
- modified qtip content for regular playlists that contain smart playlists
2012-08-01 12:04:48 -04:00
James
9d51222dae CC-84: Smart Playlists
- Length calculation for dynamic blocks and playlist that contains
dynamic blocks
2012-07-31 17:46:37 -04:00
denise
ff62769d6c CC-84: Smart Playlists
-UI cleanup
2012-07-30 18:53:50 -04:00
denise
f91be9468f CC-84: Smart Playlists
-UI cleanup
2012-07-30 16:42:37 -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
denise
bef9ba1eea CC-84: Smart Playlists
- added 'Smart Block' filter in datatable
- added block files to library datatable
2012-07-25 17:08:22 -04:00