naomiaro
|
9a7dda49fe
|
CC-1917 file meta data screen
|
2011-02-12 14:44:55 -05:00 |
|
Naomi
|
d9118fe2d0
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
Conflicts:
public/css/styles.css
|
2011-02-11 18:59:27 -05:00 |
|
Naomi
|
89267748d4
|
CC-1916 playlist metadata page looks better.
|
2011-02-11 18:55:08 -05:00 |
|
martin
|
43f7f8e103
|
-added help page
-added additional user info
|
2011-02-11 18:13:26 -05:00 |
|
mkonecny
|
b43db577dd
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-02-11 11:56:29 -05:00 |
|
mkonecny
|
14ee1f553e
|
-fixed up about tool-tip
-ui tweaks to manage users screen
|
2011-02-11 11:56:14 -05:00 |
|
Naomi
|
3b9f87f6f1
|
what tab isn't default open for space reason.
|
2011-02-11 11:12:08 -05:00 |
|
mkonecny
|
e28a1421c5
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-02-10 20:48:36 -05:00 |
|
mkonecny
|
cf004abb44
|
-small fixes
-about popup without styling added
|
2011-02-10 20:48:26 -05:00 |
|
Naomi
|
44c830066b
|
CC-1880 show content is styled
|
2011-02-10 20:27:25 -05:00 |
|
Naomi
|
f3efc9edaa
|
add classes to day check in jQuery or else zend doesn't populate the form properly.
|
2011-02-10 19:19:55 -05:00 |
|
Naomi
|
ea9127b1d0
|
CC-1910
new close button for add show
|
2011-02-10 18:24:29 -05:00 |
|
Naomi
|
36193d2948
|
airtime menu now uses ACL with the custom viewscript.
|
2011-02-10 18:03:41 -05:00 |
|
Naomi
|
2b5927bf33
|
add show form sent via ajax request, opens sections with errors if not completed properly.
|
2011-02-10 15:00:55 -05:00 |
|
Naomi
|
a32550d625
|
add show button removed/readded properly.
|
2011-02-10 11:34:55 -05:00 |
|
Naomi
|
ac86fc50e8
|
add show button only appears for admin users
|
2011-02-10 11:25:28 -05:00 |
|
martin
|
718a039bcc
|
Merge branch 'master' of dev.sourcefabric.org:airtime
Conflicts:
public/css/styles.css
|
2011-02-10 00:37:07 -05:00 |
|
martin
|
b9ed526e25
|
-new improved day view date picker look.
|
2011-02-10 00:35:32 -05:00 |
|
naomiaro
|
675f1ae86a
|
add show/schedule now on one page.
|
2011-02-10 00:17:07 -05:00 |
|
naomiaro
|
b61f2af59b
|
placed add show button in full calendar header, placed time resolution on side of calendar.
|
2011-02-09 23:26:00 -05:00 |
|
naomiaro
|
d5efcac452
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-02-09 22:37:26 -05:00 |
|
naomiaro
|
59ef9ee6a0
|
starting advanced search
|
2011-02-09 22:37:18 -05:00 |
|
Naomi
|
2c66c1801e
|
close button hides add show box.
|
2011-02-09 19:08:27 -05:00 |
|
mkonecny
|
313252f93a
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-02-09 18:28:42 -05:00 |
|
mkonecny
|
40be54e82f
|
-completed CC-1808
|
2011-02-09 18:25:33 -05:00 |
|
Naomi
|
d210a36358
|
new add show html.
|
2011-02-09 18:10:46 -05:00 |
|
mkonecny
|
eab3675c74
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-02-09 17:02:44 -05:00 |
|
mkonecny
|
a447839745
|
-UI changes.
-Blank row now displays start and end time
-Changed default playlist name
|
2011-02-09 17:02:32 -05:00 |
|
Naomi
|
86d1aafed4
|
can now change name/description of a playlist.
|
2011-02-09 16:53:11 -05:00 |
|
Naomi
|
86d60dda9e
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-02-09 16:29:27 -05:00 |
|
mkonecny
|
a43da4e887
|
-fix gap between buttons
|
2011-02-09 15:54:57 -05:00 |
|
mkonecny
|
c4893e9d36
|
-updated list-view UI
|
2011-02-09 15:23:32 -05:00 |
|
Naomi
|
108bf65930
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
Conflicts:
application/controllers/ScheduleController.php
|
2011-02-09 14:15:18 -05:00 |
|
Naomi
|
be5ec4c45d
|
working on editing shows
|
2011-02-09 14:12:07 -05:00 |
|
mkonecny
|
50054befd6
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
Conflicts:
.zfproject.xml
application/configs/airtime-conf.php
build/build.properties
public/css/styles.css
|
2011-02-09 13:07:36 -05:00 |
|
mkonecny
|
3b4fa1cc1a
|
-added new users management screen
|
2011-02-09 13:03:46 -05:00 |
|
Naomi
|
918f4ec96d
|
forogt to check a view in, not used though.
|
2011-02-08 18:47:04 -05:00 |
|
Naomi
|
bdad3b34e0
|
CC-1862 playlist builder playlist fadein/out
|
2011-02-08 16:10:48 -05:00 |
|
Naomi
|
424c6f0193
|
CC-1887 shows are now resized properly with delta day. schedule dialog includes end day since shows can be longer than 1 day now, playlist search must look for an interval given the time increase.
|
2011-02-08 15:06:31 -05:00 |
|
mkonecny
|
ee5e8f48ce
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-02-08 12:22:33 -05:00 |
|
naomiaro
|
0de162aa26
|
errors finally fully working in display.
|
2011-02-08 00:29:31 -05:00 |
|
naomiaro
|
9db7f790ef
|
errors displayed under value in playlist editor.
|
2011-02-07 23:32:36 -05:00 |
|
naomiaro
|
4985524af8
|
errors are displayed if problem with cues/fades.
|
2011-02-07 23:18:48 -05:00 |
|
mkonecny
|
16bdfb7611
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
Conflicts:
public/css/styles.css
|
2011-02-07 19:06:06 -05:00 |
|
mkonecny
|
bc5b9efb4b
|
-changes to list view. Framework so that we may change selected day
-changes to add-user. Started implementing Vladimirs design.
|
2011-02-07 19:03:14 -05:00 |
|
naomiaro
|
8f8c4716cc
|
first version of playlist builder with cues/fades. need to do some work to display errors, look to see if I can position the cursor better on the contenteditable spans within the lis because jQuery sortable is interfering with normal operation. don't have a fade in/out for theplaylist overall yet.
|
2011-02-07 18:44:42 -05:00 |
|
mkonecny
|
7c17758721
|
-implemented new ui design for preferences page.
|
2011-02-07 12:36:35 -05:00 |
|
mkonecny
|
27293c6b8f
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-02-04 18:22:51 -05:00 |
|
mkonecny
|
debdefbc96
|
-list-view implemented
|
2011-02-04 18:22:15 -05:00 |
|
naomiaro
|
d81a84ca9a
|
CC-1172 adding qtip tooltips on library files to show metadata.
|
2011-02-04 00:15:56 -05:00 |
|