Commit Graph

1520 Commits

Author SHA1 Message Date
Martin Konecny 5bc1fe84ad Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-09 12:43:46 -04:00
Martin Konecny 54ec6445c6 CC-3606: System->Media Folders-> system seems to search
-fixed. Need to check if directory actually exists.
2012-04-09 12:43:40 -04:00
James b32e463350 CC-3590: Calendar GUI->DJ user should not be able to invoke "Add Show" window
- fixed
2012-04-09 12:19:22 -04:00
James 6785a373a1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-09 10:50:51 -04:00
James d035681f35 CC-3596: Playlist->Library->Edit Metadata: Throw exception after
inputing string in "BPM"

- added validator on the form
2012-04-09 10:50:32 -04:00
James 064490a2fd CC-3603: Calendar->Once you update the rebroadcasted show it disappears
- temp commit
2012-04-09 10:37:44 -04:00
Martin Konecny d562a26f4b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-07 22:33:47 -04:00
Martin Konecny 548c4ffb8d -change it so that user can access API actions if logged in. 2012-04-07 22:28:10 -04:00
James 332c1d91b5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/public/js/airtime/schedule/add-show.js
2012-04-05 16:03:15 -04: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
Martin Konecny ef6c496ba3 CC-3541: Missing show title from "Show Content" pop-up
-fixed
2012-04-05 15:49:58 -04:00
Martin Konecny 176e5fdbd7 CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
-in progress
2012-04-05 15:30:21 -04:00
Martin Konecny 8050a1ce29 CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
-in progress
2012-04-05 14:45:16 -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
Naomi Aro cf2813a545 CC-3597 : Playlist->Library->Edit Metadata: Throw exception after click "Cancel" at "Edit Metadata" page 2012-04-05 10:56:06 +02:00
Naomi Aro 35d2ded26b CC-3597 : Playlist->Library->Edit Metadata: Throw exception after click "Cancel" at "Edit Metadata" page 2012-04-05 10:47:35 +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 ab7da1ce90 CC-3581: Calendar->It should not be possible to change the duration for
the recorded show

- "When" section is disabled when editting rebroadcasting show
2012-04-04 15:44:52 -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 3be1944fa4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-03 18:29:44 -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
James e5843dc54e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-03 18:09:39 -04:00
James ebbaa02210 CC-3514: Playlist-> Metadata list of fields is not matching to that of
Playlist->Edit Metadata

