martin
|
7f83868214
|
-fix for bad merge conflict
|
2011-02-14 10:46:52 -05:00 |
|
martin
|
bb2d4c6795
|
Merge branch 'master' of dev.sourcefabric.org:airtime
Conflicts:
public/js/playlist/nowplayingdatagrid.js
|
2011-02-14 10:40:22 -05:00 |
martin
|
416c6ceb10
|
-fixed bug where a song would appear as current song and next song simultaneously.
-show background color switching on the list-view should now be instant.
|
2011-02-13 15:35:41 -05:00 |
|
martin
|
bb82dc2f4a
|
-alternating colors for blue datatable rows
|
2011-02-13 14:09:47 -05:00 |
|
martin
|
a5fd68c252
|
-fixed UI freeze on some very special occasions
-fixed some php errors related to php shipped with debian
-playlist.js no longer active on login page
|
2011-02-13 13:29:16 -05:00 |
|
martin
|
b9e1078e10
|
-small fixes to now playing
|
2011-02-13 11:49:28 -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
|
3ea9c9bc2d
|
-now playing blue rows now slightly alternate in color.
|
2011-02-11 18:43:07 -05:00 |
|
martin
|
6cf4310c24
|
Merge branch 'master' of dev.sourcefabric.org:airtime
|
2011-02-11 18:13:38 -05:00 |
|
martin
|
43f7f8e103
|
-added help page
-added additional user info
|
2011-02-11 18:13:26 -05:00 |
|
Naomi
|
12dbdf8f4c
|
CC-1915 playlist name no longer required in form, defaults to "Untitled Playlist"
|
2011-02-11 15:59:16 -05:00 |
|
Naomi
|
4cf5a46c67
|
will go back to date you were looking at when changing time resolution.
|
2011-02-11 12:45:00 -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
|
2b1163a157
|
added opening what section if errors
|
2011-02-11 11:16:15 -05:00 |
naomiaro
|
00b70c5144
|
CC-1871 when clicking on a time slot on the calendar it automatically opens the add show form and populates the start date and start time(if on week/day view)
|
2011-02-10 23:50:31 -05:00 |
|
naomiaro
|
cb8679e43e
|
adding show button when form hides.
|
2011-02-10 22:27:22 -05:00 |
|
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
|
8dbb79d9e2
|
CC-1902 default duration is 1:00
|
2011-02-10 19:53:41 -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
|
81d66ebbb6
|
day selection change
|
2011-02-10 18:40:30 -05:00 |
|
Naomi
|
ea9127b1d0
|
CC-1910
new close button for add show
|
2011-02-10 18:24:29 -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 |
|
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 |
|
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 |