Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,919 Commits 18 Branches 28 Tags 437 MiB
Commit Graph

868 Commits

Author SHA1 Message Date
denise 37190c25c6 CC-3737: ON AIR turns to grey from time to time, while the stream keeps playing 
-reverting previous commit
 2012-05-02 17:02:05 -04:00
denise 0d5b9ebada CC-3734: Library/Timeline: Use horizontal scrollbar when there isnt enough room for column data 
-fixed
 2012-05-02 11:26:39 -04:00
Naomi Aro 08d939d736 CC-3742 : Library: could be confused by carrying over selected state betwee pages 2012-05-02 14:40:27 +02:00
Naomi Aro c5f9288aab Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-02 11:15:20 +02:00
Naomi Aro b5b24ae8f1 CC-3735 : Now Playing: Browser(Firefox) Mem usage goes high when play a show with hundreds of songs more than 3 hours 2012-05-02 11:14:53 +02:00
denise 3c53d5c7e6 CC-3737: ON AIR turns to grey from time to time, while the stream keeps playing 
-fixed
 2012-05-01 10:51:28 -04:00
denise 4477ac02e7 CC-3677: Tooltips improvements 
-done
 2012-04-30 16:20:23 -04:00
Naomi Aro f6ff289506 CC-3677 : Tooltips improvements 2012-04-27 15:53:37 +02:00
Naomi Aro e6b724c45a CC-3729 : Create same UI for timeline to select checkboxes. 2012-04-27 15:44:40 +02:00
Naomi Aro d7dcd03de5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-27 14:42:21 +02:00
Naomi Aro c42aebe5e9 CC-3715 : Library- carry over selected state between pages, be like gmail include select all/none 2012-04-27 14:41:52 +02:00
Naomi Aro b9e13d3b08 CC-3715 : Library- carry over selected state between pages, be like gmail include select all/none 2012-04-27 11:22:44 +02:00
Martin Konecny 88100e79ad CC-3725: Make it so that ON-AIR light never goes off between tracks. 
-fixed
 2012-04-26 15:26:07 -04:00
James c9df8e8b15 CC-3722: Create loading indicator for AJAX call when calculating Show length 
- done
 2012-04-26 11:56:14 -04:00
Martin Konecny a9d125bc4d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-26 10:15:40 -04:00
Martin Konecny 9c9abfab8d CC-3704: No default checked day when creating repeat show 
better validation of user input
 2012-04-26 10:15:30 -04:00
Naomi Aro 2c84420424 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-26 12:15:31 +02:00
Naomi Aro b5863d3d7a CC-3522 : Now Playing Screen-> Periodical message pops up 2012-04-26 12:14:41 +02:00
James b5a65ae7e4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-25 17:22:05 -04:00
James fe71487fa2 CC-3478: Calendar->Show has some inconsistencies on special Days (e.g. 
switching to Daylight Saving Time)

- fixed
 2012-04-25 17:21:25 -04:00
Martin Konecny e12bd35ee2 CC-3671: add show on week/day view doesn't get start time/end time filled in 
-use str formatter for padding
 2012-04-25 16:39:58 -04:00
Martin Konecny 517013ffc3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-25 16:21:15 -04:00
Martin Konecny d04e053814 CC-3704: No default checked day when creating repeat show 
-fixed
 2012-04-25 16:21:03 -04:00
James 5c401cb472 CC-3671: add show on week/day view doesn't get start time/end time filled in 
- fixed
- moved pad function into common.js
 2012-04-25 16:04:36 -04:00
Naomi Aro 7e0e631740 CC-3616 : ShowBuilder-> A tooltip remains in the Showbuilder frame permanently 2012-04-25 15:52:11 +02:00
James 957b750d6a CC-3711: Verify Propel hasn't broken anything with its different handling 
of boolean columns compared to Pear

- fixed
 2012-04-24 16:49:14 -04:00
James 3c4d01aa93 CC-3675: Playlist -> the files from Disconnected Mediafolder can still 
be previewed (played)

- done
 2012-04-24 12:59:07 -04:00
James a41f100545 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-24 11:26:39 -04:00
James 2cb17a3b08 CC-3660: Cannot click Airtime Manual link on override info popup 
- replaced the popup with qtip
 2012-04-24 11:26:22 -04:00
Naomi Aro 8020ae0a29 CC-3688 : Make sure timeline knows to refresh itself when a rebroadcast file has been scheduled 
forgot I commented out the check when fixing something in the past....
 2012-04-24 17:21:59 +02:00
