Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,497 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

6497 Commits

Author SHA1 Message Date
Naomi Aro fa1f03ed58 CC-3174 : showbuilder 
improving look of playlist when files are not on disk.
 2012-03-15 12:08:29 +01:00
Naomi Aro 3019cb9c42 CC-3434 : playlist 
changing image to be smaller.
 2012-03-15 11:37:20 +01:00
Naomi Aro ae646545c4 CC-3201 : file import more visible 2012-03-15 11:36:32 +01:00
Martin Konecny 39a41f40ed Merge branch 'cc-2675-edit-ongoing-show' of dev.sourcefabric.org:airtime into cc-2675-edit-ongoing-show 
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
 2012-03-14 15:48:57 -04:00
Martin Konecny cca3995dba cc-2675: edit ongoing show 
-almost there?
 2012-03-14 15:37:04 -04:00
Martin Konecny 217be89766 cc-2675: Edit ongoing show 
-progress being made
 2012-03-14 15:37:04 -04:00
Martin Konecny 1d1405f7fd CC-2675: Edit ongoing show 
-initial commit
 2012-03-14 15:37:04 -04:00
James 03c8c10ba1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-14 15:26:26 -04:00
James 16c0756d76 CC-3224: "On-the-fly" stream rebroadcasting 
- css fix
 2012-03-14 15:26:07 -04:00
Naomi Aro 94e5a3d423 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-14 20:10:22 +01:00
Naomi Aro 68a4443c36 CC-3174 : showbuilder 
changing get to post.
 2012-03-14 20:10:10 +01:00
James c5c9fd7ba8 CC-3430: Live Stream: Admin should be able to kick out the source connection 
- Clicking a button on UI triggers sending msg to pypo, which will lead running
'kick' command in liquidsoap.
 2012-03-14 14:43:11 -04:00
James 2ee4b227fc CC-3439: Live Stream: Only admin should be able to turn on/of switch and 
able to see kick out button

- done
 2012-03-14 14:43:11 -04:00
James 06e810c35d CC-3437: Live Stream: Liquidsoap(Pypo) should preserve the last switch 
status when it restarts

- missed one file from previous commit
 2012-03-14 14:43:10 -04:00
James 3c6aff093e CC-3437: Live Stream: Liquidsoap(Pypo) should preserve the last switch status 
when it restarts.

- Pypo contacts airtime on bootup and ask what the last switch status was
 2012-03-14 14:43:10 -04:00
James 4eefc05366 CC-3427: Live Stream: Ability to switch off Scheduled Play 
- done
 2012-03-14 14:43:10 -04:00
James e31ac81e74 CC-3418: Live Stream: Merge current "On-Air" indicator and "Listen" 
button with new stream source indicator

- Initial commit
 2012-03-14 14:43:10 -04:00
James 68fa46f017 CC-3415: Live Stream: Disconnect all input.harbor connections before 
terminating the process

- call prepare termiate on monit-restart()
 2012-03-14 14:43:10 -04:00
James cde6db812f CC-3415: Live Stream: Disconnect all input.harbor connections before 
terminating the process

- Modified init.d script. init.d script calls liquidsoap_prepare_terminate.py
 2012-03-14 14:43:10 -04:00
James 79f8eabe2b CC-3405: Display to users how to connect a live stream to Airtime 
- Done
 2012-03-14 14:43:10 -04:00
James 540f262a77 CC-3224: "On-the-fly" stream rebroadcasting 
- removed "Allow override" checkbox from show live stream section.
- removed "auto enable live stream" checkbox from stream setting page.
- implemented authentication functionality of live dj source connection.
 2012-03-14 14:43:10 -04:00
James efee025691 CC-3406: Live Stream: Switch off live sources on disconnection 
- done
 2012-03-14 14:43:10 -04:00
James f193047a1c CC-3367: Display in Now Playing whether Live DJ stream and Live Master stream 
are connected and give user the ability to block those streams

- added stream source switch interface
- backend code
 2012-03-14 14:43:10 -04:00
James d4a387e113 - adding switch to liquidsoap 2012-03-14 14:41:00 -04:00
James dfe87723f0 - bug fix in stream setting 
- testing lisquidsoap
 2012-03-14 14:41:00 -04:00
