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

721 Commits

Author SHA1 Message Date
James f522c7a7af Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 16:17:36 -04:00
James 53e37ee826 CC-3634: Media Folder: if file was deleted from file system, and the file was 
scheduled in the future, it wasn't getting deleted from AIrtime

- fixed
 2012-04-12 16:17:19 -04:00
Martin Konecny c2db20f004 CC-3548: Schedule: Separate repeate show template and single instance on 'When' section 
-cleanup
 2012-04-12 15:10:40 -04:00
Martin Konecny bfed474b7b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 13:41:18 -04:00
denise a2fedaa3f1 CC-3621: Calendar -> show contents (for a 24 hours show): It display "0:00:00" as total time of 24 hours show 
-fixed
 2012-04-12 13:36:45 -04:00
Martin Konecny 83d78eb0dd -check if exec function is available before using it 2012-04-12 13:36:36 -04:00
Martin Konecny 380094b4cc Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 13:29:58 -04:00
Martin Konecny 04718a88ae CC-3548: Schedule: Separate repeate show template and single instance on 'When' section 
-done
 2012-04-12 13:29:49 -04:00
James 4ef18fb00f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 12:22:36 -04:00
James c90a8006cc CC-3622: When changing location of the stor directory, the "organize" 
ubfolder is not being created.

- I confirmed that Airtime was creating organize folder upon chaning stor dir
but, still added a code which make sure it create organize folder if it's
missing somehow.
 2012-04-12 12:22:20 -04:00
Naomi Aro 0486d33e27 Merge branch 'CC-3174' into devel 2012-04-12 18:12:01 +02:00
Naomi Aro adddd1085c CC-3592 : Calendar-> Recorded Shows do not get Rebroadcasted at the moment 
added a flag whether to check user permissions or not.
 2012-04-12 18:00:38 +02:00
Martin Konecny 8303eb728e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 11:54:58 -04:00
Martin Konecny 5a8df0321e CC-3548: Schedule: Separate repeate show template and single instance on 'When' section 
-in progress
 2012-04-12 11:54:51 -04:00
denise d06b3573e9 CC-3623: Need to send show name to Liquidsoap. (Currently sending name as "TODO") 
-fixed
 2012-04-11 19:22:47 -04:00
Martin Konecny bdd3444acf CC-3548: Schedule: Separate repeate show template and single instance on 'When' section 
-in progress
 2012-04-11 16:45:03 -04:00
James f0be7cc995 - comments and removing logging 2012-04-11 16:06:10 -04:00
James 8f197115ae CC-3618: Current playing Text Field in Dashboard alternates between "Nothing 
Scheduled" and "current playing song"

- fixed
 2012-04-11 15:54:03 -04:00
James 13502b4c08 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-11 12:27:54 -04:00
James f82aef2a85 CC-3566: Preferences->"Fade In" is not respected when Show starts 
- millisecond value of fade was sent wrong from php side.
- crossfade() call was removed and it was causing fade in/out not working.
 2012-04-11 12:27:41 -04:00
Martin Konecny a09a31bc88 CC-3610: Now Playing ->songs in the Now Playing do not reflect the changes affected changed END_OF_SHOW 
-pypo side fixed
 2012-04-10 23:13:52 -04:00
Naomi Aro 428d04d77f CC-3605 : Create 2.1 upgrades 2012-04-10 18:07:39 +02:00
Naomi Aro b998a04c2e Merge branch 'devel' into CC-3174 2012-04-10 15:57:13 +02:00
Naomi Aro 1dcced18ac CC-3605 : Create 2.1 upgrades 2012-04-10 14:45:48 +02:00
James 954fa2bceb CC-3444: Ability to edit currently playing show (end time and permissions) 
- handling in better way. we created separate action for this.
 2012-04-05 16:01:27 -04:00
Naomi Aro 35a89e0308 CC-3174 : timeline 2012-04-05 15:52:16 +02:00
Naomi Aro 0b3809c379 CC-3110 : Password reset 
added sender email to preferences form, created db upgrade script.
 2012-04-05 14:18:42 +02:00
James cde8e07c0b CC-3581: Calendar->It should not be possible to change the duration for 
the recorded show

