Commit Graph

636 Commits

Author SHA1 Message Date
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
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 3cc1506086 CC-3358 : Metadata Qtip 2012-02-27 12:23:22 +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 c6edfc3208 CC-3174 : showbuilder
removing columns that no longer should be in cc_schedule.

changing cc_files length column to be of type interval.

adding length formatter to showbuilder.
2012-02-24 16:05:01 +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 5364894833 CC-3174 : showbuilder
don't want to select empty rows anymore.
2012-02-23 23:12:30 +01:00
Naomi Aro e0134ed6d1 CC-3174 : showbuilder
made width not inline.
2012-02-23 22:54:13 +01:00
Naomi Aro c665a3fa03 CC-3333 : showbuilder track colouring
tracks coloured if boundry/over.

needs better colour selection.
2012-02-23 22:23:21 +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 bb49914294 CC-3174 : showbuilder
bug fixed in datatables - thanks Allan!
2012-02-22 21:09:24 +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 2ac4940fd5 CC-3339 : showbuilder column names 2012-02-22 15:57:21 +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
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
Daniel 5dd94ce12c Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-17 16:49:44 -05:00
Daniel 6d71ec8c9c CC-3331 : Optimize "Now Playing" to load in less than 1/2 second
- The logic to build the NowPlaying list was updated to refactor the quering of the database for playlist tracks played from in the loop per show ID to outside the loop for a given duration. The resulting list was then partitioned off for each show.
2012-02-17 11:13:34 -05: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
Naomi Aro f14ebce239 CC-3174 : showbuilder
adding new column last_scheduled to cc_show_instance
changing column time_filled to be of type interval.
2012-02-15 18:27:59 +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 b1fbeeb448 CC-3174 : showbuilder
adding a showbuilder form, can filter by show,
or if you're a host user by all shows you can schedule in a range.
2012-02-15 00:39:27 +01:00
Martin Konecny 54cbc86a0a Merge branch '2.0.x' into devel
Conflicts:
	VERSION
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Nowplaying.php
	airtime_mvc/application/models/Show.php
	airtime_mvc/application/models/airtime/CcShowInstances.php
2012-02-14 14:47:07 -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 4f5b5d8562 CC-3174 : Show Content Builder
adding time filled/empty row data.
2012-02-13 18:29:39 +01:00
Martin Konecny 238abd6f87 CC-3324: Uncaught TypeError: Cannot read property 'length' of undefined - if watched dir not defined 2012-02-13 12:24:55 -05:00
Martin Konecny fbd6df1986 CC-3320: Upgrade from 2.0->2.0.1: Airtime instance is not avaiable for 1~2mins right after upgrade. 2012-02-12 15:31:17 -05:00
Martin Konecny 8493180243 CC-3320: Upgrade from 2.0->2.0.1: Airtime instance is not avaiable for 1~2mins right after upgrade.
-use clearstatcache function
2012-02-12 11:43:34 -05:00
Naomi Aro 941da1fe44 CC-3174 : showbuilder
adding add/remove to the context menu.
airtimeline now has default set start/end times in the inputs.
2012-02-09 23:41:12 +01:00
Naomi Aro fdd962f5ce CC-3174 : showbuilder
replacing context menus on calendar screen.
2012-02-09 21:19:21 +01:00
Martin Konecny 103b4abdeb Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-08 11:42:44 -05:00
Martin Konecny 6c0f035b0b CC-3307: airtime-full-install fails on Ubuntu 11.10 2012-02-08 11:42:21 -05:00
Naomi Aro 624669a6bf CC-3273 : flash player
mp3 latency problem in firefox needed an extra option set in JPlayer
2012-02-08 17:39:16 +01:00
Naomi Aro 252777c3f9 Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-08 15:14:33 +01:00
Naomi Aro c23491b257 CC-3285 : show over booked error message
checking if percentage is over 100.
2012-02-08 15:13:17 +01:00
Naomi Aro a2f38b94a2 CC-3174 : showbuilder
changing show context menus
2012-02-08 13:12:08 +01:00
Naomi Aro 581f86a1de CC-3174 : showbuilder
show editing menu added.
2012-02-08 12:53:46 +01:00
Naomi Aro 216ce80ceb CC-3174 : showbuilder
have to replace context menus on calendar page.
2012-02-08 11:16:23 +01:00
Naomi Aro 3728ffaddc CC-3174 : showbuilder
upgraded full calendar to 1.5.3 so that it works with jquery 1.7.1