James 128a497059 CC-3224: "On-the-fly" stream rebroadcasting 
- frond-end implementation for master dj and live dj
- db implementation
- liquidsoap is broken on this commit
 2012-03-14 14:41:00 -04:00
James 96c4462adc - delete unnecessary part from config files 2012-03-14 14:41:00 -04:00
James 1ebe3d1812 CC-3224: "On-the-fly" stream rebroadcasting 
- Live source is created when only both port and mount point are specified
 2012-03-14 14:41:00 -04:00
James 30901aa0d6 CC-3224: "On-the-fly" stream rebroadcasting 
- A section where user can setup port and mount point for harbor input in
stream setting page(front-end and back-end)
- updated the part where it rewrites the liquidsoap.cfg file
 2012-03-14 14:41:00 -04:00
James 48bb19d758 CC-3224: "On-the-fly" stream rebroadcasting 
- web interface
- auth script for liquidsoap
- DB changes
 2012-03-14 14:41:00 -04:00
james 701ed82f40 CC-3224: "On-the-fly" stream rebroadcasting 
- interface implementation. subform within the show form.
 2012-03-14 14:41:00 -04:00
James ca04a7a686 CC-3224: "On-the-fly" stream rebroadcasting 
- Form in preference section
 2012-03-14 14:41:00 -04:00
Naomi Aro 309c6da83d CC-3440 : Calendar time picker is hidden for day and week views 2012-03-14 18:05:50 +01:00
Naomi Aro 59e0436597 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-14 17:51:00 +01:00
Naomi Aro eb389d99d2 CC-3434 : Playlist Builder fast deleting 2012-03-14 17:50:48 +01:00
Daniel f399c7adab CC-3426: apache log errors from plupload 
- Updated code so the errors in the log are fixed.
- Performed sanity test on large file size that exceed disk space
  and normal uploads that are small enough to be copied
 2012-03-14 11:14:22 -04:00
Daniel d25a6b7b6b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-13 18:00:51 -04:00
Daniel a65ea6d058 CC-3404: Change "Now Playing" dashboard SQL query to take advantage of the "playout_status" field in the schedule table 
- updated the code to remove the empty declaration of $results
- updated parameters so the name has p_ prepended to it
- fixed a weird bug where $con was not sent to updateScheduleStatus
- modified previous element logic so I only store the index and after the loop test if it was set and then do the formating.
 2012-03-13 17:46:13 -04:00
Martin Konecny 1dc9f51c47 CC-3411: pypo-notify should write to its own log 
-done
 2012-03-13 16:53:10 -04:00
Martin Konecny 5c06626d5e Merge branch 'cc-2675-edit-ongoing-show' of dev.sourcefabric.org:airtime into cc-2675-edit-ongoing-show 2012-03-13 15:26:12 -04:00
Martin Konecny 33df626c3d cc-2675: edit ongoing show 
-almost there?
 2012-03-13 15:25:30 -04:00
Martin Konecny 2aa84f5bd1 cc-2675: Edit ongoing show 
-progress being made
 2012-03-13 15:25:30 -04:00
Martin Konecny 3259eb06a0 CC-2675: Edit ongoing show 
-initial commit
 2012-03-13 15:25:30 -04:00
Martin Konecny e93b1cb802 cc-2675: edit ongoing show 
-almost there?
 2012-03-13 15:24:24 -04:00
Daniel 0b82107d28 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-13 14:12:36 -04:00
Daniel 927e5033c8 CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist. 
- Updated detection of ogg or mp3 files
 2012-03-13 14:12:14 -04:00
Naomi Aro dff0265e55 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-13 16:41:19 +01:00
Naomi Aro 7e7820d366 CC-733 : broadcast logs 
adding table scroll height.
 2012-03-13 16:41:06 +01:00
Daniel 48c8607d17 CC-3423: nowPlaying getCurrentPlaylist doesn't work for next song 
-added brackets around other if condition
 2012-03-13 11:34:43 -04:00
Daniel 13e3197ebf CC-3423: nowPlaying getCurrentPlaylist doesn't work for next song 
- added brackets to an statement
 2012-03-13 11:31:24 -04:00