Commit graph

933 commits

Author SHA1 Message Date
Naomi Aro
bb3ffce071 CC-3944 : Now Playing -> Time Line view: Cannot cancel record show, cancel button is disabled 2012-09-17 16:28:28 -07: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
5d60a599a6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 12:42:11 -04:00
James
5e514b3b60 -UI alignment of input text element 2012-09-17 12:41:58 -04:00
denise
f840a9b24a CC-4451: (Firefox) Now Playing -> Can't cancel Current Show
-fixed
2012-09-17 12:30:43 -04:00
denise
f02bf04a25 CC-4449: (Firefox) Now Playing -> Cancel currently playing track does not work
-fixed
2012-09-17 12:27:17 -04:00
denise
b8b3bfb495 CC-4450: Now Playing -> Can't remove overbooked tracks
-fixed
2012-09-17 12:23:49 -04:00
denise
e30d3b770c -removed unused code 2012-09-17 12:19:02 -04:00
denise
3c3b39796d CC-4445: Timeline: 'Select' dropdown menu should be disabled if the button is disabled
-fixed
2012-09-17 12:10:23 -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
denise
99969ff19d CC-4445: Timeline: 'Select' dropdown menu should be disabled if the button is disabled
-fixed
2012-09-17 11:58:05 -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
84deda99c5 CC-4440: System -> Streams: Update and Save 'Stream 1/2/3' will make it invisible
-fixed
2012-09-14 17:35:14 -04:00
Martin Konecny
39903be69a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 16:51:48 -04:00
Martin Konecny
3ced92db7a CC-4415: Smart Block audio preview doesn't work 2012-09-14 16:51:14 -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
denise
c35c76351b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 17:11:10 -04:00
denise
8f48544bb7 -implemented UI changes for Now Playing page 2012-09-13 17:10:38 -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
Martin Konecny
14db5053b1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 14:56:10 -04:00
Martin Konecny
b04afaec2c CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track
-detect flash fallback
2012-09-13 14:55:17 -04:00
James
b2d61f2402 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 14:22:27 -04:00
James
2293fcda01 CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track
- fixed
2012-09-13 14:22:13 -04:00
Martin Konecny
4fd9993108 CC-1710FLAC, BWF, AAC support
-Enable browser preview for new filetypes
2012-09-13 12:30:26 -04:00
Martin Konecny
09d587e262 CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track
-better file type detection
2012-09-13 12:28:10 -04:00
Martin Konecny
e95933525b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 12:25:03 -04:00
Martin Konecny
983bbc5fc5 CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track
-better file type detection
2012-09-13 12:24:53 -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
4998a63a6a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 17:34:32 -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
denise
32b1ee95b7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 16:29:35 -04:00
denise
5ac6877e60 CC-4362: Smart Block: error for multiple criteria
-fixed
2012-09-12 16:29:26 -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
Martin Konecny
a418f5777c CC-4393: Please ignore AAC and Flac items for Playlist Preview and disable to preview it as a single track
-initial commit
2012-09-12 15:43:50 -04:00
Rudi Grinberg
d1b4ce3de6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 15:19:57 -04:00