need to replace context menu on the page, old one doesn't work anymore anyways.
2012-02-07 23:58:36 +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
Martin Konecny 5dcb033c84 CC-3297: Depend on zendframework and php-pear as external packages
-Remove dependency on included Zend files.
-Remove included Zend files
-Zend is now external dependency
2012-02-06 20:28:38 -05: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 11e7d813b6 CC-3174 : show builder
small modifications removing uneeded things.
2012-02-02 23:58:36 +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
Daniel Franklin 61fb8a4fb9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/application/Bootstrap.php
2012-02-02 14:49:08 -05:00
Daniel Franklin 03329ad2cf CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences
- Updated the logic in the fade in/out loggic so the Time format 00:00:00 appears as the more practical seconds format 00.
- I also updated the error message so it includes the time unit seconds in the message.
2012-02-02 14:44:14 -05:00
Naomi Aro e001cd24c1 CC-3174 : show builder
darg into and drag around in the timeline is now working.
need to change schedule table to not have auto incrementing ids
to preserve an item's id for REST.
(might find another way)
2012-02-02 18:13:20 +01:00
Naomi Aro 0199f572bd CC-3174 : showbuilder
dragging into timeline is working
need to replace jjmenus
2012-02-02 15:51:15 +01:00
Naomi Aro 8b93b98e24 CC-3174 : show builder
removing widths where unneeded.
2012-02-02 01:33:53 +01:00
Naomi Aro 942cfaac25 CC-3174 : show builder
moving columns around in library to look better.
2012-02-02 01:29:50 +01:00
Naomi Aro 3aab811a3e CC-3174 : showbuilder
fixing some css/js for display.
2012-02-01 23:33:20 +01:00
Naomi Aro f5b2a23eb1 CC-3174 : showbuilder
group add/delete is working
2012-02-01 18:47:08 +01:00
James 81d24b7825 SAAS-174: Ability to add Google Analytics to the demo instance
- adding google-analytics.js
2012-02-01 11:49:53 -05:00
James 80d99f013a SAAS-174: Ability to add Google Analytics to the demo instance
- adding google-analytics.js
2012-02-01 11:48:29 -05:00
Naomi Aro fbda0e733b CC-3174 : showbuilder
check into issue that propel doesn't return DateTime object in UTC.
using table tools to keep track of selected rows.
2012-01-31 18:59:27 +01:00
Naomi Aro 3f3117cf0e CC-3174 : Show builder
creating a scheduling system to work with the new timeline in mind using propel.
2012-01-27 21:06:04 +01:00
Naomi Aro f5761fd03c CC-3174 : show builder
status icon on left side of table
static check mark in the footer currently
2012-01-26 19:10:37 +01:00
Naomi Aro b0c3bace1c CC-3174 : show builder
made sure the column reordering/visibility selection works with
modified show header/footer rows (their td spans the entire tr)
2012-01-26 15:21:04 +01:00
James 5026da56cb SAAS-178: Demo instance should prevent changing of admin password
- Error msg is returned when try to update admin account
2012-01-25 14:14:27 -05:00
James 2027db3609 SAAS-178: Demo instance should prevent changing of admin password
- Error msg is returned when try to update admin account
2012-01-25 14:12:19 -05:00
Naomi Aro ecaebbeb67 CC-3174 : Show builder, working on date choice pickers, make sure they accomodate client/server timezones. 2012-01-23 19:07:07 +01:00
Yuchen Wang 93dfb253c1 CC-3239: Create show form->Date start doesnt consider "Week starts on" parameter
Fixed
2012-01-18 10:28:41 -05:00
James 087d893a60 Merge branch 'airtime-2.0.x' into devel 2012-01-17 14:48:04 -05:00
James ff428d2c4f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-17 11:35:48 -05:00
James dae7e73a84 CC-3250: UI design for mount monitor for media monitor
( Manage Media Folder and Playlist Builder screen)

