Commit graph

8872 commits

Author SHA1 Message Date
denise
d23bd2d85b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-21 11:58:46 -04:00
denise
0c381d4692 CC-4253: Smart Playlist: Please support filter tracks by date
-fixed
2012-08-21 11:58:39 -04:00
Martin Konecny
0ce4c1000b replace tabs with spaces
-also remove \r characters
2012-08-21 11:16:07 -04:00
Martin Konecny
51ebae3de9 Make sure we are using the Library controller for the Library page 2012-08-21 11:12:33 -04:00
Martin Konecny
d2eca0faaf Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-21 10:50:33 -04:00
Martin Konecny
47852bce2a indentation fixes 2012-08-21 10:50:24 -04:00
Martin Konecny
179aa3d739 CC-1665: Scheduled stream rebroadcasting and recording
-Show meaningful page after webstream is deleted
2012-08-21 10:50:18 -04:00
Rudi Grinberg
bb1e67a83c small refactoring of to os.path.join instead of manual path concatenation. 2012-08-21 10:46:48 -04:00
denise
025656be1c CC-4205: Smart Playlist Builder: Change text on button mouseovers
-changed generate success msg
2012-08-21 10:46:25 -04:00
Rudi Grinberg
6d0d0eada9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-21 10:43:04 -04:00
denise
c60198722d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-21 10:42:37 -04:00
denise
4cd5dbb926 CC-4205: Smart Playlist Builder: Change text on button mouseovers
-changed save button text
2012-08-21 10:42:10 -04:00
Martin Konecny
cba717dc4b CC-1665: Scheduled stream rebroadcasting and recording
-Fixed regressions introduced by changing HTML element id
2012-08-21 10:33:36 -04:00
Martin Konecny
337e5fec8a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-20 18:36:32 -04:00
Martin Konecny
3230f14231 CC-1665: Scheduled stream rebroadcasting and recording
-Fixed delete button on right side of library screen not working
2012-08-20 18:35:10 -04:00
Martin Konecny
d517bf6e19 fix indentation and remove \r characters 2012-08-20 18:29:57 -04:00
Rudi Grinberg
93d21b510c MM2:
Fixed wrong use of split (misunderstanding of the maxsplit optional argument)
2012-08-20 18:01:42 -04:00
James
734be21269 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-20 17:18:00 -04:00
James
a24da9e324 CC-4256: Smart Playlist: change name to smart block and etc
- done
2012-08-20 17:17:48 -04:00
Martin Konecny
4d8dc01638 don't crash js if a backend service is not running 2012-08-20 17:09:59 -04:00
Martin Konecny
4f7c8bf0db Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-20 16:54:10 -04:00
Martin Konecny
a874e9fff7 CC-4114: use liquidsoap shutdown() command to restart liquidsoap
-tying up loose ends
2012-08-20 16:54:01 -04:00
Rudi Grinberg
2438325445 Merge branch 'cc-4227-2' into devel 2012-08-20 16:24:00 -04:00
Rudi Grinberg
c43e1b3b5e cc-4227: added new upgrade scripts 2012-08-20 16:23:51 -04:00
Rudi Grinberg
a993691c6a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-20 16:23:15 -04:00
Rudi Grinberg
48ae4a578f cc-4227
Added comments. Removed bad/old upgrade code.
2012-08-20 16:15:14 -04:00
Rudi Grinberg
e46f0d2b4d cc-4227
Added clause for airtime 2.2.0 in the general upgrade script.
2012-08-20 16:06:11 -04:00
Martin Konecny
0270281385 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-20 16:05:32 -04:00
Rudi Grinberg
b2158d48f5 Upgrade Script:
Fixed possible bug where values with "=" characters will not be read correctly by
the inhouse ini reader.
2012-08-20 16:05:26 -04:00
Martin Konecny
f3f9ef80ff CC-4119: zendphp.log is not rotated
-fixed
2012-08-20 16:05:25 -04:00
James
959844974c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-20 16:03:47 -04:00
James
1c9e290982 CC-4218: Live resource: Cannot connect live resource.
- fixed
2012-08-20 16:03:29 -04:00
Martin Konecny
f6a4732e87 CC-4119: zendphp.log is not rotated
-fixed
2012-08-20 15:54:10 -04:00
Rudi Grinberg
51fc87c638 cc-4227: removed unnecessary code 2012-08-20 15:02:39 -04:00
Martin Konecny
5315d1efd0 CC-4114: use liquidsoap shutdown() command to restart liquidsoap
-fixed syntax error
2012-08-20 14:52:35 -04:00
Martin Konecny
69f150ac7f more detailed error message 2012-08-20 14:41:43 -04:00
Martin Konecny
4ad3927554 CC-4114: use liquidsoap shutdown() command to restart liquidsoap
-shutdown liquidsoap on install
2012-08-20 14:41:34 -04:00
Martin Konecny
0dd3dd506e add logging in scripts so we know which telnet command is issued 2012-08-20 14:40:46 -04:00
Rudi Grinberg
6c1e822b6a cc-4227: updated install scripts for upgrade 2012-08-20 12:32:16 -04:00
Rudi Grinberg
abeef43a5b cc-4227: fixed small bugs in upgrade script and finished testing 2012-08-20 12:15:29 -04:00
Martin Konecny
79ea05bc1b CC-4114: use liquidsoap shutdown() command to restart liquidsoap
-more fixes
2012-08-20 12:11:03 -04:00
Rudi Grinberg
b4c014dbcc cc-4227: changed upgrade method. added test stubs for it 2012-08-20 11:19:57 -04:00
Martin Konecny
9f903833d7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-20 10:55:13 -04:00
Martin Konecny
72de78bcd1 CC-4114: use liquidsoap shutdown() command to restart liquidsoap
-changed to use init.d script to restart.
2012-08-19 00:41:25 -04:00
Martin Konecny
1dd1ba4420 CC-4114: use liquidsoap shutdown() command to restart liquidsoap
-moved liquidsoap into its own init.d script. Still need to do some testing.
2012-08-18 22:02:15 -04:00
Martin Konecny
a6d10d8378 CC-1665: Scheduled stream rebroadcasting and recording
-fix syntax error
2012-08-18 21:48:57 -04:00
Rudi Grinberg
37aa879ed0 cc-4227: fix of bad fix regarding normalized data 2012-08-17 17:38:08 -04:00
Rudi Grinberg
364f3e777a cc-4227: added simple script to upgrade the config 2012-08-17 17:38:08 -04:00
Martin Konecny
398fbb04db CC-1665: Scheduled stream rebroadcasting and recording
-don't show delete button until a stream has been saved
2012-08-17 17:29:17 -04:00
Martin Konecny
b3ef67e617 CC-1665: Scheduled stream rebroadcasting and recording
-info about current pre-buffering webstream should be persistent...
2012-08-17 17:10:42 -04:00