Naomi
|
eaad41ef94
|
changed schedule page to use better dynamic menu that the playlist builder page is using.
|
2011-02-01 17:41:19 -05:00 |
|
Naomi
|
d829813c0b
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-02-01 15:57:22 -05:00 |
|
Naomi
|
904a60418c
|
better organizing Library controller since datatables is now used.
|
2011-02-01 15:57:12 -05:00 |
martin
|
be79b21c37
|
Merge branch 'master' of dev.sourcefabric.org:airtime
|
2011-02-01 15:31:38 -05:00 |
|
Naomi
|
a9f8a2b5d0
|
moved menu/styles.css to bootstrap, as well as nowplaying javascript since they should be on everypage almost except for the login screen currently.
|
2011-02-01 11:43:52 -05:00 |
|
martin
|
755c5a8469
|
-fixed issue with unix pypo user not being assigned to groups
-fixed issue with time being incorrect if server was in different timezone
|
2011-01-31 16:34:08 -05:00 |
|
Naomi
|
101bdac481
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-01-31 13:50:57 -05:00 |
|
Naomi
|
8d3482b851
|
fix for calendar rendering problems.
|
2011-01-31 13:50:37 -05:00 |
mkonecny
|
42490d53aa
|
-timezone now correct on now playing bar
|
2011-01-31 11:47:52 -05:00 |
naomiaro
|
97be2562b5
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-01-31 01:55:23 -05:00 |
|
naomiaro
|
6f778b5b40
|
hackyish way of not scrolling in browser, couldn't find a good way to get height of browser's toolbar etc, just made an average number.
|
2011-01-31 01:54:58 -05:00 |
|
martin
|
0152ad7f44
|
Merge branch 'master' of dev.sourcefabric.org:airtime
|
2011-01-31 00:51:06 -05:00 |
|
martin
|
815509eb70
|
-audio preview now works in firefox!! CC-1707
|
2011-01-31 00:50:33 -05:00 |
|
naomiaro
|
ef48687385
|
CC-1822 top menu bar stays in place.
|
2011-01-30 23:05:49 -05:00 |
|
naomiaro
|
c87e1fb257
|
add check for duration 00:00
|
2011-01-30 21:47:59 -05:00 |
|
naomiaro
|
556292e623
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-01-30 21:43:07 -05:00 |
|
naomiaro
|
48c1ce77b9
|
CC-1759
check duration is under 24 hours, colorpicker updates on drag, picker for duration without am/pm.
|
2011-01-30 21:42:53 -05:00 |
|
martin
|
eeaa7da6f5
|
-all songs of the current show are now highlighted in the now playing datatable.
|
2011-01-30 20:12:07 -05:00 |
|
naomiaro
|
092b36c346
|
checks on dates, UI work mostly done
|
2011-01-30 20:11:18 -05:00 |
|
martin
|
dc6fcec0e3
|
-user name shows in the top right corner.
-fixed bug with development mode not being recognized by Zend.
|
2011-01-30 18:20:47 -05:00 |
|
martin
|
0ba5a1f520
|
-bug CC-1823 should be fixed.
|
2011-01-30 16:47:11 -05:00 |
|
martin
|
7c70385528
|
-added new login screen
|
2011-01-29 13:47:06 -05:00 |
|
Naomi
|
476cf99019
|
added timepicker to add show form.
|
2011-01-28 18:24:52 -05:00 |
|
Naomi
|
38b01ea43f
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-01-28 17:37:55 -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 |
|
martin
|
86efed5793
|
Merge branch 'master' of dev.sourcefabric.org:airtime
|
2011-01-28 16:32:58 -05:00 |
|
martin
|
6651688940
|
-added support to preview mp3+ogg audio (chrome only so far).
|
2011-01-28 16:32:38 -05:00 |
|
Naomi
|
7bd96a7bf4
|
merge fixes
|
2011-01-28 11:34:57 -05:00 |
|
martin
|
c673b12046
|
-began adding basic foundation for show list-view.
|
2011-01-28 11:18:12 -05:00 |
|
martin
|
844baeeae6
|
-started adding show list-view
|
2011-01-28 00:23:39 -05:00 |
|
Naomi
|
7ef4380f25
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-01-27 18:38:24 -05:00 |
|
Naomi
|
f18f500e1e
|
everything is implemented backend wise for schedule dialog, just need to add html/css changes
|
2011-01-27 18:38:02 -05:00 |
|
martin
|
e52d566b83
|
Merge branch 'master' of dev.sourcefabric.org:airtime
|
2011-01-27 15:25:02 -05:00 |
|
martin
|
c64df44a58
|
fix http://dev.sourcefabric.org/browse/CC-1803
|
2011-01-27 15:24:49 -05:00 |
|
Naomi
|
be4d3f5466
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-01-27 15:11:31 -05:00 |
|
Naomi
|
a41c6475f4
|
can drag song to a certain point in the playlist.
|
2011-01-27 15:11:19 -05:00 |
|
martin
|
4441001eca
|
-fixed menu
|
2011-01-27 12:22:38 -05:00 |
|
Naomi
|
e2ac8d54db
|
table tag info wanted by vladimir
|
2011-01-27 12:05:48 -05:00 |
|
martin
|
881bb042a3
|
-made pypo not schedule playlists more than 5 seconds old.
-fixed up some time formatting on the now playing bar
-now-playing datagrid should switch much faster between songs
-updated menu
|
2011-01-27 10:07:30 -05:00 |
|
martin
|
b5a1f0fa81
|
-a lot of code cleanup
|
2011-01-26 23:32:43 -05:00 |
|
martin
|
ac0dd03d82
|
-removed dummy data
|
2011-01-26 21:46:10 -05:00 |
|
martin
|
ea14dd44e9
|
-updated all views to use new menu bar
|
2011-01-26 21:43:56 -05:00 |
|
martin
|
8151ec6429
|
-added now-playing bar with new design!
|
2011-01-26 20:59:56 -05:00 |
|
Naomi
|
9e20e935ca
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-01-26 18:32:27 -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 |
|
martin
|
0f786c5290
|
Merge branch 'master' of dev.sourcefabric.org:airtime
|
2011-01-26 17:09:39 -05:00 |
|
martin
|
5b11025b31
|
-added listen to icecast stream through browser option. Fixed various bugs in now playing screen. added fade support to liquidsoap script
|
2011-01-26 17:08:30 -05:00 |
|
Naomi
|
de3c95bd36
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-01-26 14:18:18 -05:00 |
|
Naomi
|
f6d270616a
|
full functionality of media library now available using datatables, advanced search is not done.
|
2011-01-26 14:17:52 -05:00 |
|
naomiaro
|
c3085c8edf
|
bug fix for deleting repeating shows.
|
2011-01-26 00:12:13 -05:00 |
|
naomiaro
|
a607951ed9
|
adding autocomplete from backend source into add show page.
|
2011-01-25 23:14:35 -05:00 |
|
Naomi
|
a0ecbecf3b
|
datatable supports offset/limit server side fetching of table data. js events are added onto each row. need to fix ordering, searching.
|
2011-01-25 18:41:59 -05:00 |
|
mkonecny
|
c109fb5f01
|
-improved now-playing page
|
2011-01-25 18:41:59 -05:00 |
|
mkonecny
|
ac638c2e39
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-01-25 15:25:37 -05:00 |
|
mkonecny
|
e8d7b59127
|
-datagrid now highlights current song playing
|
2011-01-25 15:25:24 -05:00 |
|
naomiaro
|
057b1a08a6
|
fixing up acl plugin
|
2011-01-25 00:04:40 -05:00 |
|
mkonecny
|
51f77dba50
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-01-24 19:20:06 -05:00 |
|
mkonecny
|
c8b7cffdc6
|
-changes to now playing bar
|
2011-01-24 19:19:51 -05:00 |
|
Naomi
|
1e6f25f148
|
adding autocomplete from backend source to add shows.
|
2011-01-24 18:44:28 -05:00 |
|
Naomi
|
3cd5444f49
|
add show ability is now presented as a screen rather than in a dialog.
|
2011-01-24 17:26:43 -05:00 |
|
mkonecny
|
5173674714
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-01-21 18:15:13 -05:00 |
|
mkonecny
|
6553663051
|
-begin adding datagrids
|
2011-01-21 18:14:59 -05:00 |
|
Naomi
|
edc7c03824
|
color isn't required
|
2011-01-21 14:58:23 -05:00 |
|
Naomi
|
b3ccd6ab1c
|
can change the colors of shows if set in add show dialog, otherwise takes default from css style sheet.
|
2011-01-21 14:43:38 -05:00 |
|
Naomi
|
7bdfd60ea9
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-01-21 13:25:34 -05:00 |
|
Naomi
|
c83244fb3a
|
add show form is broken up into tabs.
|
2011-01-21 13:25:12 -05:00 |
|
Naomi
|
42e2e0d407
|
working on add show screen, using subforms and jqueryUI tabs to separate adding show decisions.
|
2011-01-20 18:30:53 -05:00 |
|
mkonecny
|
8d5aea0d14
|
-basic now playing bar
|
2011-01-20 17:14:14 -05:00 |
|
mkonecny
|
7bed63e675
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-01-19 18:38:13 -05:00 |
|
mkonecny
|
7450195854
|
-basic now-playing toolbar. Some data still needs to be populated.
|
2011-01-19 18:32:20 -05:00 |
|
naomiaro
|
2ff9765fdf
|
fixed bug when generating shows for calendar.
|
2011-01-19 16:50:30 -05:00 |
|
Naomi
|
e27c42fef6
|
deleting repeating shows only deletes shows in the future, but having problems with full calendar caching results or something so display on calendar can be incorrect.
|
2011-01-19 15:21:11 -05:00 |
|
Naomi
|
d770125206
|
cues/fades now in content editable span.
|
2011-01-18 13:34:36 -05:00 |
|
Naomi
|
e335d6d89f
|
small fixes to media library, artist now says creator.
|
2011-01-17 14:11:56 -05:00 |
|
Naomi
|
6376a25463
|
cue/fade editor done for new playlist builder
|
2011-01-17 13:55:43 -05:00 |
|
naomiaro
|
70f7cb6edc
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-01-17 10:40:28 -05:00 |
|
mkonecny
|
0d2314cf32
|
fixed schedule.php warning
|
2011-01-17 02:32:51 -05:00 |
|
naomiaro
|
7cf55e0201
|
side playlist looks good.
|
2011-01-16 23:43:12 -05:00 |
|
naomiaro
|
9b4f9c8aa4
|
changed cue in edit to happen when cliplength clicked to avoid event problems with moving playlist items.
|
2011-01-16 20:40:34 -05:00 |
|
naomiaro
|
8887ce24d1
|
can get cues/fades to display in new playlist builder.
cannot change them yet.
|
2011-01-16 19:31:10 -05:00 |
|
naomiaro
|
3674989461
|
set up fade buttons with some style. simple javascript to highlight the active choice for either editing fades or cues.
|
2011-01-16 18:37:02 -05:00 |
|
naomiaro
|
ccb36c8106
|
changed to better looking theme with newer version of jquery UI. Can create new playlists on the side.
|
2011-01-16 17:12:02 -05:00 |
|
naomiaro
|
91e0db7647
|
forgot to change some names to remove sideplaylist scripts.
|
2011-01-16 16:00:44 -05:00 |
|
naomiaro
|
01df8d8d6b
|
CC-1708 added x instead of input to remove items. Merging side playlist and playlist into one.
|
2011-01-16 15:35:00 -05:00 |
|
naomiaro
|
e269b74e25
|
show contents mostly styled, playlist choices needs work.
|
2011-01-16 00:11:16 -05:00 |
|
naomiaro
|
e3cf552a22
|
arrows switch properly for scheduled description.
|
2011-01-15 20:53:31 -05:00 |
|
naomiaro
|
86a4998e0a
|
shows time filled in show, with progress bar and time.
|
2011-01-15 18:23:15 -05:00 |
|
naomiaro
|
25c7d4cb90
|
backend mostly done for show, can remove a scheduled group from a show.
|
2011-01-15 14:59:41 -05:00 |
|
naomiaro
|
f2560a6aa6
|
when deleting a group following groups in show update their times.
|
2011-01-15 13:10:10 -05:00 |
|
Naomi
|
61c826f8ed
|
Ui for show scheduling
|
2011-01-14 15:35:24 -05:00 |
|
naomiaro
|
a4fb54cd01
|
show and hide file content of scheduled items.
|
2011-01-13 23:44:36 -05:00 |
|
naomiaro
|
f312ea0d60
|
show will open dialog properly showing scheduled content if there is any
|
2011-01-13 18:27:44 -05:00 |
|
naomiaro
|
a8f24952bd
|
updates the playlists that can be chosen for the show.
|
2011-01-13 18:01:15 -05:00 |
|
naomiaro
|
0ffa232b6d
|
schedule show finds playlists available and returns show content better
|
2011-01-13 16:24:10 -05:00 |
|
naomiaro
|
ad869e0f7f
|
will display in the UI what is scheduled in a show when you add things.
|
2011-01-12 19:40:05 -05:00 |
|
naomiaro
|
4d8f28f3fd
|
show content returning info in a useful way
|
2011-01-12 17:52:57 -05:00 |
|
naomiaro
|
1f8ac9719f
|
can add multiple playlists to a show, doesn't check length or update playlists based on time left. GUI is bad.
|
2011-01-12 15:47:44 -05:00 |
|
naomiaro
|
9c23b86c53
|
last of changing database name, removing old files
|
2011-01-10 15:44:13 -05:00 |
|
naomiaro
|
53f49d987d
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-01-10 15:26:47 -05:00 |
|
naomiaro
|
aee0b09749
|
type ahead search in scheduling playlists dialog.
|
2011-01-10 15:26:11 -05:00 |