Martin Konecny b9ab11ce28 CC-3702: System -> Status: No difference between a service is failed vs a service is not monitor 
-fixed
 2012-04-23 17:18:34 -04:00
Martin Konecny 4d776772a9 CC-3698: php5-fpm service with airtime pool won't start because of php_admin_value[phar.readonly] = off 
-fixed
 2012-04-22 13:45:38 -04:00
denise 558d2e5d9a CC-3330: Regression in library behavior: left click anywhere in a row should bring up menu, right click anywhere in row should bring up metadata 2012-04-20 13:01:47 -04:00
Martin Konecny 7d6e251adf Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-20 11:31:37 -04:00
Martin Konecny da8a5296b0 CC-3590: Calendar GUI->DJ user should not be able to invoke "Add Show" window 
-add user type into javascript as a variable so we can check permissions on js side
 2012-04-20 11:31:24 -04:00
denise 4fcb4a530f CC-3330: Regression in library behavior: left click anywhere in a row should bring up menu, right click anywhere in row should bring up metadata 
-added README for jquery.contextMenu.js bug fix
 2012-04-20 10:21:14 -04:00
denise 9afdbe2fbc CC-3330: Regression in library behavior: left click anywhere in a row should bring up menu, right click anywhere in row should bring up metadata 
-consider it wrapped
 2012-04-20 10:03:12 -04:00
Naomi Aro e242972a78 Merge branch 'CC-3174' into devel 2012-04-20 13:04:38 +02:00
Naomi Aro 6b4fd7d3bb CC-3686 : Improve differentiation of a record/rebroadcast show in the timeline 2012-04-20 13:03:50 +02:00
denise 636c40eb11 CC-3330: Regression in library behavior: left click anywhere in a row should bring up menu, right click anywhere in row should bring up metadata 
-fixed
 2012-04-19 18:23:30 -04:00
denise 710389a416 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-19 18:21:45 -04:00
James a482a8fe07 CC-3590: Calendar GUI->DJ user should not be able to invoke "Add Show" window 
- done
 2012-04-19 15:55:55 -04:00
James 295eab430a CC-3671: add show on week/day view doesn't get start time/end time filled in 
- fixed in both day and week view
 2012-04-19 15:45:13 -04:00
denise 0f6a72f6f8 CC-3668: Live stream player - volume control needs improved usability 
-fixed centered volume control
 2012-04-19 12:51:36 -04:00
denise 64e8640795 CC-3668: Live stream player - volume control needs improved usability 
-new layout done, mute/un-mute image blurry (need new one)
 2012-04-19 12:34:51 -04:00
denise 1b92f82c1f CC-3668: Live stream player - volume control needs improved usability 
-un-minified jplayer.blue.monday.css
 2012-04-19 10:00:30 -04:00
Martin Konecny c6222849df CC-3429: Firefox does not natively support mp3 file playing so preview does nothing. 
-comment out questionable css modification
 2012-04-18 19:10:14 -04:00
Martin Konecny bd8ce4b0a7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-18 19:02:53 -04:00
Martin Konecny 5bea867bec CC-3429: Firefox does not natively support mp3 file playing so preview does nothing. 
-fixed
 2012-04-18 19:02:29 -04:00
denise de89db7c36 CC-3668: Live stream player - volume control needs improved usability 
-in progress
 2012-04-18 18:24:50 -04:00
denise 3ddabf5cf7 CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source 
-fixed
 2012-04-18 12:30:37 -04:00
denise 479e112317 CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source 
-fixed
 2012-04-18 12:30:37 -04:00
denise a7fb8ea3f2 CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source 
-semi-fixed
 2012-04-18 12:30:37 -04:00
denise ddf1a6d027 CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source 
-fixed
 2012-04-18 12:30:37 -04:00
denise 1c9871a6ed fixed whitespace 2012-04-18 12:30:37 -04:00
denise a58dc95f07 changed "current" label - not perfect 2012-04-18 12:30:37 -04:00
denise fffaac726c CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source 
-semi-fixed
 2012-04-18 12:26:10 -04:00
denise a7ac80e785 CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source 
-fixed
 2012-04-18 12:26:10 -04:00
denise ef22a33258 fixed whitespace 2012-04-18 12:26:10 -04:00
denise 91cc633139 changed "current" label - not perfect 2012-04-18 12:26:10 -04:00
James 90edd9d1b0 CC-3643: System->Streams - Master URL GUI is broken after overriding URL 
setting

