Commit Graph

3688 Commits

Author SHA1 Message Date
naomiaro 8cb91726f7 fix for +show button appearing when it shouldn't when changing time resolution. 2011-02-10 22:07:13 -05:00
Naomi 1b705939a2 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-10 21:05:40 -05:00
Naomi f8623dfb81 add show form will reset the dates that you had selected if there are errors. 2011-02-10 21:05:17 -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 8dbb79d9e2 CC-1902 default duration is 1:00 2011-02-10 19:53:41 -05:00
Naomi 85ab11dc56 CC-1897 defaults to day of the week of start date. 2011-02-10 19:36:39 -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
mkonecny fce3f390ef -newly compiled liquidsoap 32 and 64-bit files 2011-02-10 18:48:28 -05:00
Naomi 81d66ebbb6 day selection change 2011-02-10 18:40:30 -05:00
Naomi 82a16e2d43 add show arrows 2011-02-10 18:24:39 -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 27b462d638 new acl permissions, add show form is done by ajax request now. 2011-02-10 17:12:05 -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 b6c26a583b only have add show button on full calendar when the add show form isn't displayed. 2011-02-10 11:28:56 -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 aa7dfd8072 forgot to include contextmenu.css 2011-02-10 00:20:03 -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
mkonecny 210a71c213 -bug fixes 2011-02-09 20:13:30 -05:00
mkonecny bf4549c86d Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-09 19:45:34 -05:00
mkonecny ea13b32ccf -clean up install script a little...removed some errors. 2011-02-09 19:45:22 -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 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