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 |
|
mkonecny
|
210a71c213
|
-bug fixes
|
2011-02-09 20:13:30 -05:00 |
|
Naomi
|
c5f0b5f6e1
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-02-09 19:08:38 -05:00 |
|
Naomi
|
2c66c1801e
|
close button hides add show box.
|
2011-02-09 19:08:27 -05:00 |
|
mkonecny
|
5a3dbdb671
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-02-09 18:54:28 -05:00 |
|
mkonecny
|
292996fc5b
|
-list-view doesn't reset to the top every 5 seconds anymore.
|
2011-02-09 18:54:15 -05:00 |
|
Naomi
|
8d311a7cc3
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-02-09 18:48:05 -05:00 |
|
Naomi
|
e95b877960
|
adding class input_select, changing problem with min resolution select html.
|
2011-02-09 18:47:49 -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
|
0da5c340b3
|
typo.
|
2011-02-09 16:31:12 -05:00 |
|
Naomi
|
86d60dda9e
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-02-09 16:29:27 -05:00 |
|
Naomi
|
d15019c168
|
CC-1883 pressing enter now takes entered data.
|
2011-02-09 16:29:15 -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
|
1954fa41f8
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-02-09 14:09:51 -05:00 |
|
mkonecny
|
c0d5cc4809
|
-list view updated
|
2011-02-09 14:09:42 -05:00 |
|
Naomi
|
d86577716b
|
CC-1124 filetype incon in search
|
2011-02-09 13:31:39 -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
|
036adf17e3
|
problems with events if items jump around scroll bar.
|
2011-02-09 11:55:05 -05:00 |
|
Naomi
|
3d3515812a
|
added monthly show option, bit more javascript to show/hide info when not needed in add show tabs.
|
2011-02-08 18:22:51 -05:00 |
|
Naomi
|
bdad3b34e0
|
CC-1862 playlist builder playlist fadein/out
|
2011-02-08 16:10:48 -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
|
2988b61bf5
|
incorrectly hiding span now.
|
2011-02-08 00:20:17 -05:00 |
|
naomiaro
|
b250ff780b
|
to avoid <br> in chrome.
|
2011-02-08 00:13:58 -05:00 |
|
naomiaro
|
73ba837bae
|
needed to change selector for new playlist html for pause button.
|
2011-02-07 23:47:33 -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 |
|
naomiaro
|
290059c0ed
|
fixed delete for playlist editor, sortable doesn't effect contenteditable spans now in cue/fade editors.
|
2011-02-07 22:04:52 -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 |
|
martin
|
1631525f98
|
Merge branch 'master' of dev.sourcefabric.org:airtime
|
2011-02-07 00:27:26 -05:00 |
|
martin
|
b6d2b0f942
|
-fixed potential bug for incorrect return value type.
|
2011-02-07 00:26:16 -05:00 |
|
naomiaro
|
c0d379e306
|
cannot schedule anything in a show that overlaps.
|
2011-02-06 23:58:58 -05:00 |
|
martin
|
04d63837ba
|
-fixed problem with list-view generating too many ajax requests
|
2011-02-06 22:35:53 -05:00 |
|
martin
|
fae1401568
|
-further fixes for naomis new layout
|
2011-02-06 20:12:56 -05:00 |
|
naomiaro
|
cb3f4dd31e
|
error messages for show moving/resizing displayed in an alert.
|
2011-02-05 22:02:45 -05:00 |
|
naomiaro
|
51b6a79f6f
|
everything moved to its new class, now just testing, context menu works.
|
2011-02-05 19:10:34 -05:00 |
|
naomiaro
|
bfc1bccfdf
|
beginning of making a separate ShowInstance vs Show class.
|
2011-02-05 18:20:51 -05:00 |
|
naomiaro
|
bc6dd374f4
|
can't move a show into the past.
|
2011-02-05 17:19:54 -05:00 |
|
naomiaro
|
78f83f5f6e
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-02-05 16:00:11 -05:00 |
|