Commit graph

6343 commits

Author SHA1 Message Date
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
a9cdb512b9 CC-3364: Dev feature: Create simple script that creates and populates a show 15 seconds on the future.
-done
2012-02-29 21:29:02 -05:00
Martin Konecny
92f19139b9 CC-3336: Refactor schedule API used by pypo
-done
2012-02-29 21:27:42 -05:00
Martin Konecny
08048cd403 CC-3374: Ability to use eclipse to run/debug our python services. Script to prepare environment and make this possible.
-done
2012-02-29 20:51:46 -05:00
Martin Konecny
b37a58aea4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-02-29 19:23:46 -05:00
Martin Konecny
2790b49ea4 CC-3364: Dev feature: Create simple script that creates and populates a show 15 seconds on the future. 2012-02-29 19:23:38 -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
872bd27847 CC-3174 : showbuilder
getting rid of useless views.
2012-02-29 18:06:53 +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
a9e7a70dfb CC-3174 : showbuilder
fix audio preview.
2012-02-29 16:23:41 +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
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
1d02c56874 CC-3336: Refactor schedule API used by pypo
-refactored pypo-push
2012-02-28 15:04:24 -05:00
Martin Konecny
11f31effca CC-3336: Refactor schedule API used by pypo 2012-02-28 15:04:24 -05:00
Naomi Aro
f39afe9503 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-02-28 20:58:49 +01: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
James
d8f7cce56e CC-3346: Recorder will not record shows if calendar is not touched 2
hours before the recorder starts

- apiclient should log to correct log file.
2012-02-28 14:45:33 -05:00
James
d4cdac505a CC-3346: Recorder: Merge recorder with pypo
- fixed log message
2012-02-28 14:45:18 -05:00
James
5aabe89069 CC-3346: Recorder: Merge recorder with pypo
- separated rabitMQ listener part out from pypoFetch and created
pypomessagehandler.py

Conflicts:

	python_apps/pypo/pypofetch.py
2012-02-28 14:44:39 -05:00
Martin Konecny
322d1bfa99 CC-3336: Refactor schedule API used by pypo
-initial commit
2012-02-28 14:43:39 -05:00
james
91ef7f7669 CC-3346: Recorder: Merge recorder with pypo
- function parse_show was renamed to process_recorder_schedule
- using thread on self.process_schedule call
2012-02-28 14:42:43 -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
Martin Konecny
39fac2f88a CC-3336: Refactor schedule API used by pypo
-refactored pypo-push
2012-02-28 11:06:31 -05: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
20a82abb23 CC-3174 : showbuilder
forgot to return value, was getting NOW as the returned time instead.
2012-02-27 22:26:17 +01:00
Naomi Aro
99d3699e71 CC-3174 : showbuilder
fades displayed in seconds.
2012-02-27 21:40:04 +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
6ecf2f94b0 CC-3356 : Library & Timeline : remove zero prefixes from numbers 2012-02-27 20:26:47 +01:00