b23b9a0cbd
CC-1665: Scheduled stream rebroadcasting and recording
...
-allow to filter by webstream only
2012-08-03 16:33:58 -04:00
183937b8e9
CC-1665: Scheduled stream rebroadcasting and recording
...
-when editing string should hav 00h 00m format.
2012-08-03 16:18:45 -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
2a7c5eef64
CC-84: Smart Playlists
...
- added no-wrap class to qtip
2012-08-02 17:17:44 -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
361e681a59
CC-84: Smart Playlists
...
- remove 'add to playlist' option on showbuilder screen
2012-08-02 16:50:35 -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
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
6e71a6bb92
CC-84: Smart Playlists
...
- dynamic block length display
2012-08-02 11:17:10 -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
bf0dcc9035
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-01 16:26:14 -04:00
483ffdf6af
CC-84: Smart Playlists
...
- increased size of criteria column
- it was too smallf for some fields
2012-08-01 16:25:59 -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
bcab41cb86
- 'New User' button text was wrapping onto two lines
2012-08-01 15:30:35 -04:00
40ebeb7fb4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-01 15:00:54 -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
e6a3877c1e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-01 14:52:29 -04:00
63b89043b6
CC-1665: Scheduled stream rebroadcasting and recording
...
on-air light works with streams now
2012-08-01 14:51:56 -04:00
7d788c51b2
CC-84: Smart Playlists
...
- added scrolling on qtip
2012-08-01 14:43:52 -04:00
0f681d7c25
CC-84: Smart Playlists
...
-fixed undefined offset apache warnings
2012-08-01 14:07:38 -04:00
8f063367cc
CC-84: Smart Playlists
...
- qtip cleanup for dynamic playlists
2012-08-01 13:49:16 -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
1b0cd6b01b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-31 11:01:34 -04:00
b312b2bd45
CC-84: Smart Playlists
...
- fixed db query part for static smart playlist generate
2012-07-31 11:01:19 -04:00
b83be1a922
CC-1665: Scheduled stream rebroadcasting and recording
...
-fix incorrectly named column
2012-07-31 11:00:01 -04:00
527b43e8ba
CC-1665: Scheduled stream rebroadcasting and recording
...
-fix incorrectly named column
2012-07-31 10:13:41 -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
27017c7903
CC-84: Smart Playlists
...
- fixed getCriteria() to non static function
2012-07-30 18:21:27 -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
142aa214b3
CC-84: Smart Playlists
...
-dos2unix
2012-07-30 17:31:54 -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
e04273c335
CC-84: Smart Playlists
...
- created function that returns an array of block criteria
- fixed form so it displays modifier rows properly
2012-07-29 15:47:42 -04:00
c2aea7490f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-27 17:30:35 -04:00
55b8b08508
CC-84: Smart Playlists
...
-fixed how the modifier rows are parsed when saving to db
2012-07-27 17:30:21 -04:00
648b8ae296
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-27 14:47:26 -04:00
f0f9e8e215
CC-1665: Scheduled stream rebroadcasting and recording
...
-minor fixes
2012-07-27 14:47:15 -04:00
Martin Konecny
denise
James