- initial commit
2012-01-17 11:35:31 -05:00
Naomi Aro a69be24831 CC-3256 : Recorded/repeated/rebroadcast is invalid after show update
only the original rebroadcasts are left when toggling the repeat option.
2012-01-17 12:45:05 +01:00
Naomi Aro 424206b9a9 CC-3174 : Show Builder
data tables column resizing, starting separating out events.
2012-01-17 11:18:17 +01:00
Martin Konecny 54ee177f7d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-16 13:58:45 -05:00
Naomi Aro df33a457b1 Merge branch 'devel' into CC-3174 2012-01-16 09:58:02 +01:00
Naomi Aro 859213b760 CC-3174 Show Builder
experimenting
2012-01-16 09:56:57 +01:00
James c82394b7a0 CC-3246: Hardware audio output cannot be switched off
- fixed
2012-01-13 16:57:02 -05:00
James ccef97190a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-13 16:56:29 -05:00
James bcbbf42f62 CC-3246: Hardware audio output cannot be switched off
- fixed
2012-01-13 16:56:02 -05:00
Yuchen Wang d753b0bb02 CC-3226: Record cancel dialog says "stop playback?" instead of "stop recording?"
Done
2012-01-13 16:46:37 -05:00
Yuchen Wang 9629e2bbae Merge branch 'group_action_playlist_builder' into devel 2012-01-13 14:21:29 -05:00
Yuchen Wang 258521ffbf CC-1977: Allow multiple files to be selected and acted upon in the library and playlist
- Fixed issues in "Manage Users" page
- Moved some code to more appropriate place
2012-01-13 14:17:39 -05:00
Yuchen Wang b215d816ac CC-3186: Design tweaks for tooltip
Updated the icon to make it stand out more
2012-01-13 10:28:42 -05:00
Yuchen Wang 6b7523513e Merge branch 'group_action_playlist_builder' into devel 2012-01-12 14:28:12 -05:00
Yuchen Wang 186aa9e898 CC-1977: Allow multiple files to be selected and acted upon in the library and playlist
Fixed bugs introduced by backend changes from before
2012-01-12 14:27:43 -05:00
Yuchen Wang 4a372715a3 CC-3239: Create show form->Date start doesnt consider "Week starts on" parameter
Fixed
2012-01-12 12:19:05 -05:00
Yuchen Wang 561b508162 Merge branch 'group_action_playlist_builder' into devel 2012-01-11 15:38:05 -05:00
Yuchen Wang 09df61d027 CC-1977: Allow multiple files to be selected and acted upon in the library and playlist
Fixed the bug where checkbox change events get handled multiple times
2012-01-11 15:36:45 -05:00
Yuchen Wang f3ce8e77d1 Merge branch 'group_action_playlist_builder' into devel 2012-01-11 10:42:35 -05:00
Yuchen Wang cf045652ec CC-1986: Configurable columns for media search
- Fixed some hardcoded array access
- Fix js error in ColReorder
2012-01-11 10:41:58 -05:00
Yuchen Wang ef141625a3 Merge branch 'group_action_playlist_builder' into devel 2012-01-10 14:46:31 -05:00
Yuchen Wang d1d01e55ce CC-1986: Configurable columns for media search
- added column 'utime' (upload time) and 'lptime' (last played time) in the tables cc_files and cc_playlist
2012-01-10 14:45:43 -05:00
Yuchen Wang 7f6d3cd942 Merge branch 'group_action_playlist_builder' into devel 2012-01-10 09:54:55 -05:00
Yuchen Wang 7d9aa3ca5d CC-2299: Better column options in playlist/file list on playlist builder
- allow columns to be re-ordered; note that the 1st two columns are fixed in-place to avoid some
problem with the ColVis plugin
2012-01-10 09:52:32 -05:00
Martin Konecny 6e48d6eafc CC-3229: JavaScript files under airtime_mvc/public/js/datatables/unit_testing/tests_onhold are chmod executable
-fixed by removing
2012-01-09 17:57:08 -05:00
Martin Konecny c3430e5411 -various optimizations 2012-01-09 17:47:58 -05:00
Yuchen Wang 7a27be878b CC-1986: Configurable columns for media search
- Added "Year" column
- Added "Upload Time" column
- Fixed some formatting issue
2012-01-08 22:31:18 -05:00
Yuchen Wang a1ccb9c42a CC-1986: Configurable columns for media search
- Upgraded ColVis plugin to 1.7, as this one contains some bug-fix that we need
- Added CSS file for ColVis plugin, so that we don't have to modify the plugin code
- Added the Configure Columns UI code
2012-01-08 10:33:11 -05:00
Yuchen Wang 8833f4462e CC-1977: Allow multiple files to be selected and acted upon in the library and playlist
- Added checkbox column to playlist builder
- Added the ability to add multiple songs to playlist by using checkboxes and "Add" button
- Added the ability to delete multiple songs/playlists by using checkboxes and "Delete" button
- Make them look nice by adjusting CSS and datatable
2012-01-07 23:37:37 -05:00
Yuchen Wang f025dccc4f CC-1986: Configurable columns for media search
Modified dataTables.ColVis.js plugin to make it work...
2012-01-07 11:55:55 -05:00
Yuchen Wang 6597f6701a CC-1986: Configurable columns for media search
Adding ColVis plugin for datatable, this plugin can be used to Show/Hide columns
2012-01-07 10:03:54 -05:00
Yuchen Wang 722306928b CC-3114: Show Content Dialog doesn't display total time
Done
2012-01-04 17:15:15 -05:00
James 5fa92f3d17 - temp commit on group action 2012-01-04 12:47:27 -05:00
james 9665c970af CC-3218: Stream-settings: Spaces and other illegal characters should not be
allowed in the fields: server, username, password, URL, and mount point

- adding an another mask for domain name. Front and backend
2011-12-22 15:35:46 -05:00
James 30b192a809 CC-3218: tream-settings: Spaces and other illegal characters should not
be allowed in the fields: server, username, password, URL, and mount point

- masking was added on the front end and validators were added for the
server side.
- extra fix: fixed php undefined index notice problem.
2011-12-21 17:30:42 -05:00
James ac50c279f7 CC-3215: When you click on Playlist Builder, for a brief instant you see the
library table headings with different columns

- fixed
2011-12-20 15:00:20 -05:00
James b4559753d7 CC-3216: Make sure "session.auto_start" is set correctly in php.ini
- setting session.auto_start to 0 in htaccess file
2011-12-20 12:31:03 -05:00
James 19aba4be92 CC-3213: Customer is unable to save Fade Out/Cue out for playlists
- the trim function was causing a issue on IE8. Maybe on othere browsers
too but it was still working on other browsers
2011-12-20 12:18:56 -05:00