f33485f8ea
Merge branch '2.1.x' into devel
2012-08-08 00:09:13 -04:00
230c3399ef
CC-1665: Scheduled stream rebroadcasting and recording
...
-fix newlines appearing in playlist/webstream title
-disable autosave of playlist/webstream title
2012-08-07 20:48:58 -04:00
1dddaa0ba2
CC-1665: Scheduled stream rebroadcasting and recording
...
-refresh library to show new stream after save
2012-08-07 19:49:26 -04:00
9b805f0a01
CC-4159: Playlist Builder -> Smart Playlist : "+" for modifier disappears if 3 or more Criteria
...
-fixed
2012-08-07 17:40:47 -04:00
0fe501508e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-07 15:54:42 -04:00
171825e19a
CC-4148: Playlist Builder: Please add a 'Processing' for generating Smart playlist
...
- added processing box
2012-08-07 15:54:16 -04:00
f6dffc95c8
CC-4158: Playlist Builder -> Smart Playlist: Warning msg field is a little bit longer
...
-fixed
2012-08-07 15:22:32 -04:00
550c97a2dc
CC-4154L: Indicate whether a show has scheduled content on the calendar page
...
-done
2012-08-07 14:57:04 -04:00
d05661afff
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-07 11:08:34 -04:00
2c0f7bf03b
CC-4145: Playlist Builder: Alert pops up when clicking 'Add to playlist' in context menu of Smart Playlist to add it into regular playlist
...
-fixed
2012-08-07 11:08:00 -04:00
b23b9a0cbd
CC-1665: Scheduled stream rebroadcasting and recording
...
-allow to filter by webstream only
2012-08-03 16:33:58 -04:00
0ea66fc33f
CC-1665: Scheduled stream rebroadcasting and recording
...
-ability to edit playlists
2012-08-03 15:59:34 -04:00
d18acfdc75
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-02 17:17:52 -04:00
8e67ecff0a
CC-84: Smart Playlists
...
- added a no-wrap class to qtip
2012-08-02 17:17:13 -04:00
82970c6e73
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-02 17:04:49 -04:00
af939469d3
CC-84: Smart Playlists
...
- fixed bug on expanding block
- fixed text bug
2012-08-02 17:03:54 -04:00
ef994aa449
CC-84: Smart Playlists
...
- block options scroll for small screens
2012-08-02 16:40:32 -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
4fca33c5fc
CC-84: Smart Playlists
...
- removed block from right side if it gets deleted from context menu
2012-08-02 12:59:00 -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
9479aeb3dd
CC-84: Smart Playlists
...
- fixed db column mapping for radio station name and track title
2012-08-01 17:10:56 -04:00
ddd6016b28
CC-84: Smart Playlists
...
- qtip cleanup
2012-08-01 16:36:12 -04:00
2ef4fd314c
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-01 15:37:58 -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
13bb036bad
CC-84: Smart Playlists
...
-on criteria qtip limit was displaying more than once
-fixed
2012-08-01 15:00:41 -04:00
7d788c51b2
CC-84: Smart Playlists
...
- added scrolling on qtip
2012-08-01 14:43:52 -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
45a77e90a8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-31 11:00:26 -04:00
92e34b12f7
CC-1665: Scheduled stream rebroadcasting and recording
...
-cancel button has effect now :)
2012-07-31 11:00:15 -04:00
eb2a8c1009
CC-84: Smart Playlists
...
- renamed Smart Blocks to Smart Playlists in library filter
2012-07-31 10:17:48 -04:00
cbbdd5a1fd
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-31 10:05:50 -04:00
1b1b7e11d0
CC-84: Smart Playlists
...
-fixed spacing of modifier '+' button
2012-07-31 10:05:38 -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
ecd926ae90
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-30 18:53:57 -04:00
ff62769d6c
CC-84: Smart Playlists
...
-UI cleanup
2012-07-30 18:53:50 -04:00
b9739b022d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-30 17:55:39 -04:00
019d13b4c9
CC-84: Smart Playlists
...
- backend implementation
- UI for blocks within playlist
2012-07-30 17:55:22 -04:00
d169f4aa31
CC-84: Smart Playlists
...
- improved validation to not allow multiple criteria fields
2012-07-30 17:03:01 -04:00
f91be9468f
CC-84: Smart Playlists
...
-UI cleanup
2012-07-30 16:42:37 -04:00
2083d04107
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-27 14:32:39 -04:00
d7cf50b2f4
CC-84: Smart Playlists
...
- changed error handling and criteria saving to handle same criteria rows
2012-07-27 14:32:31 -04:00
ebed110429
CC-1665: Scheduled stream rebroadcasting and recording
...
-code cleanup
2012-07-26 17:51:47 -04:00
7cde4ba2ba
CC-84: Smart Playlists
...
- merging code
2012-07-26 16:16:07 -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
c90495d2d3
CC-1665: Scheduled stream rebroadcasting and recording
...
-getting closer to being able to schedule a webstream
2012-07-26 14:49:32 -04:00
Martin Konecny
denise
James