e9627bca07
CC-3174 : showbuilder
...
only updating the timeline view if it is needed.
2012-03-07 12:20:30 +01:00
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
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
157078b963
Merge branch 'CC-3174' into devel
...
Conflicts:
airtime_mvc/public/js/airtime/library/library.js
2012-03-06 13:51:37 +01:00
64fe303b20
CC-3174 : showbuilder
...
fixing indentation.
2012-03-06 13:35:21 +01:00
6c5f710329
CC-3174 : showbuilder
...
making each separate widget scrollable (playlist, library, timeline)
2012-03-06 13:19:20 +01:00
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
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
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
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
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
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
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
0b9ed43e50
Updated library functionality and started with playlist work.
2012-03-05 19:00:14 -05:00
dd3b7afff2
Updated library so I can play a song.
2012-03-05 19:00:14 -05:00
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
463fc1ff08
CC-3382: Include jPlayer sources in release tarball for GPL compliance
...
-Done
2012-03-05 16:17:00 -05:00
a832a40c75
CC-3174 : showbuilder
...
making the library a separate scrollable from playlist
2012-03-05 18:14:10 +01:00
b8ca0ef740
CC-3174 : showbuidler
...
fixing width of search input so it will work on smaller screens.
2012-03-05 15:39:18 +01:00
62c07107c1
CC-3174 : showbuilder
...
dialog improvements, can scroll library, builder independently.
2012-03-05 14:43:34 +01:00
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
f4fac98221
CC-3174 : showbuilder
...
adding back polling.
2012-03-02 17:25:44 +01:00
29b03c1181
CC-3174 : showbuilder
...
creating smart refresh timeout for now playing.
2012-03-02 16:27:14 +01:00
98d50ae4a7
CC-3174 : showbuilder
...
different width added for dialog builder.
2012-03-02 15:47:50 +01:00
3ab375a23c
CC-3174 : showbuilder
...
chaning text on edit button.
2012-03-02 15:29:19 +01:00
b358c90cfb
CC-3174 : showbuilder
...
making the library toggle in when pressing the edit button
2012-03-02 15:28:04 +01:00
9e1b3e7e6e
CC-3174 : showbuilder
...
edge checking on empty datatables.
2012-03-02 14:16:11 +01:00
f61afb0216
CC-3373 : Timeline: only lock the currently playing track and the one after
2012-03-02 14:01:02 +01:00
b68204751e
CC-3174 : showbuilder
...
making sure recorded shows aren't editable.
2012-03-01 17:49:11 +01:00
1c43edb40b
CC-3174 : showbuilder
2012-03-01 17:05:50 +01:00
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
99b490129c
CC-3174 : showbuilder
...
making a dialog on the calendar page.
2012-03-01 00:19:59 +01:00
a8f53d169b
CC-3174 : showbuilder
...
sizing bit rate/sample rate in library, text right aligned.
2012-02-29 17:47:26 +01:00
7c74023ef0
CC-3174 : showbuilder
...
removing ugly dsahed border, keeping height for the library dragging helper.
2012-02-29 16:09:39 +01:00
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
0f91f91c41
CC-3174 : showbuilder
...
adding checks to enable/disable buttons for playlist & timeline.
2012-02-29 15:47:11 +01:00
5257711866
CC-3174 : showbuilder
...
fixing order of scheduled/playlist data when added via group dragging.
2012-02-28 23:52:20 +01:00
4386690b54
CC-3174 : showbuilder
...
prevents scheduling outside a show.
2012-02-28 20:58:06 +01:00
b5f510de85
CC-3174 : showbuilder
...
making sure an item is not added outside of a show.
2012-02-28 16:57:53 +01:00
9b639a9b6d
CC-3356 : Library & Timeline : remove zero prefixes from numbers
2012-02-28 15:38:57 +01:00
997782c73c
CC-3354 : playlist drag and drop
...
improving apperance of playlist drag and drop.
2012-02-28 13:13:40 +01:00
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
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
564575d657
CC-3174 : showbuilder
...
fixing timezone calculations if browser/server is different.
2012-02-27 20:14:12 +01:00
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
3cc1506086
CC-3358 : Metadata Qtip
2012-02-27 12:23:22 +01:00
66ff3c61c3
CC-3330 : library behaviour.
2012-02-24 21:21:53 +01:00
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
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
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
28bb97acfa
CC-3174 : showbuilder
...
allow user to filter library by
files/playlists or all.
2012-02-24 00:55:20 +01:00
5364894833
CC-3174 : showbuilder
...
don't want to select empty rows anymore.
2012-02-23 23:12:30 +01:00
e0134ed6d1
CC-3174 : showbuilder
...
made width not inline.
2012-02-23 22:54:13 +01:00
c665a3fa03
CC-3333 : showbuilder track colouring
...
tracks coloured if boundry/over.
needs better colour selection.
2012-02-23 22:23:21 +01:00
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
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
c89451f880
CC-3340 : Remove "Search" tab from library view
2012-02-22 21:56:55 +01:00
bb49914294
CC-3174 : showbuilder
...
bug fixed in datatables - thanks Allan!
2012-02-22 21:09:24 +01:00
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
2ac4940fd5
CC-3339 : showbuilder column names
2012-02-22 15:57:21 +01:00
0ba3049528
CC-3174 : showbuilder
...
removing old scheduling method code to avoid confusion.
2012-02-22 13:19:49 +01:00
2aae318a5a
CC-3174 : showbuilder
...
remembering state for the timeline datatable.
2012-02-22 12:42:24 +01:00
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
5f89975c64
CC-3174 : showbuilder
...
datatables state restore needs real booleans not strings.
2012-02-22 00:02:35 +01:00
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
378d3d3ef4
CC-3174 : showbuilder
...
group drag and drop for playlist.
2012-02-20 20:44:35 +01:00
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
17c3cdcfb2
CC-3174 : showbuilder
...
fix ordering problem with track column.
2012-02-20 11:41:44 +01:00
5dd94ce12c
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-02-17 16:49:44 -05:00
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
44dccf15ce
CC-3335 : Timeline - Drag and drop usability improvements
...
dragging and dropping multiple files is working.
2012-02-17 15:53:10 +01:00
ac11d8bcf6
Merge branch 'CC-3174' into devel
...
Conflicts:
airtime_mvc/application/models/StoredFile.php
2012-02-17 11:50:49 +01:00
b2d0565ec4
CC-3174 : showbuilder
...
checking to make sure UI is up to date with db
2012-02-16 19:46:14 +01:00
e1d5d6de73
CC-3174 : showbuilder
...
checking modification time before deleting items.
Throws a ScheduleOutdatedException
2012-02-16 16:29:11 +01:00
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
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
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
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
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
4f5b5d8562
CC-3174 : Show Content Builder
...
adding time filled/empty row data.
2012-02-13 18:29:39 +01:00
238abd6f87
CC-3324: Uncaught TypeError: Cannot read property 'length' of undefined - if watched dir not defined
2012-02-13 12:24:55 -05:00
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
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
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
fdd962f5ce
CC-3174 : showbuilder
...
replacing context menus on calendar screen.
2012-02-09 21:19:21 +01:00
103b4abdeb
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-02-08 11:42:44 -05:00
6c0f035b0b
CC-3307: airtime-full-install fails on Ubuntu 11.10
2012-02-08 11:42:21 -05:00
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
252777c3f9
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-02-08 15:14:33 +01:00
c23491b257
CC-3285 : show over booked error message
...
checking if percentage is over 100.
2012-02-08 15:13:17 +01:00
a2f38b94a2
CC-3174 : showbuilder
...
changing show context menus
2012-02-08 13:12:08 +01:00
581f86a1de
CC-3174 : showbuilder
...
show editing menu added.
2012-02-08 12:53:46 +01:00
216ce80ceb
CC-3174 : showbuilder
...
have to replace context menus on calendar page.
2012-02-08 11:16:23 +01:00
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
668e214371
CC-3174 : showbuilder
...
unsetting playlist id in the session properly.
2012-02-07 18:42:34 +01:00
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
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
d9947b622a
CC-3174 : showbuilder
...
fixing times in CcPlaylistContents
2012-02-06 18:46:53 +01:00
776d1b65e8
CC-3174 : showbuilder
...
fixing merge, testing that affected functionality still works.
2012-02-06 11:23:10 +01:00
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
Daniel
Martin Konecny
Martin Konecny