Commit Graph

228 Commits

Author SHA1 Message Date
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 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 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
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 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 2f287274f6 CC-3463 : timeline usability 2012-03-23 18:33:40 +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 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 e76cffd8b0 CC-3463 : timeline usability
moving multiple files within the timeline.
2012-03-20 17:55:35 +01:00
Naomi Aro 642270998c CC-3174 : showbuilder
adding semi colon.
2012-03-20 11:14:00 +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 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
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 3019cb9c42 CC-3434 : playlist
changing image to be smaller.
2012-03-15 11:37:20 +01:00
Naomi Aro 68a4443c36 CC-3174 : showbuilder
changing get to post.
2012-03-14 20:10:10 +01:00
Naomi Aro eb389d99d2 CC-3434 : Playlist Builder fast deleting 2012-03-14 17:50:48 +01: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 6830af574a CC-3174 : showbuilder
fixing some merge stuff.
2012-03-13 12:52:41 +01: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
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 fe3c340a90 CC-3174 : showbuilder
making library table only scroll on the table part.
2012-03-07 18:27:32 +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
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 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
Naomi Aro a832a40c75 CC-3174 : showbuilder
making the library a separate scrollable from playlist
2012-03-05 18:14:10 +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 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 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 564575d657 CC-3174 : showbuilder
fixing timezone calculations if browser/server is different.
2012-02-27 20:14:12 +01:00
Naomi Aro 28759a2d34 CC-3354 : timeline drag and drop
changing helper to say just the number of items being moved like gtalk.
2012-02-27 16:01:05 +01:00
Naomi Aro 66ff3c61c3 CC-3330 : library behaviour. 2012-02-24 21:21:53 +01:00
Naomi Aro 1864447d7e CC-3355 : Timeline/Library: Select all in the library, drag to empty show --> nothing is added 2012-02-24 19:58:06 +01:00
Naomi Aro 19d13889af CC-3351 : Track length should only show to tenths of a second in the library
created a length formatter to use in multiple places.
2012-02-24 15:07:04 +01:00
Naomi Aro 28bb97acfa CC-3174 : showbuilder
allow user to filter library by

files/playlists or all.
2012-02-24 00:55:20 +01:00
Naomi Aro 753c05ce5b CC-3335 : Timeline: Drag and drop usability improvements
cursor must be used to add tracks to timeline, not check boxes.
2012-02-23 17:46:07 +01:00
Naomi Aro b357b80054 CC-3174 : showbuilder
created controller Usersettings, noticed hosts couldn't
save datatables setting through pref controller.

starting to use new cursor arrows.
2012-02-23 12:13:00 +01:00
Naomi Aro c89451f880 CC-3340 : Remove "Search" tab from library view 2012-02-22 21:56:55 +01:00
Naomi Aro d4c7b832c9 CC-3174 : showbuilder
fixing up library table to include all interesting columns if a user would like to choose to see them.
query is done with propel.
2012-02-22 18:38:33 +01:00
Naomi Aro 0ba3049528 CC-3174 : showbuilder
removing old scheduling method code to avoid confusion.
2012-02-22 13:19:49 +01:00
Naomi Aro 5703508beb CC-3174 : showbuilder
col reorder resize isn't new enough to work with the new save/load callbacks.
switched to just the col reorder plugin written by Allan( datatables author)
2012-02-22 11:43:37 +01:00
Naomi Aro 5f89975c64 CC-3174 : showbuilder
datatables state restore needs real booleans not strings.
2012-02-22 00:02:35 +01:00
Naomi Aro 9b5a0fc565 CC-3174 : showbuilder
working on trying to save/load state serialized into the db for datatables.
2012-02-21 17:31:54 +01:00
Naomi Aro 378d3d3ef4 CC-3174 : showbuilder
group drag and drop for playlist.
2012-02-20 20:44:35 +01:00
Naomi Aro c0f16fac3c CC-3174 : showbuilder
improving playlist functionality/error checking like the showbuilder.
will send last modified ts to make sure user has a current copy of the open playlist.
2012-02-20 18:24:04 +01:00
Naomi Aro 17c3cdcfb2 CC-3174 : showbuilder
fix ordering problem with track column.
2012-02-20 11:41:44 +01:00
Naomi Aro 44dccf15ce CC-3335 : Timeline - Drag and drop usability improvements
dragging and dropping multiple files is working.
2012-02-17 15:53:10 +01:00
Naomi Aro ac11d8bcf6 Merge branch 'CC-3174' into devel
Conflicts:
	airtime_mvc/application/models/StoredFile.php
