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 |
|
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
|
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
|
28f3a77246
|
-day view now highlights current show
|
2011-02-09 15:45:45 -05:00 |
|
mkonecny
|
ce23df43d1
|
updated navigation menu
|
2011-02-09 15:25:16 -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
|
c0d5cc4809
|
-list view updated
|
2011-02-09 14:09:42 -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
|
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 |
|
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
|
6c860dcff5
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-02-07 12:37:12 -05:00 |
|
mkonecny
|
7c17758721
|
-implemented new ui design for preferences page.
|
2011-02-07 12:36:35 -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 |
|
naomiaro
|
0152514ef3
|
removed cc_show_schedule table.
|
2011-02-06 22:07:17 -05:00 |
|
martin
|
fae1401568
|
-further fixes for naomis new layout
|
2011-02-06 20:12:56 -05:00 |
|
martin
|
8396e12df1
|
Merge branch 'master' of dev.sourcefabric.org:airtime
|
2011-02-06 19:28:49 -05:00 |
|
martin
|
993b302f6b
|
initial patch to fix problems with new tables schema.
|
2011-02-06 19:28:39 -05:00 |
|
naomiaro
|
f04d03aef1
|
SCHEDULE TABLE ID CHANGE
|
2011-02-06 18:38:55 -05:00 |
|
naomiaro
|
a5e4056555
|
missing check for shows in the middle.
|
2011-02-06 17:37:23 -05:00 |
|
naomiaro
|
75eea94641
|
changed back to old schedule id to test if playback works now.
|
2011-02-06 15:31:36 -05:00 |
|
naomiaro
|
ebb43857f6
|
modified cc_schedule table, added foreign key to show instance id for easy clean up when show needs to be cleared/deleted. replaced primary key with a standard auto incrementing key for efficiency since the other key had no use.
|
2011-02-06 01:10:07 -05:00 |
|
naomiaro
|
14c71a3f39
|
getting tired....
|
2011-02-05 23:50:43 -05:00 |
|
naomiaro
|
76b2f6e80b
|
order by didn't work for full calendar
|
2011-02-05 23:49:27 -05:00 |
|
naomiaro
|
aef4654a3f
|
CC-1770 clear the days chosen if the show doesn't repeat.
|
2011-02-05 23:42:57 -05:00 |
|
naomiaro
|
0d300122b8
|
forgot to put a label.
|
2011-02-05 23:23:53 -05:00 |
|
naomiaro
|
13847e738b
|
adding bi-weekly show option. new structure allows for different repeat types to be specified.
new playlist builder css/images.
|
2011-02-05 23:21:52 -05:00 |
|