Gina Häußge
e96765bc39
Merge branch 'master' into devel
...
Conflicts:
octoprint/static/css/octoprint.less
2013-06-17 22:12:45 +02:00
Gina Häußge
bcf8d54ff3
Merge remote-tracking branch 'origin/master'
2013-06-17 22:10:48 +02:00
Gina Häußge
6876438783
Fix for #153 backported from events branch
2013-06-17 22:10:14 +02:00
Gina Häußge
33731464e5
Merge pull request #145 from daprice/master
...
Improve nav bar appearance when custom colors are used
2013-06-17 04:56:10 -07:00
algspd
d9fb3bb8f6
Added jquery.min.js locally to avoid depending on
...
internet connection on clients which may be
locally and offline
2013-06-17 00:11:17 +02:00
Gina Häußge
4994d488cf
Use span instead of button for upload buttons, otherwise FF and IE hiccup...
...
(cherry picked from commit ee3bc84
2013-06-16 11:39:20 +02:00
Gina Häußge
ee3bc84242
Use span instead of button for upload buttons, otherwise FF and IE hiccup...
2013-06-16 11:38:52 +02:00
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
Gina Häußge
9963c523c0
Do not display -1mm when printing from sd
2013-06-09 18:13:12 +02:00
Gina Häußge
003109d59e
Made gcode viewer capable of handling progress information
...
GCode viewer now updates its visualization (during printing) based on the current progress percentage, not based on the current line (which will not be available any more as part of the progress tuple with gcode streaming)
2013-06-09 14:00:15 +02:00
Dale Price
719c4fab57
Define brand image in CSS instead of an <img> tag to allow it to be styled; add high resolution tentacle brand image for retina/high-res displays; create non-clashing light version of tentacle brand image to be used when darker custom colors are chosen in settings
2013-06-08 18:43:17 -05:00
Gina Häußge
56cb1c294c
Changed to GCODE streaming instead of loading it all into memory -- no more loading times. Also better file handling.
2013-05-31 22:41:53 +02:00
Gina Häußge
b645073f1d
Added SD state evaluation and SD commands
2013-05-26 18:53:43 +02:00
Gina Häußge
16f5e54bd7
Merge branch 'devel' into sdcard
...
Conflicts:
octoprint/server.py
octoprint/settings.py
octoprint/static/js/ui.js
octoprint/util/comm.py
2013-05-23 22:53:34 +02:00
Gina Häußge
b048cc390b
Proper uploading incl. drag-n-drop for both local storage and SD card
2013-05-20 23:31:17 +02:00
Gina Häußge
783b3b8166
Merge branch 'master' into devel
2013-05-20 20:19:26 +02:00
Gina Häußge
039a17d923
First try at SD card support
2013-05-20 19:18:03 +02:00
Gina Häußge
f7334ef65f
Fixed some merge bugs
2013-04-13 22:26:23 +02:00
Gina Häußge
19dc238f06
User management now working
...
Also reorganized javascripts a bit (as preparation for some refactoring coming up) and renamed templates from ".html" to ".jinja2".
2013-04-13 22:21:53 +02:00
