028f6636dd
CC-1665: Scheduled stream rebroadcasting and recording
...
-fix right clicking in playlist builder to view metadata causing exception
2012-08-10 14:37:32 -04:00
fa749c58f0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-10 12:40:45 -04:00
35e3b3bc02
CC-1665: Scheduled stream rebroadcasting and recording
...
-use mime type so that webstreams can play with invalid filenames
2012-08-10 12:40:28 -04:00
4009ae741f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-10 12:39:45 -04:00
8b13af2e04
fix bug on widget
2012-08-10 12:14:15 -04:00
bd966915ee
CC-4207: Smart Playlists: Criteria is lost on 'Shuffle' click
...
-fixed
2012-08-10 11:56:01 -04:00
fe3f4ea678
CC-1665: Scheduled stream rebroadcasting and recording
...
-capture stream mime type and store in db.
2012-08-10 00:57:03 -04:00
5a63a284c8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 18:24:32 -04:00
10ea825536
CC-4201: Playlist Builder -> Smart Playlist: DJ user can edit SP created by others in particular situation
...
-fixed
2012-08-09 18:24:22 -04:00
65cb34db4a
CC-1665: Scheduled stream rebroadcasting and recording
...
-webstream preview on show builder working
2012-08-09 18:14:53 -04:00
63a51081c1
CC-4182: Media Library -> Smart Playlist: Empty box appears after left clicking a Dynamic Smart Playlist created by other users, when login as DJ
...
- fixed
2012-08-09 17:50:43 -04:00
bc72a6743b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 17:42:32 -04:00
4129900858
CC-1665: Scheduled stream rebroadcasting and recording
...
-step 1 of getting stream preview on show builder working
2012-08-09 17:42:25 -04:00
f75cf5ffe2
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 17:24:00 -04:00
e674654cb1
CC-4192: Smart Playlist Builder: make save button save title, description, and criteria
...
-done
2012-08-09 17:23:52 -04:00
618813ebc1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 16:59:33 -04:00
6c721cd68d
CC-4184: Playlist Builder : Error alert for trying to add Web Stream to Smart Playlist
...
- fixed
- extra fix: context menu for webstream
2012-08-09 16:59:18 -04:00
c73328e297
CC-1665: Scheduled stream rebroadcasting and recording
...
-ability to preview webstreams inside of playlists
2012-08-09 16:49:20 -04:00
952f18dc3c
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 14:39:42 -04:00
b53bc36f4f
CC-1665: Scheduled stream rebroadcasting and recording
...
-ability to preview webstreams
2012-08-09 14:39:31 -04:00
ae5b6e58d7
CC-4144: Playlist Builder: Adding smart playlist into regular playlist will reset the Fade in/out settings to default value
...
- fixed
2012-08-09 11:03:57 -04:00
c69dac7ab6
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-08 23:02:39 -04:00
d0d70db391
remove useless debugging
2012-08-08 23:02:16 -04:00
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
48a1bf3f02
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/Show.php
2012-08-06 17:10:46 -04:00
40023d9086
CC-4152: Widget does not display current show in some modes
...
-fixed
2012-08-06 17:07:18 -04:00
f901e13a84
CC-1665: Scheduled stream rebroadcasting and recording
...
-Make playlist builder show creator name instead of creator id
2012-08-03 18:06:47 -04:00
0ea66fc33f
CC-1665: Scheduled stream rebroadcasting and recording
...
-ability to edit playlists
2012-08-03 15:59:34 -04:00
361e681a59
CC-84: Smart Playlists
...
- remove 'add to playlist' option on showbuilder screen
2012-08-02 16:50:35 -04:00
028e089c82
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/models/Block.php
2012-08-02 16:37:12 -04:00
0d2d8218bf
CC-84: Smart Playlists
...
- audio preview on playlist
- cleaning up some code
2012-08-02 16:36:12 -04:00
a146fdcd37
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-02 16:27:00 -04:00
9cc152c0ae
CC-1665: Scheduled stream rebroadcasting and recording
...
-validate form fields of new webstream
2012-08-02 15:45:15 -04:00
997b5c31c3
CC-84: Smart Playlists
...
- fixed dragging tracks into playlists (smart and dumb)
- display alert when dragging into dynamic block
- display alert when dragging playlist into block
2012-08-02 11:52:11 -04:00
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
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
9d51222dae
CC-84: Smart Playlists
...
- Length calculation for dynamic blocks and playlist that contains
dynamic blocks
2012-07-31 17:46:37 -04:00
ab85ab59d9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-30 21:48:25 -04:00
7e433b61fb
CC-1665: Scheduled stream rebroadcasting and recording
...
-improve working with "webstreams"
2012-07-30 21:48:04 -04:00
27017c7903
CC-84: Smart Playlists
...
- fixed getCriteria() to non static function
2012-07-30 18:21:27 -04:00
019d13b4c9
CC-84: Smart Playlists
...
- backend implementation
- UI for blocks within playlist
2012-07-30 17:55:22 -04:00
5becd70ab1
CC-84: Smart Playlists
...
- drag and drop playlist that contains block
- audio preview of playlist that contains static block
2012-07-27 11:51:50 -04:00
7cde4ba2ba
CC-84: Smart Playlists
...
- merging code
2012-07-26 16:16:07 -04:00
8755500d30
CC-84: Smart Playlists
...
- some minor fix
2012-07-26 15:30:49 -04:00
eb4c23b0b6
CC-1665: Scheduled stream rebroadcasting and recording
...
-Fix scheduled streams mixed with scheduled files
2012-07-26 14:49:32 -04:00
3735579378
-remove cc_access table and gunid usage
2012-07-26 14:49:32 -04:00
8b2facaa96
CC-1665: Scheduled stream rebroadcasting and recording
...
-playlists load contents now correctly identify tracks vs streams
2012-07-26 14:49:32 -04:00
a16a1f5033
CC-1665: Scheduled stream rebroadcasting and recording
...
-Webstreams now appearing in the library
2012-07-26 14:49:31 -04:00
31176f525e
CC-1665: Scheduled stream rebroadcasting and recording
...
-started working on UI
2012-07-26 14:41:40 -04:00
ed54e882a3
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-26 14:41:22 -04:00
Martin Konecny
James
denise