- fixed
2012-04-03 18:09:03 -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 bcdd27863f CC-3513: Playlist Builder->Download makes user be redirected to a blank page
- fixed
2012-04-03 16:30:54 -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
James eb8bdabe91 CC-3482: Live Stream: UI Design for Source Stream panel on dashboard
- fixing user info display
2012-04-03 14:15:15 -04:00
James 012ecc4698 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-03 13:53:24 -04:00
James 44e3217f3a CC-3482: Live Stream: UI Design for Source Stream panel on dashboard
- fixed order of css insertion.
2012-04-03 13:53:08 -04:00
Naomi Aro 057ca55074 CC-3589 : Send cancel recording message to pypo 2012-04-03 18:43:13 +02:00
Naomi Aro 1da134f967 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-03 18:26:13 +02:00
Naomi Aro 711105aade CC-3588 : Cancelling Empty Show gives "Invalid Request" 2012-04-03 18:26:04 +02:00
James a49a3a1d2e CC-3482: Live Stream: UI Design for Source Stream panel on dashboard
- master panel UI integration
2012-04-03 11:58:48 -04:00
Naomi Aro d2d45dcae6 CC-3587 : index problem in scheduling. 2012-04-03 17:56:50 +02:00
Naomi Aro f2a05adf49 CC-3481 : Calendar->AddRemoveShow->Content management dialog can't be moved 2012-04-03 16:23:37 +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 db1287d6ec CC-3508 : Double Scrollbar in Show Builder menu 2012-04-03 15:19:38 +02:00
Naomi Aro 6c5eb384a5 CC-3508 : Double Scrollbar in Show Builder menu 2012-04-03 14:58:10 +02:00
Naomi Aro cf4704ad89 CC-3174 : timeline 2012-04-03 12:30:53 +02:00
Naomi Aro 0c2066a90e CC-3550 : Playlist Library -> Ctrl or Shift selection is not possible 2012-04-03 12:12:50 +02:00
Naomi Aro 09bebaa68b CC-3550 : Playlist Library -> Ctrl or Shift selection is not possible 2012-04-03 12:07:51 +02:00
Naomi Aro 2f712535ad CC-3550 : Playlist Library -> Ctrl or Shift selection is not possible 2012-04-03 11:57: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
Naomi Aro d27470da99 Merge branch 'CC-3174' into devel 2012-04-03 10:58:39 +02:00
Vladimir 416b9d1dc2 CC-3482 2012-04-02 17:28:05 -04:00
Martin Konecny 1519ada85c CC-3567: Don't require API key for API controller when APPLICATION_ENV = "development"
-fix problem when constant isn't defined
2012-04-02 17:28:05 -04:00
Martin Konecny 709f38e4ed CC-3567: Don't require API key for API controller when APPLICATION_ENV = "development"
-fixed
2012-04-02 17:28:05 -04: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 6c25423f4e CC-3545 : Calendar->AddRemove (Now Playing Tab->Add Files to Show) -> changing order of tracks is not correct
removing table tools.
replacing with something simpler that will preserve order on screen.
2012-04-02 19:03:11 +02: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 9f0741a684 CC-3174 : timeline
don't highlight empty timeline.
2012-04-02 11:07:28 +02:00
Naomi Aro ebf530a97c CC-3558 : Playlist->EditMetadata->Save Changes -> 404 page not found page appears 2012-04-02 11:02:03 +02:00
James 2395415292 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-30 15:11:54 -04:00
James 286c240012 CC-3444: Ability to edit currently playing show (end time and permissions)
- done
2012-03-30 15:11:24 -04:00
Naomi Aro b5a8db6720 CC-3174 : timeline 2012-03-30 18:15:27 +02:00
Naomi Aro fcbf547456 CC-3174 : timeline 2012-03-30 18:03:45 +02:00
Naomi Aro cfb5fbc0c9 CC-3518 : Airtime requires internet access to run 2012-03-30 17:37:21 +02:00
Naomi Aro 6dc9193682 CC-3553 : Now Playing screen-> Tooltip change for "jump to current item" button 2012-03-30 17:26:20 +02:00
Naomi Aro 5242ac45a9 CC-3496 : PlaylistBuilder, NowPlaying -> GUI representation gets broken while being resized 2012-03-30 17:13:17 +02:00
Naomi Aro 2ab6ea98a6 CC-3496 : PlaylistBuilder, NowPlaying -> GUI representation gets broken while being resized 2012-03-30 16:33:43 +02:00
Naomi Aro 6ddc8288be CC-3496 : PlaylistBuilder, NowPlaying -> GUI representation gets broken while being resized 2012-03-30 16:04:00 +02:00
Naomi Aro bb1f94c796 CC-3496 : PlaylistBuilder, NowPlaying -> GUI representation gets broken while being resized
fixing now playing screen.
2012-03-30 15:33:52 +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
Vladimir 206a8f111c CC-3482 and CC-3455 2012-03-30 00:35:49 +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 f48c5ff575 CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog. 2012-03-29 15:34:58 +02:00
Naomi Aro 1b8a967cc0 CC-3174 : timeline
register js getting in way of toggling.
2012-03-29 11:32:27 +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
Martin Konecny 8cb5ccbe41 CC-3516: Creating a show has a long execution time
-cool effect now works under firefox
2012-03-28 23:52:17 -04:00
Martin Konecny bc629bf441 CC-3537: When you try to navigate away while uploading you get a "false" message
-fixed
2012-03-28 23:27:31 -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
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 b935c82b83 CC-3519: System-> Stream> Problem with Master DJ Port and DJ Port settings
- fixed
2012-03-27 17:14:34 -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