Commit Graph

437 Commits

Author SHA1 Message Date
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 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
Daniel 9e850838ca CC-3404: Change "Now Playing" dashboard SQL query to take advantage of the "playout_status" field in the schedule table
- Updated ApiController to use Schedule's GetPlayOrderRange which has better performance.
2012-03-13 10:36:11 -04:00
Naomi Aro 6830af574a CC-3174 : showbuilder
fixing some merge stuff.
2012-03-13 12:52:41 +01: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
Naomi Aro f28f6659dc CC-3403 : Replace Now Playing with the new Timeline screen 2012-03-12 14:23: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 53b8eb2724 CC-733 : export broadcast logs
exporting stats based on czech law
2012-03-08 18:30:56 +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 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 2de81c6027 CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
- updated logic removed when doing a rebase with devel
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 dd3b7afff2 Updated library so I can play a song. 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
Paul Baranowski d250e2a297 CC-3380 Better names for items in the System menu 2012-03-02 17:50:52 -05:00
Martin Konecny 508c623850 -remove comments that should not have been committed 2012-03-01 18:00:46 -05:00
Martin Konecny 92f19139b9 CC-3336: Refactor schedule API used by pypo
-done
2012-02-29 21:27:42 -05:00
Naomi Aro 99b490129c CC-3174 : showbuilder
making a dialog on the calendar page.
2012-03-01 00:19:59 +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
Martin Konecny 057e377c5f Merge branch 'cc-3336-refactor-pypo' into devel 2012-02-28 19:49:48 -05: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
Martin Konecny b572b26b68 CC-3336: Refactor schedule API used by pypo
-make sure that empty arrays are objects and not arrays
-clean up some comments
2012-02-28 15:32:18 -05:00
Martin Konecny 322d1bfa99 CC-3336: Refactor schedule API used by pypo
-initial commit
2012-02-28 14:43:39 -05: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 8ae303de83 CC-3174 : showbuilder
need up to date version of datatables.
2012-02-27 12:42:04 +01:00
Naomi Aro 3cc1506086 CC-3358 : Metadata Qtip 2012-02-27 12:23:22 +01:00
James 446233fbd4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-02-24 14:15:06 -05:00
James 2f689ed583 CC-3346: Recorder: Merge recorder with pypo
- Pypo fech works as msg listner for recroder now.
- recorder is part of pypo and all it does is waiting for msg from pypo
fetch and spwan a show recorder thread.
- added new parameter logger to api client. This way apiclient will log
into specific log file instead of grabbing current log file.
- show recoder is removed from all check system/status page
2012-02-24 14:11:35 -05: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 d93041edb9 CC-3174 : showbuilder
change default value to prevent apache error logs.
2012-02-23 18:06:08 +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 aabcaafff0 CC-3174 : showbuilder
nowplaying uses current datatables.
2012-02-23 11:10:49 +01:00
Naomi Aro 4bc51cbad1 CC-3174 : showbuilder
forgotten unused var.
2012-02-23 11:01:52 +01:00
Naomi Aro a1e8903a64 CC-3174 : showbuilder
fixing some errors found in apache log.
2012-02-22 22:25:14 +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 2aae318a5a CC-3174 : showbuilder
remembering state for the timeline datatable.
2012-02-22 12:42:24 +01:00