Commit Graph

970 Commits

Author SHA1 Message Date
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
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
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 997782c73c CC-3354 : playlist drag and drop
improving apperance of playlist drag and drop.
2012-02-28 13:13:40 +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
Naomi Aro 564575d657 CC-3174 : showbuilder
fixing timezone calculations if browser/server is different.
2012-02-27 20:14:12 +01:00
Martin Konecny e8f329aef1 CC-3336: Refactor schedule API used by pypo 2012-02-27 13:52:35 -05:00
Naomi Aro f01a872bea CC-3174 : showbuilder
remove extra ;
2012-02-27 14:59:48 +01:00
Naomi Aro 318a0345bb CC-3174 : showbuilder
make sure recorded files only display year in the table.
2012-02-27 14:59:16 +01:00
Naomi Aro 9c248bb34d CC-3174 : showbuilder
fixing scheduling rebroadcasts, show content.
2012-02-27 14:33:56 +01:00
Naomi Aro 4a02d12600 CC-3174 : showbuilder
fixing now playing to remove the playlist part.
2012-02-27 12:53:21 +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
Naomi Aro 36cf8ded18 CC-3174 : showbuilder
change columns sample rate and bitrate to be integers so they sort properly in the library.
2012-02-27 12:07:46 +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 194de3c2bf Merge branch 'CC-3174' into devel 2012-02-24 18:22:59 +01:00
Naomi Aro 4286de7b42 CC-3174 : showbuilder
bit rate & sample rate formatters
2012-02-24 18:22:07 +01:00
Naomi Aro 09ce2bc8c5 Merge branch 'CC-3174' into devel 2012-02-24 16:18:39 +01:00
Naomi Aro 3ff7d1ac18 CC-3174 : showbuilder
forgot to set cueout when scheduling just files.
2012-02-24 16:18:15 +01:00
Naomi Aro b9e99afc5d Merge branch 'CC-3174' into devel 2012-02-24 16:07:12 +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 0446fcfb25 Merge branch 'CC-3174' into devel 2012-02-24 15:07:38 +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 bc8106c5fa Merge branch 'CC-3174' into devel 2012-02-24 00:56:46 +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 8b02f3d902 Merge branch 'CC-3174' into devel 2012-02-23 22:54:41 +01:00
Naomi Aro e0134ed6d1 CC-3174 : showbuilder
made width not inline.
2012-02-23 22:54:13 +01:00
Naomi Aro 9c6bd4bf4d Merge branch 'CC-3174' into devel 2012-02-23 22:24:17 +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
Paul Baranowski e99b23434e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-02-23 15:24:40 -05:00
Paul Baranowski 1682ce8879 Updated copyright date. 2012-02-23 15:24:20 -05:00
Martin Konecny 4631e199cc CC-3336: Refactor schedule API used by pypo
-add comment
2012-02-23 15:20:25 -05:00
Martin Konecny c433b08158 CC-3336: Refactor schedule API used by pypo
-removed export_source
-rewrote GetScheduledPlaylists()
2012-02-23 15:20:25 -05:00
Martin Konecny bb300676cf CC-3336: Refactor schedule API used by pypo
-initial commit
2012-02-23 15:20:24 -05: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