Commit graph

1072 commits

Author SHA1 Message Date
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
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
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
Naomi Aro
a832a40c75 CC-3174 : showbuilder
making the library a separate scrollable from playlist
2012-03-05 18:14:10 +01:00
Daniel
228a9787a8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-05 10:59:43 -05:00
Paul Baranowski
d250e2a297 CC-3380 Better names for items in the System menu 2012-03-02 17:50:52 -05:00
Martin Konecny
df22ab21a6 CC-3359: Now Playing -> Day view has a bug with supporting UTC time
-fixed
2012-03-02 16:32:16 -05:00
Naomi Aro
29b03c1181 CC-3174 : showbuilder
creating smart refresh timeout for now playing.
2012-03-02 16:27:14 +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
f61afb0216 CC-3373 : Timeline: only lock the currently playing track and the one after 2012-03-02 14:01:02 +01:00
Naomi Aro
6c749075ac CC-3369 : Ability to identify tracks that are actually inside a show in the schedule table
chaning column name to playout_status
2012-03-02 12:22:08 +01:00
Martin Konecny
d03d01bce9 CC-3366: Pypo: Use local files instead of downloading them
-done
2012-03-01 18:00:46 -05:00
Martin Konecny
508c623850 -remove comments that should not have been committed 2012-03-01 18:00:46 -05:00
Daniel
f8e7d6eae3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-01 15:35:21 -05:00
Martin Konecny
323aec218f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-01 12:16:04 -05:00
Martin Konecny
d9967b9a77 -function incorrectly capitalized 2012-03-01 12:15:58 -05:00
Naomi Aro
b68204751e CC-3174 : showbuilder
making sure recorded shows aren't editable.
2012-03-01 17:49:11 +01:00
Naomi Aro
b813ba1035 CC-3174 : showbuilder
making a time filled formatter to take the code out of show builder.
2012-03-01 17:25:37 +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
0f9800a6bd CC-3369 : Ability to identify tracks that are actually inside a show in the schedule table 2012-03-01 14:59:06 +01:00
Naomi Aro
f8608f3511 CC-3174 : showbuilder
percent calculation for shows was off.
2012-03-01 12:13:21 +01:00
Naomi Aro
b7e5bfe4aa CC-3174 : showbuilder
changing cues/cliplengths to be interval column type.
2012-03-01 11:48:57 +01: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
Daniel
8b540017a5 Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-29 14:55:30 -05:00
Daniel
1deee3cb65 CC-3365: Airtime API returns a non-null value for next item when there is no next item.
- Improved check for determining if there is another element in the result set which is used to compute the next value.
2012-02-29 14:54:54 -05:00
Naomi Aro
872bd27847 CC-3174 : showbuilder
getting rid of useless views.
2012-02-29 18:06:53 +01:00
Naomi Aro
a9e7a70dfb CC-3174 : showbuilder
fix audio preview.
2012-02-29 16:23: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
Martin Konecny
a6413f2d1a CC-3336: Refactor schedule API used by pypo 2012-02-28 22:33:19 -05:00
Martin Konecny
057e377c5f Merge branch 'cc-3336-refactor-pypo' into devel 2012-02-28 19:49:48 -05:00
Martin Konecny
497715df44 Merge branch 'cc-3336-refactor-pypo' of dev.sourcefabric.org:airtime into cc-3336-refactor-pypo
Conflicts:
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/pypofetch.py
	python_apps/pypo/pypopush.py
2012-02-28 19:22:13 -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
11f31effca CC-3336: Refactor schedule API used by pypo 2012-02-28 15:04:24 -05:00
Naomi Aro
4386690b54 CC-3174 : showbuilder
prevents scheduling outside a show.
2012-02-28 20:58:06 +01:00
Martin Konecny
a53d856e8d CC-3336: Refactor schedule API used by pypo
-add comment
2012-02-28 14:56:21 -05:00
Martin Konecny
99c24ed038 CC-3336: Refactor schedule API used by pypo
-removed export_source
-rewrote GetScheduledPlaylists()
2012-02-28 14:52:44 -05:00
Martin Konecny
322d1bfa99 CC-3336: Refactor schedule API used by pypo
-initial commit
2012-02-28 14:43:39 -05:00
Martin Konecny
413d669bbf Merge branch 'cc-3336-refactor-pypo' of dev.sourcefabric.org:airtime into cc-3336-refactor-pypo
Conflicts:
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/pypofetch.py
	python_apps/pypo/pypopush.py

-weird conflict. I must have committed while I had my changes git-stash'ed
2012-02-28 13:58:10 -05:00
Daniel
15552319aa CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
- updated formating of file, removed tabs in favour of four spaces for some lines.
2012-02-28 13:47:57 -05:00
Naomi Aro
31abc21aaa CC-3174 : showbuilder
make sure the scheduled item still exists, if not throw an error.
2012-02-28 17:16:43 +01:00