Commit Graph

7959 Commits

Author SHA1 Message Date
Daniel James f99574b723 Check that old version exists before deciding this is an upgrade 2012-08-02 15:00:12 +01:00
Daniel James d5efcb359f Use set -x not set -e by default for postinst, to avoid dpkg bailing 2012-08-02 14:21:19 +01:00
Daniel James f5a7b15a34 Fixed scp upload command syntax 2012-08-02 12:01:49 +01:00
Daniel James 6375c283c5 Added script to create nightly .deb package snapshot 2012-08-02 11:41:53 +01:00
denise 9479aeb3dd CC-84: Smart Playlists
- fixed db column mapping for radio station name and track title
2012-08-01 17:10:56 -04:00
denise ddd6016b28 CC-84: Smart Playlists
- qtip cleanup
2012-08-01 16:36:12 -04:00
denise bf0dcc9035 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-01 16:26:14 -04:00
denise 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
Martin Konecny 2ef4fd314c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-01 15:37:58 -04:00
Martin Konecny 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
denise bcab41cb86 - 'New User' button text was wrapping onto two lines 2012-08-01 15:30:35 -04:00
denise 40ebeb7fb4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-01 15:00:54 -04:00
denise 13bb036bad CC-84: Smart Playlists
-on criteria qtip limit was displaying more than once
-fixed
2012-08-01 15:00:41 -04:00
Martin Konecny e6a3877c1e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-01 14:52:29 -04:00
Martin Konecny 5f8a5a618d Remove unecessary trailing whitespace 2012-08-01 14:52:21 -04:00
Martin Konecny 63b89043b6 CC-1665: Scheduled stream rebroadcasting and recording
on-air light works with streams now
2012-08-01 14:51:56 -04:00
denise 7d788c51b2 CC-84: Smart Playlists
- added scrolling on qtip
2012-08-01 14:43:52 -04:00
denise 0f681d7c25 CC-84: Smart Playlists
-fixed undefined offset apache warnings
2012-08-01 14:07:38 -04:00
denise 8f063367cc CC-84: Smart Playlists
- qtip cleanup for dynamic playlists
2012-08-01 13:49:16 -04:00
denise 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
James e1f962baa9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-31 17:46:52 -04:00
James 9d51222dae CC-84: Smart Playlists
- Length calculation for dynamic blocks and playlist that contains
dynamic blocks
2012-07-31 17:46:37 -04:00
Cliff 39615432a3 install_full/ubuntu/airtime-full-install 2012-07-31 12:29:59 -04:00
James 1b0cd6b01b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-31 11:01:34 -04:00
James b312b2bd45 CC-84: Smart Playlists
- fixed db query part for static smart playlist generate
2012-07-31 11:01:19 -04:00
Martin Konecny 45a77e90a8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-31 11:00:26 -04:00
Martin Konecny 92e34b12f7 CC-1665: Scheduled stream rebroadcasting and recording
-cancel button has effect now :)
2012-07-31 11:00:15 -04:00
Martin Konecny b83be1a922 CC-1665: Scheduled stream rebroadcasting and recording
-fix incorrectly named column
2012-07-31 11:00:01 -04:00
Cliff bc6ed88c82 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-31 10:33:52 -04:00
Cliff a2ba4e03b4 CC-4137 airtime-full-install fail in Debian 2012-07-31 10:32:39 -04:00
denise eb2a8c1009 CC-84: Smart Playlists
- renamed Smart Blocks to Smart Playlists in library filter
2012-07-31 10:17:48 -04:00
Martin Konecny 527b43e8ba CC-1665: Scheduled stream rebroadcasting and recording
-fix incorrectly named column
2012-07-31 10:13:41 -04:00
denise cbbdd5a1fd Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-31 10:05:50 -04:00
denise 1b1b7e11d0 CC-84: Smart Playlists
-fixed spacing of modifier '+' button
2012-07-31 10:05:38 -04:00
Martin Konecny ab85ab59d9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-30 21:48:25 -04:00
Martin Konecny 7e433b61fb CC-1665: Scheduled stream rebroadcasting and recording
-improve working with "webstreams"
2012-07-30 21:48:04 -04:00
denise ecd926ae90 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-30 18:53:57 -04:00
denise ff62769d6c CC-84: Smart Playlists
-UI cleanup
2012-07-30 18:53:50 -04:00
James 27017c7903 CC-84: Smart Playlists
- fixed getCriteria() to non static function
2012-07-30 18:21:27 -04:00
James b9739b022d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-30 17:55:39 -04:00
James 019d13b4c9 CC-84: Smart Playlists
- backend implementation
- UI for blocks within playlist
2012-07-30 17:55:22 -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