e20289e5cf
Merge branch '2.1.x' into devel
2012-08-06 17:17:05 -04:00
975abbaf10
Remove unecessary information being sent from API
2012-08-06 17:16:43 -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
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
af939469d3
CC-84: Smart Playlists
...
- fixed bug on expanding block
- fixed text bug
2012-08-02 17:03:54 -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
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
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
0f681d7c25
CC-84: Smart Playlists
...
-fixed undefined offset apache warnings
2012-08-01 14:07:38 -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
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
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
4e022c407d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-27 11:52:08 -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
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
8755500d30
CC-84: Smart Playlists
...
- some minor fix
2012-07-26 15:30:49 -04:00
8f2339f109
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/models/airtime/map/CcPlaylistcontentsTableMap.php
airtime_mvc/build/schema.xml
airtime_mvc/build/sql/schema.sql
2012-07-26 14:54:47 -04:00
a51b04e422
CC-84: Smart Playlists
...
- db schema change for type column on playlistcontents
2012-07-26 14:49:42 -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
ccdc06786d
CC-1665: Scheduled stream rebroadcasting and recording
...
-remove some hardcoded webstream values
-fix some broken problems from devel
2012-07-26 14:49:32 -04:00
fbc5b72f14
CC-1665: Scheduled stream rebroadcasting and recording
...
-webstreams now start and stop at the correct time.
2012-07-26 14:49:32 -04:00
Martin Konecny
James
denise