- fixed
 2012-04-16 15:10:01 -04:00
Naomi Aro a0fb607d30 Merge branch 'CC-3174' into devel 2012-04-16 16:40:02 +02:00
Naomi Aro c96c60dc5a CC-3620 : Calendar -> Unresponsive script warning when trying to add 300 ogg files 
improving speed of js rendering,
datatables config is loaded from localstorage,
removed aggregate propel behaviour on cc_show_instances time_filled.
 2012-04-16 16:33:32 +02:00
denise c61f74b06f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-13 18:06:16 -04:00
denise 82130560f5 CC-3640: Refresh Datatable after "Importing in Progress" label disappears on the Playlist Builder screen. 
-fixed
 2012-04-13 18:05:31 -04:00
James ffc17ba705 CC-3636: Media Folder: dir path in cc_music_dir should be in consistent format 
- DateHelper.php is moved from model to common folder
- created OsPath.php file which contains normpath()
- normpath() is used instead of realpath()
 2012-04-13 17:45:28 -04:00
denise eff9ca85be CC-3640: Refresh Datatable after "Importing in Progress" label disappears on the Playlist Builder screen. 
-fixed
 2012-04-13 16:52:22 -04:00
Vladimir b0ac86ba43 CC-3416, style changes 2012-04-12 22:33:54 +02:00
denise fe68d0fc87 CC-3498: Calendar -> Show Content better representation of duration needed 
-fixed
 2012-04-12 16:25:01 -04:00
Martin Konecny fbef6aa3c4 -remove reference to deleted meio mask jquery library 2012-04-12 13:11:45 -04:00
James 0ec58f0bc3 CC-3250: UI design for mount monitor for media monitor 
( Manage Media Folder and Playlist Builder screen)

- adding tooltip and fixed a minor bug
 2012-04-11 17:24:26 -04:00
James 7986c8d77a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-11 15:55: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
Vladimir 37250d9508 CC-3250 , new warning icon 2012-04-11 20:43:38 +02:00
Vladimir 29b8e0f682 CC-3424 , CSS and icon changes for the new context menu. Added icons for all actions 
Signed-off-by: Vladimir <vladimir.stefanovic@sourcefabric.org>
 2012-04-11 18:35:47 +02:00
James 32548de639 CC-3486: Text Fields in Stream settings behave in unorthodox way. Highlighting 
entire text and typing does not erase the highlighted text.

- removed all the masking
- meioMask is very outdated so it's removed from the project.
 2012-04-09 16:35:39 -04:00
James a57f8e2554 CC-3488: Update pop up window for jplayer so the size is exactly the same 
size as the player.

- done
 2012-04-09 15:28:38 -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
Martin Konecny d562a26f4b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-07 22:33:47 -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
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
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 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 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 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
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 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 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
Vladimir 206a8f111c CC-3482 and CC-3455 2012-03-30 00:35:49 +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
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
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 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
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
Naomi Aro 03c5daa9e7 CC-3534 : Check Scheduling Edge Cases 2012-03-28 14:26:38 +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 10e4ae781f CC-3451 : Ability to delete the currently playing clip 2012-03-27 12:44:48 +02:00
James 7e92b96a67 CC-3507: Live Stream status: naming 
- fixed css width
 2012-03-26 18:39:10 -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
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
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
Naomi Aro 7a6cdeaf10 CC-3174 : timeline 2012-03-26 12:36:06 +02:00
Naomi Aro 5facac4cd6 CC-3174 : timeline 2012-03-26 12:31:35 +02:00
Naomi Aro 91d44847cb CC-3506 : Timeline: smaller columns for time values 2012-03-26 12:24:16 +02:00
Martin Konecny 0525f182ef CC-3516: Creating a show has a long execution time 
-grey out add-show form while busy
 2012-03-25 22:56:51 -04:00
Naomi Aro ac9fc9f665 CC-3436 : timeline usability 2012-03-23 18:54:03 +01:00
Naomi Aro 2f287274f6 CC-3463 : timeline usability 2012-03-23 18:33:40 +01:00
Naomi Aro 95f97ccc55 CC-3463 : Usability improvements for timeline 2012-03-23 18:27:47 +01:00
Naomi Aro a77ac56621 CC-3463 : timeline usability 
removing auto scrolling to now playing item, bad idea.
 2012-03-23 16:46:08 +01:00