- fixed
 2012-04-04 16:26:28 -04:00
James 5da7d42290 CC-3548: Schedule: Separate repeate show template and single instance on 
'When' section

- UI portion of the feature
 2012-04-04 14:53:26 -04:00
Martin Konecny 366ea78fce CC-3532: Now Playing GUI-> Progress bar is still playing after end of show 
-fixed
 2012-04-03 18:29:36 -04:00
Martin Konecny edcce7432d CC-3409: System status page times out if monit is not running. 
-Fixed
 2012-04-03 17:38:59 -04:00
James 4cb64b0eb1 CC-3569: Update total track metric to only report tracks that exist 
- fixed
 2012-04-03 15:53:55 -04:00
Naomi Aro 057ca55074 CC-3589 : Send cancel recording message to pypo 2012-04-03 18:43:13 +02:00
Naomi Aro 711105aade CC-3588 : Cancelling Empty Show gives "Invalid Request" 2012-04-03 18:26:04 +02:00
Naomi Aro d2d45dcae6 CC-3587 : index problem in scheduling. 2012-04-03 17:56:50 +02:00
Naomi Aro 079862d2f2 CC-3505 : Timeline: Remove repeating date if "end date" is the same as the "Start date" 2012-04-03 16:11:53 +02:00
Naomi Aro 5dfaa00c25 CC-3542 : When you delete the current show it takes all songs from that show out of the playout history 2012-04-03 11:15:22 +02:00
Martin Konecny 2e88801dad CC-3562: NOWPlaying->Overbooked Show1 introduces problems to itself and to the next 
-fixed
 2012-04-02 17:28:05 -04:00
Naomi Aro c5b761bff3 CC-3542 : When you delete the current show it takes all songs from that show out of the playout history 2012-04-02 15:31:02 +02:00
Naomi Aro eeb7273909 CC-3542 : When you delete the current show it takes all songs from that show out of the playout history 2012-04-02 15:20:13 +02:00
Naomi Aro b39db57d0c CC-3501 : Calendar->Show->Add media files from Library better usability may be proposed 2012-03-30 14:45:30 +02:00
Naomi Aro 9e9ae11725 CC-3551 : Change Cue Out for currently deleted track 2012-03-30 12:24:55 +02:00
James 5b65b56b93 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-29 16:57:49 -04:00
James 7325d51ada CC-3449: Live Stream: Kick out live dj at the end of the show 
- fixed so airtime sends series of kick_out events according to
cached_ahead value in cfg file.
 2012-03-29 16:57:28 -04:00
Naomi Aro cea37774ca CC-3551 : Change Cue Out for currently deleted track 2012-03-29 19:20:02 +02:00
Naomi Aro 5a24331ef6 CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog. 2012-03-29 17:37:18 +02:00
Naomi Aro 12b23443db CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog. 2012-03-29 16:27:08 +02:00
Naomi Aro 0746115d2c CC-3504 : Adding a clip when nothing is playing should schedule the clip at the current time 2012-03-29 11:06:57 +02: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 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
Naomi Aro 9c52b2ee1f CC-3174 : showbuilder 
fixing jplayer preview
 2012-03-27 16:27:43 +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 3f713ca8dc CC-3426: apache log errors from plupload 
-fixed
 2012-03-26 19:00:40 -04:00
Martin Konecny d7af91f306 CC-3520: Change default password of monit 
-done
 2012-03-26 17:59:44 -04:00
Martin Konecny 1a4e6c563b cc-3476: dynamic timeout 2012-03-26 14:33:33 -04:00
Martin Konecny c301cd5256 cc-3476: dynamic timeout 2012-03-26 14:33:33 -04:00
Naomi Aro 275faa1881 CC-3504 : Adding a clip when nothing is playing should schedule the clip at the current time 2012-03-26 19:08:52 +02:00
James 1ccf63ab0b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-22 16:24:38 -04:00
James f8d3a8c8bb CC-3449: Live Stream: Kick out live dj at the end of the show 
- PHP side implementation
 2012-03-22 16:23:59 -04:00
Naomi Aro 1fdb3cf163 CC-3360 : Timeline Css 
adding Css to timeline.
 2012-03-22 18:04:22 +01:00
