Martin Konecny
|
7e433b61fb
|
CC-1665: Scheduled stream rebroadcasting and recording
-improve working with "webstreams"
|
2012-07-30 21:48:04 -04:00 |
denise
|
142aa214b3
|
CC-84: Smart Playlists
-dos2unix
|
2012-07-30 17:31:54 -04:00 |
denise
|
d169f4aa31
|
CC-84: Smart Playlists
- improved validation to not allow multiple criteria fields
|
2012-07-30 17:03:01 -04:00 |
denise
|
f91be9468f
|
CC-84: Smart Playlists
-UI cleanup
|
2012-07-30 16:42:37 -04:00 |
denise
|
99cfd72cc3
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-07-29 15:48:10 -04:00 |
denise
|
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 |
Martin Konecny
|
64e06cff24
|
Merge branch '2.1.x' into devel
|
2012-07-28 23:59:58 -04:00 |
Martin Konecny
|
4ae09858f1
|
CC-4133: airtime-test-stream does not work with shoutcast streams
-fixed
|
2012-07-28 23:21:30 -04:00 |
Martin Konecny
|
e6f13ac279
|
CC-1710: FLAC, AAC support
-add AAC support for future liquidsoap binaries
|
2012-07-28 15:03:51 -04:00 |
Martin Konecny
|
46fa2090c1
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-07-28 14:11:34 -04:00 |
Martin Konecny
|
c647e34d36
|
CC-1710: FLAC, AAC support
-add support for AAC in future compiled versions of Liquidsoap
|
2012-07-28 14:11:19 -04:00 |
denise
|
c2aea7490f
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-07-27 17:30:35 -04:00 |
denise
|
55b8b08508
|
CC-84: Smart Playlists
-fixed how the modifier rows are parsed when saving to db
|
2012-07-27 17:30:21 -04:00 |
Martin Konecny
|
648b8ae296
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-07-27 14:47:26 -04:00 |
Martin Konecny
|
f0f9e8e215
|
CC-1665: Scheduled stream rebroadcasting and recording
-minor fixes
|
2012-07-27 14:47:15 -04:00 |
denise
|
2083d04107
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-07-27 14:32:39 -04:00 |
denise
|
d7cf50b2f4
|
CC-84: Smart Playlists
- changed error handling and criteria saving to handle same criteria rows
|
2012-07-27 14:32:31 -04:00 |
James
|
4e022c407d
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-07-27 11:52:08 -04:00 |
James
|
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 |
Martin Konecny
|
ebed110429
|
CC-1665: Scheduled stream rebroadcasting and recording
-code cleanup
|
2012-07-26 17:51:47 -04:00 |
James
|
7cde4ba2ba
|
CC-84: Smart Playlists
- merging code
|
2012-07-26 16:16:07 -04:00 |
James
|
8755500d30
|
CC-84: Smart Playlists
- some minor fix
|
2012-07-26 15:30:49 -04:00 |
James
|
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 |
James
|
a51b04e422
|
CC-84: Smart Playlists
- db schema change for type column on playlistcontents
|
2012-07-26 14:49:42 -04:00 |
Martin Konecny
|
eb4c23b0b6
|
CC-1665: Scheduled stream rebroadcasting and recording
-Fix scheduled streams mixed with scheduled files
|
2012-07-26 14:49:32 -04:00 |
Martin Konecny
|
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 |
Martin Konecny
|
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
|
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
|
3735579378
|
-remove cc_access table and gunid usage
|
2012-07-26 14:49:32 -04:00 |
Martin Konecny
|
b283b5b55e
|
CC-1665: Scheduled stream rebroadcasting and recording
-remove unused function
|
2012-07-26 14:49:32 -04:00 |
Martin Konecny
|
be8262b67c
|
CC-1665: Scheduled stream rebroadcasting and recording
-fixed web stream length not showing up correctly
|
2012-07-26 14:49:32 -04:00 |
Martin Konecny
|
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 |
Martin Konecny
|
cf2f96ecf1
|
remove commented code
|
2012-07-26 14:49:31 -04:00 |
Martin Konecny
|
a16a1f5033
|
CC-1665: Scheduled stream rebroadcasting and recording
-Webstreams now appearing in the library
|
2012-07-26 14:49:31 -04:00 |
Martin Konecny
|
d0e4ad1334
|
script to regenerate database schema
|
2012-07-26 14:41:40 -04:00 |
Martin Konecny
|
31176f525e
|
CC-1665: Scheduled stream rebroadcasting and recording
-started working on UI
|
2012-07-26 14:41:40 -04:00 |
Martin Konecny
|
2ad7e78e10
|
CC-1665: Scheduled stream rebroadcasting and recording
-initial prototype
|
2012-07-26 14:41:39 -04:00 |
Martin Konecny
|
ed54e882a3
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-07-26 14:41:22 -04:00 |
Martin Konecny
|
3f41835e12
|
re-add getCurrentShowAction
|
2012-07-26 14:36:21 -04:00 |
denise
|
a828c46d32
|
CC-84: Smart Playlists
- changed name of 'block' to 'smart playlist' on UI only
|
2012-07-26 13:16:29 -04:00 |
denise
|
3df0f2d26e
|
CC-84: Smart Playlists
- added 'add' option to smart playlist context menu
|
2012-07-26 12:45:31 -04:00 |
James
|
40bd33df11
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-07-26 10:49:38 -04:00 |
James
|
9bd823ee2c
|
CC-84: Smart Playlists
- fixed the issue where block length wasn't updated on spl section
|
2012-07-26 10:49:23 -04:00 |
Martin Konecny
|
077cc735d7
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-07-25 18:42:59 -04:00 |
Martin Konecny
|
275efb254a
|
fix improperly renamed functions
|
2012-07-25 18:42:46 -04:00 |
denise
|
bef9ba1eea
|
CC-84: Smart Playlists
- added 'Smart Block' filter in datatable
- added block files to library datatable
|
2012-07-25 17:08:22 -04:00 |
James
|
1f3cbd8aba
|
CC-84: Smart Playlists
- introducing smart-block
|
2012-07-25 12:44:37 -04:00 |
denise
|
722e470f6f
|
CC-84: Smart Playlists
- changed playlist controller to also handle Blocks
- created new view for smart blocks
|
2012-07-25 11:00:46 -04:00 |
denise
|
c79110644d
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-07-24 12:14:02 -04:00 |
denise
|
754187a2b7
|
CC-84: Smart Playlists
- remove subform and combined back into one form
|
2012-07-24 12:13:51 -04:00 |