Commit Graph

3387 Commits

Author SHA1 Message Date
martin be79b21c37 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-02-01 15:31:38 -05:00
Naomi 3d6d31a535 newest css sheets 2011-02-01 15:15:07 -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 7751ad7ac7 small css add for pause button 2011-01-31 14:32:27 -05:00
Naomi 7739b20cae slight change so new css on old html looks ok for release RC-1 2011-01-31 14:01:05 -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 24da57ae4f CC-1811 schedule view/add show screens make calendar height less than one screen size to prevent outer browser scrollbar. 2011-01-31 10:00:26 -05:00
naomiaro dc2b59a634 removing forgotten alert... 2011-01-31 02:10:40 -05:00
naomiaro 275e31cb77 using innerheight property. 2011-01-31 02:09:25 -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 629f6db6a4 newer css. 2011-01-30 21:58:19 -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 2310c24f26 CC-1823 definitely fixed now. 2011-01-30 17:27:58 -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
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
Paul Baranowski c530d7d9d8 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-01-28 18:30:17 -05:00
Paul Baranowski c0144fb0be CC-1826 Restarting Pulseaudio kills liquidsoap player
Daemontools doesnt do an adequate job of killing the liquidsoap process.
Added a "killall" to make sure the process is really killed.
2011-01-28 18:29:53 -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 726849539f -fixed Now Playing datatable font size 2011-01-28 17:33:51 -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 381cdc11a9 CC-1791 favicon added to public folder. 2011-01-28 16:32:09 -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 619fad9e4b -formatting 2011-01-27 14:18:11 -05:00
martin 14e049631e -should fix delay in rendering the now playing bar when song starts. 2011-01-27 14:17:35 -05:00
martin 4441001eca -fixed menu 2011-01-27 12:22:38 -05:00