Commit graph

367 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
James
575400b4c2 CC-4623: Library: Preview button for Flac does not work
- fixed
2012-11-01 16:44:37 -04:00
denise
dfd52eedf1 CC-4654: Library -> Simple search still has effects even if you are doing an advanced search
-fixed
2012-10-31 15:24:50 -04:00
james
2e4d5ec142 CC-4539: Advanced search: Sample rate searched on Hz, but search results
shown in kHz

- fixed
2012-10-31 12:32:40 -04:00
denise
cabe583a3b CC-4649: Library -> Disable simple search if advanced search fields are open
-done
2012-10-30 15:01:46 -04:00
denise
695c0fa926 CC-4607: Library: Please make the 'Add x items' following mouse's point
-fixed
2012-10-30 11:45:53 -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
67ca0db4c8 CC-4542: Playlists containing dynamic smart blocks cannot be previewed
- fixed
2012-10-16 14:09:34 -04:00
James
7796b23a58 CC-4506: Audio Preview in Playlist doesn't work
- fixed
2012-10-16 12:06:47 -04:00
James
03b32ea986 CC-4563
Library: Exception is found when remove a block by context menu

- fixed
2012-10-16 10:37:42 -04:00
denise
5f35336fd0 CC-2295 Improvements to playlist builder beha...CC-2303 Cue-in Cue-out inconsistency with time values:
-fixed
2012-10-11 11:49:04 -04:00
denise
c9ac675a10 CC-4529: Playlist Builder: The panel of 'Adding n items' will be bigger than usual if there is a item in Playlist has expanded cue in/out setting
-fixed
2012-10-09 14:39:29 -04:00
denise
0d35056cd4 CC-4486: Library -> Advanced Search: Alignment is off sometimes
-added placeholders to input tags for format examples
2012-10-04 12:16:57 -04:00
denise
eadde1c498 CC-4519: Advanced Search Option: Please use text search instead of scope search from Mime's type
-fixed
2012-10-03 11:29:16 -04:00
denise
3dd7e9767b CC-4481: Library -> Advanced Search -> Validation icon does not show up sometimes
-validation was missing for Encoded By filter
2012-10-02 13:57:36 -04:00
denise
2afc4183bb CC-4496: Library -> Contents-feed does not work if advanced search data is invalid
-fixed
2012-09-19 16:39:56 -04:00
denise
b4277f1f17 CC-4495: Library -> Advanced Search: Some fields with ranges do not get validated
-fixed
2012-09-19 15:46:03 -04:00
denise
4b2d6caf0e CC-4485: Library -> Advanced Search -> Tooltip needed for invalid input
-done
2012-09-19 15:35:45 -04:00
denise
81620d4f94 CC-4481: Library -> Advanced Search -> Validation icon does not show up sometimes
-fixed
2012-09-19 12:41:54 -04:00
denise
dc95ab1d00 CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents
-changed null values to empty strings
2012-09-19 11:05:17 -04:00
denise
0c823af660 CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents
-done
2012-09-19 10:49:17 -04:00
denise
8cae11d588 CC-4478: Library: audio preview check should be skipped if file does not exist
-fixed
2012-09-18 15:52:11 -04:00
James
98f0692b8d CC-4457: Media Library: The background of 'Adding items' is minimize to a point
- fixed
2012-09-18 14:40:18 -04:00
denise
e00ff6367d CC-4458: Now Playing -> "+ Add to current playlist text" might be replaced by something more appropriate
-fixed
2012-09-18 11:22:37 -04:00
denise
1698aae251 CC-4466: Buttons on Now Playing page are clickable even though they are disabled
-fixed
2012-09-18 10:53:19 -04:00
denise
9b39ff93b4 -removed console.log 2012-09-17 15:49:22 -04:00
denise
43c336eb6d CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents
-implemented css changes
-formatted playlist_builder.css
2012-09-17 15:41:22 -04:00
James
5e514b3b60 -UI alignment of input text element 2012-09-17 12:41:58 -04:00
Rudi Grinberg
990bcebfe8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 11:58:18 -04:00
Rudi Grinberg
b913b067c2 Added setColumnFilter(oTable) 2012-09-17 11:58:08 -04:00
James
b3420984e2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 11:27:52 -04:00
James
396b529162 - UI interation of advanced search 2012-09-17 11:23:38 -04:00
Rudi Grinberg
fab7042ce6 cc-4419: Added quick hack for now -- actual fix 2012-09-17 11:18:18 -04:00
Rudi Grinberg
d4443da626 Removed debugging statement 2012-09-17 11:12:52 -04:00
Rudi Grinberg
6118cd63d7 cc-4419: Added quick hack for now 2012-09-17 10:52:37 -04:00
Rudi Grinberg
1c2cebf5a8 Removed comment 2012-09-17 10:27:12 -04:00
Rudi Grinberg
f809a17c02 Formatting 2012-09-14 19:05:30 -04:00
denise
8ffaaaef25 -skip playable test if item is a smart block 2012-09-14 16:38:26 -04:00
denise
0524e4e5d2 -implemented UI changes for playlist/block/webstream builder 2012-09-14 15:49:39 -04:00
denise
c7f4ede766 -implemented UI changes for library page 2012-09-14 12:08:51 -04:00
denise
f581b0536e -fixed formatting 2012-09-14 11:18:13 -04:00
denise
bb38512bae -fixed formatting 2012-09-14 10:52:50 -04:00
James
d93fcec490 CC-4424: Clicking "edit" on playlist allows you to preview tracks that should be disabled
- fixed
2012-09-13 17:09:10 -04:00
Rudi Grinberg
e2f8d8e0e7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 11:10:43 -04:00
James
5067a304d9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 10:49:33 -04:00
James
b6b93618e6 CC-4353: Numeric search fields in Library would benefit from format labels
- bug fix
2012-09-13 10:49:24 -04:00
Rudi Grinberg
52882ef938 Added mp4 removed aac. 2012-09-13 10:35:13 -04:00
Martin Konecny
1c293839da CC-4393: Please ignore AAC and Flac items for Playlist Preview and disable to preview it as a single track
-disable preview icon
2012-09-12 17:32:19 -04:00
Martin Konecny
20f5fe6480 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/application/models/Block.php
	airtime_mvc/public/css/styles.css
2012-09-12 15:55:43 -04:00