Naomi Aro 711d1f202a CC-3463 : Usability of timeline 
changing buttons to be jquery ui icons.

adding button to trim overbooked
adding button toscroll current item to top.
 2012-03-23 16:42:08 +01:00
Naomi Aro 13bbdc327e CC-3360 : timeline css 
mistyped selector.
 2012-03-23 01:56:56 +01:00
Naomi Aro 8af4f052e0 CC-3360 : timeline css 2012-03-23 01:46:45 +01:00
Naomi Aro f1d76443ab CC-3360 : timeline css 2012-03-23 00:11:49 +01:00
Naomi Aro 7ab0289d12 CC-3360 : timeline css 
changed library search width calculation to be in library.js
 2012-03-22 23:31:18 +01:00
Naomi Aro da02bb7076 CC-3360 : Timeline Css 2012-03-22 19:15:39 +01:00
Naomi Aro 1fdb3cf163 CC-3360 : Timeline Css 
adding Css to timeline.
 2012-03-22 18:04:22 +01:00
Naomi Aro e76cffd8b0 CC-3463 : timeline usability 
moving multiple files within the timeline.
 2012-03-20 17:55:35 +01:00
Naomi Aro ff2907823b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-20 11:14:26 +01:00
Naomi Aro 642270998c CC-3174 : showbuilder 
adding semi colon.
 2012-03-20 11:14:00 +01:00
Daniel 064f7cf591 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-19 16:14:16 -04:00
Daniel acf0eb4eb2 CC-3429: Firefox does not natively support mp3 file playing so preview does nothing. 
- updated the logic in jplayer to include supplied m4v, but hide the video viewer through the size option.
 2012-03-19 16:09:59 -04:00
James e194ff0dc8 CC-3469: Stream settings: Connection URLs are not generated correctly 
- done
 2012-03-19 16:08:23 -04:00
James b7634098d3 CC-3471: Stream setting page looks much worse in Chrome than in Firefox 
- fixed
 2012-03-19 15:02:29 -04: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 970c2fc47a CC-3453 : Playlist 
fixing description
 2012-03-19 14:21:34 +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
Naomi Aro b5f92dfa93 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-19 10:18:52 +01:00
Daniel 7914b30233 CC-3429: Firefox does not natively support mp3 file playing so preview does nothing. 
- after reading about the trick foudn in Mark Panaghiston's posting from this link https://groups.google.com/forum/#!topic/jplayer/gTJrSCjwftw
- the current imperfect solution for firefox sould be to show a video jplayer that can play all the audio types.
 2012-03-16 18:03:35 -04:00
Naomi Aro 8925d44252 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-16 11:26:08 +01:00
Naomi Aro d03e565861 CC-3174 : showbuilder 
adding more length options to library, these ones should still fit without scrolling the page.
 2012-03-16 11:26:03 +01: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 04c2c2f920 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-15 14:29:48 -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
Naomi Aro 6409003b3f CC-3174 : showbuilder 
putting qtip on missing file alert.
 2012-03-15 16:29:52 +01:00
Naomi Aro 7a8398bd32 CC-3174 : showbuilder 
including context menu to delete items from timeline.
 2012-03-15 16:11:29 +01:00
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
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 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 79f8eabe2b CC-3405: Display to users how to connect a live stream to Airtime 
- Done
 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 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
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 eb389d99d2 CC-3434 : Playlist Builder fast deleting 2012-03-14 17:50:48 +01: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 7e7820d366 CC-733 : broadcast logs 
adding table scroll height.
 2012-03-13 16:41:06 +01:00
Naomi Aro a8d61ff19c CC-3328 : Scrolling behaviour in Chrome on OSX makes Airtime unusable 2012-03-13 14:19:25 +01:00
Naomi Aro 6830af574a CC-3174 : showbuilder 
fixing some merge stuff.
 2012-03-13 12:52:41 +01: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
Martin Konecny 926231513e -remove unused function 2012-03-12 12:24:54 -04:00
Daniel 09b5d9003b 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 library.js because I lost my changes during merge
 2012-03-12 11:57:30 -04:00
Daniel c0b0e8079b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-12 11:33:28 -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
Daniel d713f830cd 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. 
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/public/js/airtime/library/library.js
 2012-03-12 10:23:50 -04:00
