Naomi
|
7bdfd60ea9
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-01-21 13:25:34 -05:00 |
|
Naomi
|
c83244fb3a
|
add show form is broken up into tabs.
|
2011-01-21 13:25:12 -05:00 |
|
Naomi
|
42e2e0d407
|
working on add show screen, using subforms and jqueryUI tabs to separate adding show decisions.
|
2011-01-20 18:30:53 -05:00 |
mkonecny
|
8d5aea0d14
|
-basic now playing bar
|
2011-01-20 17:14:14 -05:00 |
|
mkonecny
|
7bed63e675
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-01-19 18:38:13 -05:00 |
|
mkonecny
|
7450195854
|
-basic now-playing toolbar. Some data still needs to be populated.
|
2011-01-19 18:32:20 -05:00 |
|
Naomi
|
e27c42fef6
|
deleting repeating shows only deletes shows in the future, but having problems with full calendar caching results or something so display on calendar can be incorrect.
|
2011-01-19 15:21:11 -05:00 |
|
Naomi
|
e335d6d89f
|
small fixes to media library, artist now says creator.
|
2011-01-17 14:11:56 -05:00 |
|
Naomi
|
6376a25463
|
cue/fade editor done for new playlist builder
|
2011-01-17 13:55:43 -05:00 |
naomiaro
|
7cf55e0201
|
side playlist looks good.
|
2011-01-16 23:43:12 -05:00 |
|
naomiaro
|
8887ce24d1
|
can get cues/fades to display in new playlist builder.
cannot change them yet.
|
2011-01-16 19:31:10 -05:00 |
|
naomiaro
|
ccb36c8106
|
changed to better looking theme with newer version of jquery UI. Can create new playlists on the side.
|
2011-01-16 17:12:02 -05:00 |
|
naomiaro
|
91e0db7647
|
forgot to change some names to remove sideplaylist scripts.
|
2011-01-16 16:00:44 -05:00 |
|
naomiaro
|
01df8d8d6b
|
CC-1708 added x instead of input to remove items. Merging side playlist and playlist into one.
|
2011-01-16 15:35:00 -05:00 |
|
naomiaro
|
86a4998e0a
|
shows time filled in show, with progress bar and time.
|
2011-01-15 18:23:15 -05:00 |
|
naomiaro
|
25c7d4cb90
|
backend mostly done for show, can remove a scheduled group from a show.
|
2011-01-15 14:59:41 -05:00 |
|
naomiaro
|
f2560a6aa6
|
when deleting a group following groups in show update their times.
|
2011-01-15 13:10:10 -05:00 |
|
naomiaro
|
f312ea0d60
|
show will open dialog properly showing scheduled content if there is any
|
2011-01-13 18:27:44 -05:00 |
|
naomiaro
|
a8f24952bd
|
updates the playlists that can be chosen for the show.
|
2011-01-13 18:01:15 -05:00 |
|
naomiaro
|
0ffa232b6d
|
schedule show finds playlists available and returns show content better
|
2011-01-13 16:24:10 -05:00 |
|
naomiaro
|
ad869e0f7f
|
will display in the UI what is scheduled in a show when you add things.
|
2011-01-12 19:40:05 -05:00 |
|
naomiaro
|
1f8ac9719f
|
can add multiple playlists to a show, doesn't check length or update playlists based on time left. GUI is bad.
|
2011-01-12 15:47:44 -05:00 |
|
naomiaro
|
c1c4c4e598
|
database changes for name, searching for playlist for a show.
|
2011-01-10 13:24:21 -05:00 |
|
mkonecny
|
745e4977f4
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-01-06 17:13:11 -05:00 |
|
mkonecny
|
fb7b56b2c3
|
-synchronize
|
2011-01-06 17:07:45 -05:00 |
|
Naomi
|
9854834b26
|
adding fields to allow for multiple playlists scheduled in a show
|
2011-01-06 16:20:51 -05:00 |
|
naomiaro
|
daf37fa548
|
quick search string session var
|
2011-01-06 01:26:48 -05:00 |
|
naomiaro
|
7aac80ed58
|
renaming for airtime
|
2011-01-06 01:12:24 -05:00 |
|
naomiaro
|
d9e8e1641a
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
Conflicts:
application/controllers/LibraryController.php
application/controllers/SearchController.php
|
2011-01-06 01:05:34 -05:00 |
|
naomiaro
|
ff02a42514
|
quick search is working, with small paginator ajax url hack
|
2011-01-06 00:23:22 -05:00 |
|
mkonecny
|
20c392343b
|
-changed some references from campcaster to airtime in the documentation / comments
|
2011-01-05 12:19:58 -05:00 |
|
naomiaro
|
101b6fafa6
|
searching includes groups for and/or
|
2011-01-04 19:18:44 -05:00 |
|
naomiaro
|
cf4e784129
|
CC-1749 added pagination to media files display.
|
2011-01-03 13:29:57 -05:00 |
|
naomiaro
|
75cd410ba4
|
search uses pagination
|
2011-01-03 11:47:21 -05:00 |
|
naomiaro
|
0cf89713a9
|
can edit file metadata.
|
2010-12-30 17:26:44 -05:00 |
|
naomiaro
|
2a37140c4d
|
can edit playlist metadata
|
2010-12-30 15:10:05 -05:00 |
|
naomiaro
|
dc36c972ba
|
close playlist in context menu
|
2010-12-30 14:29:15 -05:00 |
|
naomiaro
|
c4053a1b38
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2010-12-30 13:39:51 -05:00 |
|
naomiaro
|
fc2e407ad0
|
still old context menus for schedule, wondering why they aren't popping up.
|
2010-12-30 13:32:59 -05:00 |
|
mkonecny
|
1c95a61a2c
|
-renamed some files to better represent their function
|
2010-12-30 12:02:02 -05:00 |
martin
|
ffa508de34
|
-synchronize
|
2010-12-30 09:41:52 -05:00 |
|
naomiaro
|
d2b1bf0622
|
new jjmenu for dynamic context menus. playlists in library.
need to work on javascript callback
|
2010-12-29 18:43:17 -05:00 |
|
mkonecny
|
8404fa4145
|
-synchronize - broken
|
2010-12-29 17:01:28 -05:00 |
|
naomiaro
|
e768539ea8
|
search maintains state
|
2010-12-22 15:08:38 -05:00 |
|
naomiaro
|
b1a4cb5bd4
|
delete active pl done for side playlist
|
2010-12-22 13:05:32 -05:00 |
|
naomiaro
|
8f088abaea
|
close working on side playlist
|
2010-12-22 12:42:46 -05:00 |
|
naomiaro
|
4e7b3ce86b
|
minor fixes
|
2010-12-21 23:56:14 -05:00 |
|
naomiaro
|
5795871bcc
|
layout has more widget-like setup now. side playlist reused in search.
|
2010-12-21 23:33:58 -05:00 |
|
naomiaro
|
565d789baa
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2010-12-21 17:48:08 -05:00 |
|
mkonecny
|
414219b1cf
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2010-12-21 18:28:55 -05:00 |