Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,501 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

226 Commits

Author SHA1 Message Date
mkonecny 1e23907df1 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-03 13:52:28 -05:00
mkonecny a99a742bdc -fix http://dev.sourcefabric.org/browse/CC-1838 2011-02-03 13:52:06 -05:00
Naomi 01c1651232 small fix for reducing js files. 2011-02-03 11:51:26 -05:00
mkonecny 65cc694a90 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-02 18:25:57 -05:00
mkonecny a5ad30356a -refactoring 
-added gaps in Now PLaying DataTable
-show information and song information now sent as separate data in order.
 2011-02-02 18:25:42 -05:00
Naomi 2cdaf4b413 CC-1809 added a dialog to display show contents, anyone has access to this dialog. made sure only hosts can access schedule/clear/delete options on the context menu for future shows. 2011-02-02 18:08:22 -05:00
Naomi bb7890a6f5 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-02 14:59:07 -05:00
Naomi f71a4420a6 removing js that isn't needed, don't have slot minute option on month view. 2011-02-02 14:57:51 -05:00
mkonecny 2165627a81 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-02 14:39:06 -05:00
mkonecny abcd396468 -gaps now show in the now playing data table 2011-02-02 14:38:56 -05:00
Naomi f2b8f1d39d CC-1786 Schedule Show Dialog graphic design has new html/css 2011-02-02 14:29:29 -05:00
Naomi 0bcf69985e working on schedule dialog, reqorked get remaining time function in a show to be better. 2011-02-02 13:39:33 -05:00
Naomi 3adbbf4163 fix for staying on current view. 2011-02-02 11:55:55 -05:00
Naomi ec9d84fc91 change full calendar default view to month. when changing slot minutes now reinits to view you were last looking at. 2011-02-02 11:46:17 -05:00
Naomi a1dee48759 less re-rendering of full calendar. 2011-02-02 10:50:19 -05:00
naomiaro 75649c8430 added ability to change slot widths on the calendar to see small shows. 2011-02-02 01:02:31 -05:00
mkonecny 4f055788d4 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-01 20:29:03 -05:00
mkonecny 71023a52b3 -fixed bug CC-1837 
-show progress-bar will now update even when an audio item is not playing
 2011-02-01 20:28:38 -05:00
Naomi b2f6affee1 needed to add month option for month view 24 hour time. 2011-02-01 18:57:59 -05:00
Naomi 1795547e70 24 hour time 2011-02-01 18:41:32 -05:00
Naomi d0102fa922 changed full calendar to display 24 hour time since shows are added in 24 hour time. 2011-02-01 18:37:33 -05:00
Naomi fab6881731 removing now unused old context menu plugin 2011-02-01 17:46:55 -05:00
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
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
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 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 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
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
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 f18f500e1e everything is implemented backend wise for schedule dialog, just need to add html/css changes 2011-01-27 18:38:02 -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
Naomi 1183b69149 datatable doens't have auto width 2011-01-27 12:13:41 -05:00
Naomi 83c22891af Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-01-27 11:51:27 -05:00
Naomi 8bc2038597 using jqueryUI with datatables 2011-01-27 11:51:02 -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 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 bbe09164ae changed old ids of datepickers so that min/max dates available work. 2011-01-25 23:18:05 -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 e8d7b59127 -datagrid now highlights current song playing 2011-01-25 15:25:24 -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 49cbee9db7 fix to add show dialog if error. 2011-01-21 14:56:04 -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
Naomi dc2208d9ee adding colorpicker plugin to project 2011-01-20 18:29:59 -05:00
mkonecny 8d5aea0d14 -basic now playing bar 2011-01-20 17:14:14 -05:00
naomiaro ee3a1139bb Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-01-19 23:55:38 -05:00
naomiaro e9e7ad187b seeing how to modify a fc event's colour... 2011-01-19 23:55:01 -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
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 84111d23a3 content editable spans will send their value on enter. 2011-01-18 14:57:54 -05:00