Daniel 48aeaaf05a 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. 
- merging with devel
 2012-03-12 10:20:58 -04:00
Naomi Aro f28f6659dc CC-3403 : Replace Now Playing with the new Timeline screen 2012-03-12 14:23:03 +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
Daniel 470cf0dbf8 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 jplayer so it now shows a list view under the player which shows details of the track being played, and for playlists the entire playlist list.
- Also enabled playing playlists from the library.
 2012-03-09 18:47:08 -05:00
Naomi Aro 7c63387dd5 CC-733 : broadcast logs 
adding the export table tools.
 2012-03-09 13:39:12 +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
Naomi Aro 53b8eb2724 CC-733 : export broadcast logs 
exporting stats based on czech law
 2012-03-08 18:30:56 +01:00
Naomi Aro 7a5054655e CC-3174 : showbuilder 
change max-height slightly for the library dialog.
 2012-03-08 11:14:09 +01:00
Naomi Aro fe3c340a90 CC-3174 : showbuilder 
making library table only scroll on the table part.
 2012-03-07 18:27:32 +01:00
Naomi Aro e9627bca07 CC-3174 : showbuilder 
only updating the timeline view if it is needed.
 2012-03-07 12:20:30 +01:00
Naomi Aro a4d07b3060 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/public/js/airtime/library/library.js
 2012-03-07 10:33:00 +01:00
Daniel 709e117f41 CC-3391: Audio Preview cannot play tracks with commas in their filename 
- The content distribution header filename attribute, wasn't properly quoted for inline content. This causes a bug for files with comma names.
- changed the play button in library back to the speaker icon
- removed some dead code preview_player.js
- removed the file name attribute, will need better approch to presenting the user with audio information.
 2012-03-06 13:50:07 -05:00
Naomi Aro 157078b963 Merge branch 'CC-3174' into devel 
Conflicts:
	airtime_mvc/public/js/airtime/library/library.js
 2012-03-06 13:51:37 +01:00
Naomi Aro 64fe303b20 CC-3174 : showbuilder 
fixing indentation.
 2012-03-06 13:35:21 +01:00
Naomi Aro 6c5f710329 CC-3174 : showbuilder 
making each separate widget scrollable (playlist, library, timeline)
 2012-03-06 13:19:20 +01:00
Daniel a09b63b8d0 CC-2430: Preview tracks in the library + better preview (ability to jump around in clip) 
- removed javascript from php files
- removed preview.js
- fixed small problems with editor
 2012-03-05 19:00:14 -05:00
Daniel a246f85a5b CC-2430: Preview tracks in the library + better preview (ability to jump around in clip) 
- Merged with devel, removed js from StoredFile.php
 2012-03-05 19:00:14 -05:00
Daniel 51f004933b CC-2430: Preview tracks in the library + better preview (ability to jump around in clip) 
- updated icon in library
 2012-03-05 19:00:14 -05:00
Daniel aacbac4757 CC-2430: Preview tracks in the library + better preview (ability to jump around in clip) 
- Updated functionality so user can play a track and in jplayer and jump around it.
 2012-03-05 19:00:14 -05:00
Daniel 7d95e4ffa7 CC-2430 : Preview tracks in the library + better preview (ability to jump around in clip) 
- added accept ranges header to the response to enable seek ahead in the music file.
 2012-03-05 19:00:14 -05:00
Daniel b8452928da CC-2430: Preview tracks in the library + better preview (ability to jump around in clip) 
- updated player ui so it matches demo code
- can play any song from the library or playlist builder, but not very usable
 2012-03-05 19:00:14 -05:00
Daniel 1aab682104 CC-2430: Preview tracks in the library + better preview (ability to jump around in clip) 
- updates to audio preview on library and playlist
 2012-03-05 19:00:14 -05:00
Daniel 0b9ed43e50 Updated library functionality and started with playlist work. 2012-03-05 19:00:14 -05:00
Daniel dd3b7afff2 Updated library so I can play a song. 2012-03-05 19:00:14 -05:00
Daniel 6ff24bd1fd Updated Library logic so I can play a song in the library. 
Still need to be able to get the song file from the element and
update the playlist builder so its player respects cuein/cueout and fadein/fadeout
 2012-03-05 19:00:14 -05:00
Martin Konecny 463fc1ff08 CC-3382: Include jPlayer sources in release tarball for GPL compliance 
-Done
 2012-03-05 16:17:00 -05:00
