Commit Graph

8040 Commits

Author SHA1 Message Date
Cliff a1768aaac5 force install of unsigned package 2012-08-03 15:20:05 -04:00
Cliff edd4cbba13 Merge branch '2.1.x' into devel 2012-08-03 14:25:54 -04:00
Cliff 17e2417f18 put apt-get args in correct location 2012-08-03 14:24:39 -04:00
Martin Konecny c3783a15b2 Merge branch '2.1.x' into devel 2012-08-03 12:53:32 -04:00
Martin Konecny 8d2348606c CC-4147: Make Airtime work nicer with Debian package generation scripts.
-make sure we modify sources.list before doing apt-get update
2012-08-03 12:53:11 -04:00
Martin Konecny 42738c98a3 Merge branch '2.1.x' into devel 2012-08-03 11:14:05 -04:00
Martin Konecny f98bd5b8f2 CC-4147: Make Airtime work nicer with Debian package generation scripts.
-add "--disable-deb-check" option
2012-08-03 11:13:17 -04:00
Martin Konecny 992dbfdbc2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-03 09:46:08 -04:00
Martin Konecny eb4b3cfcfa Merge branch '2.1.x' into devel
Conflicts:
	install_full/ubuntu/airtime-full-install
2012-08-03 09:45:55 -04:00
Martin Konecny df2025d7bc CC-4147: Make Airtime work nicer with Debian package generation scripts.
-remove integrated liquidsoap binaries
2012-08-03 09:44:41 -04:00
Martin Konecny 3f10f94d8f CC-4147: Make Airtime work nicer with Debian package generation scripts.
-liquidsoap is installed from sofab repo
-make sure new deb-multimedia name takes effect
2012-08-03 09:42:41 -04:00
Martin Konecny 194b4ec36e Merge branch '2.1.x' into devel 2012-08-02 18:10:12 -04:00
Martin Konecny 4f1300f58a CC-3412: Icecast stream name not defined 2012-08-02 18:08:17 -04:00
denise d18acfdc75 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-02 17:17:52 -04:00
denise 2a7c5eef64 CC-84: Smart Playlists
- added no-wrap class to qtip
2012-08-02 17:17:44 -04:00
denise 8e67ecff0a CC-84: Smart Playlists
- added a no-wrap class to qtip
2012-08-02 17:17:13 -04:00
James 82970c6e73 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-02 17:04:49 -04:00
James af939469d3 CC-84: Smart Playlists
- fixed bug on expanding block
- fixed text bug
2012-08-02 17:03:54 -04:00
denise 361e681a59 CC-84: Smart Playlists
- remove 'add to playlist' option on showbuilder screen
2012-08-02 16:50:35 -04:00
denise ef994aa449 CC-84: Smart Playlists
- block options scroll for small screens
2012-08-02 16:40:32 -04:00
James 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
James 0d2d8218bf CC-84: Smart Playlists
- audio preview on playlist
- cleaning up some code
2012-08-02 16:36:12 -04:00
Martin Konecny a146fdcd37 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-02 16:27:00 -04:00
Martin Konecny fcce4bf64c CC-1665: Scheduled stream rebroadcasting and recording
-cancelling a webstream works
2012-08-02 16:26:41 -04:00
Martin Konecny 9cc152c0ae CC-1665: Scheduled stream rebroadcasting and recording
-validate form fields of new webstream
2012-08-02 15:45:15 -04:00
denise 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
denise 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
James 3b5a3e6713 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-02 11:17:26 -04:00
James 6e71a6bb92 CC-84: Smart Playlists
- dynamic block length display
2012-08-02 11:17:10 -04:00
Daniel James 0df630c76e Upload to the snapshots directory, not misc directory 2012-08-02 15:43:28 +01:00
Daniel James 1eaac8b163 Use version number 2.2.0~datestamp for nightly snapshot packages 2012-08-02 15:31:27 +01:00
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