naomiaro
8f86b05a4b
Merge branch 'master' of dev.sourcefabric.org:campcaster
...
Conflicts:
application/controllers/ScheduleController.php
public/css/styles.css
2011-03-15 17:02:22 -04:00
naomiaro
6ef4169315
CC-1985: Automatic rebroadcast of recorded content
...
populates rebroadcast show instances now, added a new table cc_show_rebroadcast,
added columns record, rebroadcast, instance_id, file_id to cc_show_instances table.
added column record to cc_show_days.
2011-03-15 12:05:41 -04:00
martin
55745d1a4a
CC-2025
...
Indicate songs that are over-booked
2011-03-10 19:28:57 -05:00
martin
2df731bd3d
-updated doc files
...
-small change to styles.css
2011-02-14 11:03:04 -05:00
martin
43f7f8e103
-added help page
...
-added additional user info
2011-02-11 18:13:26 -05:00
Naomi
44c830066b
CC-1880 show content is styled
2011-02-10 20:27:25 -05:00
Naomi
ea9127b1d0
CC-1910
...
new close button for add show
2011-02-10 18:24:29 -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
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
a447839745
-UI changes.
...
-Blank row now displays start and end time
-Changed default playlist name
2011-02-09 17:02:32 -05:00
mkonecny
c4893e9d36
-updated list-view UI
2011-02-09 15:23:32 -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
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
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
84b8b6ffe3
CC-1868 fixes for date/time picker to avoid calendar/font size problems.
2011-02-07 17:21:51 -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
naomiaro
d81a84ca9a
CC-1172 adding qtip tooltips on library files to show metadata.
2011-02-04 00:15:56 -05:00
Naomi
f2b8f1d39d
CC-1786 Schedule Show Dialog graphic design has new html/css
2011-02-02 14:29:29 -05:00
Naomi
0bcf69985e
working on schedule dialog, reqorked get remaining time function in a show to be better.
2011-02-02 13:39:33 -05:00
Naomi
3d6d31a535
newest css sheets
2011-02-01 15:15:07 -05:00
naomiaro
629f6db6a4
newer css.
2011-01-30 21:58:19 -05:00
naomiaro
092b36c346
checks on dates, UI work mostly done
2011-01-30 20:11:18 -05:00
martin
7c70385528
-added new login screen
2011-01-29 13:47:06 -05:00
martin
43c66825b4
Merge branch 'master' of dev.sourcefabric.org:airtime
...
Conflicts:
public/css/styles.css
2011-01-28 18:37:45 -05:00
martin
d15a18992e
-added new css files
2011-01-28 18:35:13 -05:00
Naomi
10d9d13993
some basic form work, need to lear more about custom form validation/rendering.
2011-01-28 17:37:31 -05:00
Naomi
293575a457
vladimir's changes on the playlist builder screen so far. need some changes to cue/fade editor and css for datatables
2011-01-26 18:31:59 -05:00