mkonecny
|
5173674714
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-01-21 18:15:13 -05:00 |
|
mkonecny
|
6553663051
|
-begin adding datagrids
|
2011-01-21 18:14:59 -05:00 |
Naomi
|
b3ccd6ab1c
|
can change the colors of shows if set in add show dialog, otherwise takes default from css style sheet.
|
2011-01-21 14:43:38 -05:00 |
|
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 |
|
mkonecny
|
8d5aea0d14
|
-basic now playing bar
|
2011-01-20 17:14:14 -05:00 |
naomiaro
|
2ff9765fdf
|
fixed bug when generating shows for calendar.
|
2011-01-19 16:50:30 -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 |
|
naomiaro
|
70f7cb6edc
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-01-17 10:40:28 -05:00 |
|
mkonecny
|
0d2314cf32
|
fixed schedule.php warning
|
2011-01-17 02:32:51 -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
|
86a4998e0a
|
shows time filled in show, with progress bar and time.
|
2011-01-15 18:23:15 -05:00 |
|
naomiaro
|
f2560a6aa6
|
when deleting a group following groups in show update their times.
|
2011-01-15 13:10:10 -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
|
4d8f28f3fd
|
show content returning info in a useful way
|
2011-01-12 17:52:57 -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
|
9c23b86c53
|
last of changing database name, removing old files
|
2011-01-10 15:44:13 -05:00 |
|
naomiaro
|
aee0b09749
|
type ahead search in scheduling playlists dialog.
|
2011-01-10 15:26:11 -05:00 |
|
naomiaro
|
8b2b2d934c
|
database name constant.
|
2011-01-10 13:26:43 -05:00 |
|
naomiaro
|
c1c4c4e598
|
database changes for name, searching for playlist for a show.
|
2011-01-10 13:24:21 -05:00 |
|
Naomi
|
c7df3c1039
|
for new cc_show_schedule columns
|
2011-01-06 16:24:30 -05:00 |
|
Naomi
|
9854834b26
|
adding fields to allow for multiple playlists scheduled in a show
|
2011-01-06 16:20:51 -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
|
ee0a8310de
|
small problem with order, quicksearch working, code could be better.
|
2011-01-06 01:00:33 -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
|
c4053a1b38
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2010-12-30 13:39:51 -05:00 |
|
mkonecny
|
4ac347cb65
|
-currently playing + playlist now available (as a Jquery plugin!). Next step is to improve UI.
|
2010-12-30 11:42:31 -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 |
martin
|
4bdcba83e2
|
-synchronize
|
2010-12-29 01:26:57 -05:00 |
|
naomiaro
|
e768539ea8
|
search maintains state
|
2010-12-22 15:08:38 -05:00 |
|
naomiaro
|
8f088abaea
|
close working on side playlist
|
2010-12-22 12:42:46 -05:00 |
|
mkonecny
|
414219b1cf
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2010-12-21 18:28:55 -05:00 |
|
mkonecny
|
10218aeeb5
|
Commit so that I may access project from a different computer. Many things do not work/ are incomplete!!!
-Added unfinalized API for getting schedule and currently playing item.
|
2010-12-21 18:28:17 -05:00 |
|
Naomi
|
8ce870bb95
|
prefixed everything in cc_files with Db for Propel to be consistent.
|
2010-12-17 18:05:59 -05:00 |
|
Naomi
|
1fc21819cc
|
simple form for adding a user to the database, only available for admin users.
|
2010-12-17 17:56:01 -05:00 |
|
Naomi
|
3d952eb1bd
|
auto complete box for hosts.
|
2010-12-17 15:52:44 -05:00 |
|
Naomi
|
ace30e9766
|
more show overlap checks, still testing.
|
2010-12-17 11:49:18 -05:00 |
|
naomiaro
|
069119857f
|
fixed percent show filled in event display.
|
2010-12-17 01:18:42 -05:00 |
|
naomiaro
|
69fa737e9c
|
more overnight show checks.
|
2010-12-17 01:11:02 -05:00 |
|
naomiaro
|
a33fb65580
|
needed for overnight shows.
|
2010-12-17 00:54:06 -05:00 |
|
naomiaro
|
cda8467124
|
slight fix for overnight shows, need to improve for shows longer than 24 hours.
|
2010-12-16 23:45:11 -05:00 |
|
Naomi
|
28f6675359
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2010-12-16 18:24:58 -05:00 |
|
Naomi
|
06a8e65366
|
working on jqueryUI progress bar for show, don't like how the progress bar displays 0%
|
2010-12-16 18:24:37 -05:00 |
|
mkonecny
|
b3a0104191
|
fixed build/schema.xml conflict
Conflicts:
build/schema.xml
|
2010-12-16 16:57:50 -05:00 |