James 6b768c2f99 CC-3483: Live Stream: default fade in/out for live stream transition 
- done. changing fade value doesn't require LS to restart
 2012-03-20 22:16:17 -04:00
James d4142f8b8b CC-3484: Pypo: On bootup, it should grab station name and stream 
label for liquidsoap

- fixed
- created new function set_bootstrap_variables()
 2012-03-20 16:41:15 -04:00
Naomi Aro e76cffd8b0 CC-3463 : timeline usability 
moving multiple files within the timeline.
 2012-03-20 17:55:35 +01:00
Naomi Aro 8105c6571c CC-3355 : Timeline/Library: Select all in the library, drag to empty show --> nothing is added 
if something is added after a footer, it will be added to the end of whatever is before the footer.
 2012-03-19 14:48:11 +01:00
Naomi Aro 9509c70595 CC-3453 : Playlist 
reworking inital playlist events to all use the new "on" delegation in jQuery.
fixing some out of date errors.
 2012-03-19 14:09:05 +01:00
Martin Konecny 22cc362f1c CC-3448: Cancel show shouldn't send "cancel show" msg to pypo anymore 
-done
 2012-03-17 23:51:58 -04:00
Martin Konecny 9be6f1bd0e CC-3464: Playout forward cache should be configurable 
-Done
 2012-03-17 14:53:15 -04:00
Daniel 77e1c1c0cb CC-3466: Select statement for Now Playing has 'AND' in statement when no shows scheduled. 
-added check to make the code do nothing when a previous, current and next show id aren't specified.
 2012-03-16 17:13:32 -04:00
Daniel 8a34023336 CC-3465: Now playing should show tracks over shows for previous and next 
- added logic to include previous and next show in schedule query so the now playing bar will show the tracks from the show instead of the show itself.
 2012-03-16 14:02:53 -04:00
Daniel 5b953443c6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/public/js/airtime/showbuilder/builder.js
 2012-03-15 18:12:15 -04:00
Daniel ae0d3c560c CC-3394: Add play button to timeline table. 
- added image information to row in ShowBuilder.php to enable audio preview of shows.
- moved around code so the audio preview functionaly is standalone
- fixed the firefox bug for issue CC-3429
 2012-03-15 17:56:51 -04:00
james 4595da9087 CC-3452: Live Stream: DJs assigned to the show and Program Managers should 
be able to control switches and able to kick out connection

- kickout buttons and switch buttons are now visible to everyone.
- clicking buttons without correct permission will return proper error msg.
 2012-03-15 14:29:31 -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 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 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
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 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
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
Daniel 1e4d34447a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/models/Schedule.php
 2012-03-13 10:23:44 -04:00
Daniel cbaeda1d6b CC-3404: Change "Now Playing" dashboard SQL query to take advantage of the "playout_status" field in the schedule table 
- Updated the logic in GetPlayOrderRange now I get the previous, current and next shows and tracks to be played.
- This information is then sent back to the caller.
	- if the previous track is null the previous show is sent back as an example of the algorithm.
 2012-03-13 10:21:01 -04:00
Martin Konecny 6f270bfb3d Merge branch '2.0.x' into devel 
Conflicts:
	VERSION
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/Show.php
	airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
	install_minimal/include/airtime-constants.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypocli.py
	python_apps/pypo/pypofetch.py
 2012-03-12 17:52:17 -04:00
Naomi Aro 3145c24ba2 CC-3174 : showbuilder 
changing queries for datatables to use the Datatables model class.
 2012-03-12 15:32:24 +01:00
Naomi Aro 41a46b3144 CC-3174 : showbuilder 2012-03-12 15:02:34 +01:00
Naomi Aro 3b32a16813 CC-3174 : showbuilder 
setting a timeout to refresh when the first item on the timeline starts incse there is no "current" item.
 2012-03-12 13:25:03 +01:00
Naomi Aro 20db8d6fdf CC-733 : broadcast logs 
adding time range selection for the log history.
 2012-03-12 11:47:25 +01:00
Naomi Aro c66b55ec17 CC-733 : playout history 
translating mDataProp values to be able to search table on backend
 2012-03-09 11:13:32 +01:00