2012-02-17 11:50:49 +01:00
Naomi Aro b2d0565ec4 CC-3174 : showbuilder
checking to make sure UI is up to date with db
2012-02-16 19:46:14 +01:00
Naomi Aro e1d5d6de73 CC-3174 : showbuilder
checking modification time before deleting items.
Throws a ScheduleOutdatedException
2012-02-16 16:29:11 +01:00
Daniel 190490d6f4 CC-3329: Library: Add "track number" to the list of available columns to show (was in 1.9, disappeared in 2.0)
- updated the view columns to include track_number from db as track
- updated sql query to include track_number from db
2012-02-15 11:21:21 -05:00
Naomi Aro b7b1c401f6 CC-3174 : showbuilder
fixing classes on show footer, selector for the select all.
only adding a checkbox on a row if a user is allowed to schedule there.
2012-02-14 13:33:25 +01:00
Naomi Aro 668e214371 CC-3174 : showbuilder
unsetting playlist id in the session properly.
2012-02-07 18:42:34 +01:00
Naomi Aro 251f3a3e5b CC-3174 : showbuilder
testing newly returned times, fixing the secondsToPlaylistTime method
to not drop subsecond precision for the calculations.
2012-02-07 14:58:16 +01:00
Naomi Aro d9947b622a CC-3174 : showbuilder
fixing times in CcPlaylistContents
2012-02-06 18:46:53 +01:00
Naomi Aro 776d1b65e8 CC-3174 : showbuilder
fixing merge, testing that affected functionality still works.
2012-02-06 11:23:10 +01:00
Naomi Aro 42452b8ea9 Merge branch 'CC-3174' into devel
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/PlaylistController.php
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Playlist.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/public/js/airtime/library/spl.js
2012-02-06 11:07:10 +01:00
Naomi Aro 8212624c4a CC-3174 : showbuilder
fixed moving an item to an earlier position in a show,
timeline needs a width or connected list doesn't work.
place holder still has problems with floats.
2012-02-06 01:51:22 +01:00
Naomi Aro 16863ee95e CC-3174 : showbuilder/library
playlist fades are working again, still need more error checking to be done.
2012-02-05 23:38:12 +01:00
Naomi Aro fbec92cb0d CC-3174 : showbuilder/library
soundcloud icon stuff is back.
2012-02-05 19:48:23 +01:00
Naomi Aro 072e13a943 CC-3174 : showbuilder
add/delete buttons functions
still not displaying enable/disable when needed.
2012-02-05 19:11:48 +01:00
Naomi Aro 226a3ffbea CC-3174 : showbuilder/lib refact
add button now functional for playlist,
still need to enable/disable when appropriate.
2012-02-05 18:46:52 +01:00
Naomi Aro 6c2475bf1f CC-3174 : showbuilder
mostly done with new context menu, need to finish
add/delete button actions on lib table for both screens.
2012-02-05 18:19:22 +01:00
Naomi Aro da5e1ac302 CC-3174 : showbuilder/library
adding new context menu, link to view on soundcloud doesn't seem to work.
2012-02-05 13:56:07 +01:00
Naomi Aro e8f2506474 CC-3174 : showbuilder
changing playlist table to remove unused columns, adding foreign key to user, adding aggregate length column.
2012-02-04 21:26:21 +01:00
Naomi Aro 38f3d6bfb0 CC-3174: showbuilder/library refactoring
adding new context menu files, playlist is working except for editing fades.
2012-02-04 19:27:26 +01:00
Naomi Aro 46fdf56b70 CC-3174 : showbuilder
refactoring playlist to work with group add/delete by resource id and using transactions.
2012-02-04 15:52:31 +01:00
Naomi Aro bdc9707052 CC-2970 : playlist drop indicator
looking into customizing the placeholder, connected library to playlist sortable.
2012-02-04 02:07:32 +01:00
Naomi Aro 19f069b602 CC-3174 : showbuilder
can add items to a playlist with the refactoring.
2012-02-04 00:12:06 +01:00
Naomi Aro 0afa904ffe CC-3174 : showbuilder
refactoring playlists for the group add/delete
2012-02-03 18:15:10 +01:00
Naomi Aro 3b172f9c0c CC-3174 : showbuilder
reset button is working.
2012-02-03 00:56:14 +01:00
Naomi Aro 7f9b497816 CC-3174 : showbuilder
removing unecessary things from the events.
2012-02-02 23:31:32 +01:00
Naomi Aro 6da4397a96 CC-3174 : show builder
can add playlists to the time line
upgraded datatables to 1.9
upgraded qtip2 to a newer version
put qtips on type column on lib table.
2012-02-02 23:15:39 +01:00
Daniel Franklin 7317b1d5af CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences 2012-02-02 15:59:35 -05:00