Commit graph

284 commits

Author SHA1 Message Date
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