dd3b7afff2
Updated library so I can play a song.
2012-03-05 19:00:14 -05:00
228a9787a8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-05 10:59:43 -05:00
d250e2a297
CC-3380 Better names for items in the System menu
2012-03-02 17:50:52 -05:00
29b03c1181
CC-3174 : showbuilder
...
creating smart refresh timeout for now playing.
2012-03-02 16:27:14 +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
f61afb0216
CC-3373 : Timeline: only lock the currently playing track and the one after
2012-03-02 14:01:02 +01:00
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
d03d01bce9
CC-3366: Pypo: Use local files instead of downloading them
...
-done
2012-03-01 18:00:46 -05:00
508c623850
-remove comments that should not have been committed
2012-03-01 18:00:46 -05:00
f8e7d6eae3
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-01 15:35:21 -05:00
323aec218f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-01 12:16:04 -05:00
d9967b9a77
-function incorrectly capitalized
2012-03-01 12:15:58 -05:00
b68204751e
CC-3174 : showbuilder
...
making sure recorded shows aren't editable.
2012-03-01 17:49:11 +01:00
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
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
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
f8608f3511
CC-3174 : showbuilder
...
percent calculation for shows was off.
2012-03-01 12:13:21 +01:00
b7e5bfe4aa
CC-3174 : showbuilder
...
changing cues/cliplengths to be interval column type.
2012-03-01 11:48:57 +01:00
92f19139b9
CC-3336: Refactor schedule API used by pypo
...
-done
2012-02-29 21:27:42 -05:00
99b490129c
CC-3174 : showbuilder
...
making a dialog on the calendar page.
2012-03-01 00:19:59 +01:00
872bd27847
CC-3174 : showbuilder
...
getting rid of useless views.
2012-02-29 18:06:53 +01:00
a9e7a70dfb
CC-3174 : showbuilder
...
fix audio preview.
2012-02-29 16:23:41 +01:00
0f91f91c41
CC-3174 : showbuilder
...
adding checks to enable/disable buttons for playlist & timeline.
2012-02-29 15:47:11 +01:00
a6413f2d1a
CC-3336: Refactor schedule API used by pypo
2012-02-28 22:33:19 -05:00
057e377c5f
Merge branch 'cc-3336-refactor-pypo' into devel
2012-02-28 19:49:48 -05:00
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
5257711866
CC-3174 : showbuilder
...
fixing order of scheduled/playlist data when added via group dragging.
2012-02-28 23:52:20 +01:00
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
11f31effca
CC-3336: Refactor schedule API used by pypo
2012-02-28 15:04:24 -05:00
4386690b54
CC-3174 : showbuilder
...
prevents scheduling outside a show.
2012-02-28 20:58:06 +01:00
a53d856e8d
CC-3336: Refactor schedule API used by pypo
...
-add comment
2012-02-28 14:56:21 -05:00
99c24ed038
CC-3336: Refactor schedule API used by pypo
...
-removed export_source
-rewrote GetScheduledPlaylists()
2012-02-28 14:52:44 -05:00
322d1bfa99
CC-3336: Refactor schedule API used by pypo
...
-initial commit
2012-02-28 14:43:39 -05:00
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
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
31abc21aaa
CC-3174 : showbuilder
...
make sure the scheduled item still exists, if not throw an error.
2012-02-28 17:16:43 +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
997782c73c
CC-3354 : playlist drag and drop
...
improving apperance of playlist drag and drop.
2012-02-28 13:13:40 +01:00
20a82abb23
CC-3174 : showbuilder
...
forgot to return value, was getting NOW as the returned time instead.
2012-02-27 22:26:17 +01:00
99d3699e71
CC-3174 : showbuilder
...
fades displayed in seconds.
2012-02-27 21:40:04 +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
6ecf2f94b0
CC-3356 : Library & Timeline : remove zero prefixes from numbers
2012-02-27 20:26:47 +01:00
564575d657
CC-3174 : showbuilder
...
fixing timezone calculations if browser/server is different.
2012-02-27 20:14:12 +01:00
e8f329aef1
CC-3336: Refactor schedule API used by pypo
2012-02-27 13:52:35 -05:00
f01a872bea
CC-3174 : showbuilder
...
remove extra ;
2012-02-27 14:59:48 +01:00
318a0345bb
CC-3174 : showbuilder
...
make sure recorded files only display year in the table.
2012-02-27 14:59:16 +01:00
9c248bb34d
CC-3174 : showbuilder
...
fixing scheduling rebroadcasts, show content.
2012-02-27 14:33:56 +01:00
4a02d12600
CC-3174 : showbuilder
...
fixing now playing to remove the playlist part.
2012-02-27 12:53:21 +01:00
Daniel
Paul Baranowski
Naomi Aro
Martin Konecny