Gina Häußge 8be1329a71 Merge branch 'devel' into gcodestreaming ... Conflicts: octoprint/printer.py octoprint/static/js/ui.js octoprint/templates/index.jinja2 octoprint/util/comm.py		2013-06-09 18:28:40 +02:00
..
bootstrap	Added missing files	2013-04-14 13:15:54 +02:00
jquery	User management now working	2013-04-13 22:21:53 +02:00
socket.io	User management now working	2013-04-13 22:21:53 +02:00
avltree.js	Made gcode viewer capable of handling progress information	2013-06-09 14:00:15 +02:00
knockout.js	User management now working	2013-04-13 22:21:53 +02:00
less-1.3.3.min.js	Refactored pagination/sorting/filtering of gcode files into own configurable listHelper now used to provide pagination etc to both gcode and timelapse file list.	2013-03-06 23:27:16 +01:00
modernizr.custom.js	New option to sort gcode files by size, reverted former utc "fix" (doesn't work anymore, works without the fix, I have no idea...), added adjusted modernizr, delete metadata from old gcode file version when adding a new one	2013-03-03 19:37:52 +01:00
ui.js	Merge branch 'devel' into gcodestreaming	2013-06-09 18:28:40 +02:00
underscore.js	User management now working	2013-04-13 22:21:53 +02:00