Commit Graph

6781 Commits

Author SHA1 Message Date
Martin Konecny 29afb6e191 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	python_apps/pypo/pypopush.py
2012-03-28 22:49:57 -04:00
Martin Konecny fe0f72c8f4 -remove liquidsoap binaries 2012-03-28 22:47:45 -04:00
Martin Konecny ffdc009290 CC-3485: Liquidsoap annotation is missing liq_fade_in and liq_fade_out
-fixed
2012-03-28 17:08:11 -04:00
James 4f5d7efaa1 CC-3449: Live Stream: Kick out live dj at the end of the show
- done
2012-03-28 15:12:01 -04:00
Naomi Aro d12ef1c7a2 CC-3536 : Work out ACL with library on NowPlaying when it's a guest User 2012-03-28 18:43:44 +02:00
Naomi Aro 1e9348f27f CC-3509: "Add Files" button (make it look better) 2012-03-28 17:50:14 +02:00
Naomi Aro 8910d93c55 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-28 17:30:21 +02:00
Naomi Aro aca6e995dd CC-3503 : Preserve the state of "Now Playing" screen - whether Library section is open or not 2012-03-28 17:29:34 +02:00
james ac35ba5a93 CC-3519: System-> Stream> Problem with Master DJ Port and DJ Port settings
- fixed a bug when master and dj port are both empty, it was returnning error
2012-03-28 10:15:54 -04:00
Naomi Aro fe21abf16d CC-3503 : Preserve the state of "Now Playing" screen - whether Library section is open or not 2012-03-28 16:14:02 +02:00
james 2bb9b03b19 CC-3507: Live Stream status: naming
- naming change on stream setting page
2012-03-28 09:55:04 -04:00
james 478cb57228 CC-3527: Airtime reinstallation-> it would be better to have 'Scheduled Play'
thread enabled

- set default data for this switch
2012-03-28 09:48:45 -04:00
james f4b9774b08 CC-3535: PypoFetch: make disconnect_source() and switch_source() static method
- done
2012-03-28 09:39:46 -04:00
Naomi Aro 03c5daa9e7 CC-3534 : Check Scheduling Edge Cases 2012-03-28 14:26:38 +02:00
Naomi Aro 4904a16ebb CC-3534 : Check Scheduling Edge Cases
extracting out error checking in scheduling, added created column to cc_showinstances
2012-03-28 14:23:25 +02:00
Naomi Aro b70773489a CC-3534 : Check Scheduling Edge Cases
not allowing users to add to a show that has ended.
2012-03-28 10:50:02 +02:00
James b93b886fec Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-27 17:15:03 -04:00
James b935c82b83 CC-3519: System-> Stream> Problem with Master DJ Port and DJ Port settings
- fixed
2012-03-27 17:14:34 -04:00
Martin Konecny f8a71a3923 CC-3531: When importing watched directory, correcting a file's permissions does not work correctly.
-fixed
2012-03-27 16:59:26 -04:00
Martin Konecny 45fcedfbd3 CC-3528: SaaS compatible upgrade script template
-Done
2012-03-27 15:49:54 -04:00
Martin Konecny 1c62323eca Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-27 15:35:05 -04:00
Martin Konecny 24262d5ed5 cc-3521: remove 2 second delay 2012-03-27 15:34:56 -04:00
Martin Konecny 654ff76ea4 CC-3399: Use VBR instead of CBR for Vorbis (OGG) audio streams
-Done
2012-03-27 15:33:44 -04:00
Martin Konecny d83267e6dc -remove crossfade function from ls scripts since it wasn't doing anything. 2012-03-27 15:16:58 -04:00
Naomi Aro 9dbe8a5e5e CC-3463 : Usability improvements for timeline 2012-03-27 18:40:17 +02:00
Naomi Aro c1bdc6ff0f CC-3463 : Usability improvements for timeline
working on timeline context menu.
cursor/play functions.
2012-03-27 18:27:58 +02:00
Naomi Aro d9a42c4e40 CC-3463 : Usability improvements for timeline 2012-03-27 17:47:21 +02:00
Naomi Aro 9c52b2ee1f CC-3174 : showbuilder
fixing jplayer preview
2012-03-27 16:27:43 +02:00
Naomi Aro dfc6ae6273 CC-3463 : Usability improvements for timeline
started to add cursor options to context menu.
2012-03-27 15:46:25 +02:00
Naomi Aro 296a5c583a CC-3407 : Timeline: Display if tracks are missing on disk 2012-03-27 15:16:07 +02:00
Naomi Aro 451b573c52 Merge branch 'CC-3174' into devel 2012-03-27 14:14:58 +02:00
Naomi Aro 2956009f42 CC-3451 : Ability to delete the currently playing clip 2012-03-27 14:11:36 +02:00
Naomi Aro 10e4ae781f CC-3451 : Ability to delete the currently playing clip 2012-03-27 12:44:48 +02:00
Martin Konecny 712371bde4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-26 19:02:05 -04:00
Martin Konecny 3f713ca8dc CC-3426: apache log errors from plupload
-fixed
2012-03-26 19:00:40 -04:00
James f41ebbe7a7 CC-3521: Live Stream: Remove 2 second scilence when transition happens
- reduced the blank duration to 0.1 sec
2012-03-26 18:56:28 -04:00
James 0bdfa74566 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-26 18:39:24 -04:00
James 7e92b96a67 CC-3507: Live Stream status: naming
- fixed css width
2012-03-26 18:39:10 -04:00
Martin Konecny a50b1ffe73 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-26 17:59:53 -04:00
Martin Konecny d7af91f306 CC-3520: Change default password of monit
-done
2012-03-26 17:59:44 -04:00
James ef801c7a10 CC-3484: Pypo: On bootup, it should grab station name and stream label
for liquidsoap

- fixed
2012-03-26 17:44:07 -04:00
James 44e8e96cc8 CC-3507: Live Stream status: naming
- fixed
2012-03-26 17:29:09 -04:00
James 191d0f0e4d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-26 17:21:30 -04:00
James d7819b6dd2 CC-3489: Live Stream: When Custom Auth check box is checked, Custom
Username and Custom Password field must be required

- fixed spacing
2012-03-26 17:21:13 -04:00
Martin Konecny 3308cbb7de Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-26 16:18:43 -04:00
Martin Konecny 45e57ee330 CC-3402: airtime-check-system is hardcoded to port 80
-fixed
2012-03-26 16:18:35 -04:00
Martin Konecny ccfa954f0e CC-3174: Show Content Builder
-fixed indentation
2012-03-26 15:43:29 -04:00
James aba89824f0 CC-3490: liquidsoap_prepare_terminate.py is not using python virtual env
- fixed
2012-03-26 15:42:00 -04:00
James 375be99fbd Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-26 15:09:56 -04:00
James e76f4baf18 CC-3489: Live Stream: When Custom Auth check box is checked, Custom Username and Custom Password field must be required
- done
2012-03-26 15:09:27 -04:00