Naomi Aro a832a40c75 CC-3174 : showbuilder 
making the library a separate scrollable from playlist
 2012-03-05 18:14:10 +01:00
Naomi Aro b8ca0ef740 CC-3174 : showbuidler 
fixing width of search input so it will work on smaller screens.
 2012-03-05 15:39:18 +01:00
Naomi Aro 62c07107c1 CC-3174 : showbuilder 
dialog improvements, can scroll library, builder independently.
 2012-03-05 14:43:34 +01:00
Naomi Aro 59b7f4ab56 CC-3174 : showbuilder 
adding timeout for the now playing song, as well as polling every 20 seconds.
 2012-03-02 18:16:44 +01:00
Naomi Aro f4fac98221 CC-3174 : showbuilder 
adding back polling.
 2012-03-02 17:25:44 +01:00
Naomi Aro 29b03c1181 CC-3174 : showbuilder 
creating smart refresh timeout for now playing.
 2012-03-02 16:27:14 +01:00
Naomi Aro 98d50ae4a7 CC-3174 : showbuilder 
different width added for dialog builder.
 2012-03-02 15:47:50 +01:00
Naomi Aro 3ab375a23c CC-3174 : showbuilder 
chaning text on edit button.
 2012-03-02 15:29:19 +01:00
Naomi Aro b358c90cfb CC-3174 : showbuilder 
making the library toggle in when pressing the edit button
 2012-03-02 15:28:04 +01:00
Naomi Aro 9e1b3e7e6e CC-3174 : showbuilder 
edge checking on empty datatables.
 2012-03-02 14:16:11 +01:00
Naomi Aro f61afb0216 CC-3373 : Timeline: only lock the currently playing track and the one after 2012-03-02 14:01:02 +01:00
Naomi Aro b68204751e CC-3174 : showbuilder 
making sure recorded shows aren't editable.
 2012-03-01 17:49:11 +01:00
Naomi Aro 1c43edb40b CC-3174 : showbuilder 2012-03-01 17:05:50 +01:00
Naomi Aro 3bfbe036c7 CC-3174 : showbuilder 
using the new status column in cc_schedule to colour boundary/overbooked tracks.
 2012-03-01 15:09:13 +01:00
Naomi Aro 99b490129c CC-3174 : showbuilder 
making a dialog on the calendar page.
 2012-03-01 00:19:59 +01:00
Naomi Aro a8f53d169b CC-3174 : showbuilder 
sizing bit rate/sample rate in library, text right aligned.
 2012-02-29 17:47:26 +01:00
Naomi Aro 7c74023ef0 CC-3174 : showbuilder 
removing ugly dsahed border, keeping height for the library dragging helper.
 2012-02-29 16:09:39 +01:00
Naomi Aro bc1d519408 CC-3174 : showbuilder 
showing message if some files could not be deleted since they were scheduled.
 2012-02-29 16:02:41 +01:00
Naomi Aro 0f91f91c41 CC-3174 : showbuilder 
adding checks to enable/disable buttons for playlist & timeline.
 2012-02-29 15:47:11 +01:00
Naomi Aro 5257711866 CC-3174 : showbuilder 
fixing order of scheduled/playlist data when added via group dragging.
 2012-02-28 23:52:20 +01:00
Naomi Aro 4386690b54 CC-3174 : showbuilder 
prevents scheduling outside a show.
 2012-02-28 20:58:06 +01:00
Naomi Aro b5f510de85 CC-3174 : showbuilder 
making sure an item is not added outside of a show.
 2012-02-28 16:57:53 +01:00
Naomi Aro 9b639a9b6d CC-3356 : Library & Timeline : remove zero prefixes from numbers 2012-02-28 15:38:57 +01:00
Naomi Aro 997782c73c CC-3354 : playlist drag and drop 
improving apperance of playlist drag and drop.
 2012-02-28 13:13:40 +01:00
Naomi Aro 5972aba46e CC-3174 : showbuilder 
changing playlist placeholder to be a li item thanks
to a hack on stack overflow.
 2012-02-27 23:58:08 +01:00
Naomi Aro 43d67c921d CC-3174 : showbuilder 
adding cue/fade columns to table

fixing schedule fade out
putting default fade between files not in a playlist.
 2012-02-27 21:29:02 +01:00
Naomi Aro 564575d657 CC-3174 : showbuilder 
fixing timezone calculations if browser/server is different.
 2012-02-27 20:14:12 +01:00