Commit graph

916 commits

Author SHA1 Message Date
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
denise
07ac651f71 - move title and creator to top of library column view 2012-09-12 15:09:07 -04:00
Rudi Grinberg
92532cb708 cc-4394: Added m4a 2012-09-12 14:54:11 -04:00
denise
ceccb547c2 CC-4355: Smart block criteria do not match library columns or metadata editor
-put library column filter in alphabetical order to match smart block criteria order
2012-09-11 17:39:47 -04:00
denise
f1b8ada1e6 - removed logging 2012-09-11 17:19:02 -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
James
b692abb9ae Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-11 15:10:17 -04:00
James
1ba24a8d0b CC-4353: Numeric search fields in Library would benefit from format labels
- done
2012-09-11 15:09:57 -04:00
denise
49f2a31be1 - added advanced search validation for owner and last played time 2012-09-11 11:22:12 -04:00
denise
ba89982b17 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 18:09:19 -04:00
denise
4239a49d58 - advanced search validation UI cleanup 2012-09-10 18:09:13 -04:00
James
645593f954 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/Webstream.php
2012-09-10 18:04:35 -04:00
James
ba37bb4327 CC-4005: Tag files with Last Played date and number of times played
- done for files and webstreams
2012-09-10 18:01:36 -04:00
denise
2474d50e9f CC-4379: Playlist Builder: Click Save will cause playlist disappear from right side
-fixed
2012-09-10 17:53:55 -04:00
denise
def513d200 -fixed commit problem 2012-09-10 17:38:05 -04:00
denise
bca7fbf50e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 17:17:19 -04:00
denise
8520141240 CC-4282: Library ->"Uploaded From" -> Submitting data in wrong format causes "Processing ..." message pop up for a while
-implemented advanced search validation
-data only gets sent to server if all fields are valid
2012-09-10 17:17:09 -04:00
James
67b295a553 CC-4367: Media Library -> Search: Please enable searching Bit Rate by Kbps
- done
2012-09-10 15:37:22 -04:00