Commit Graph

8 Commits (5b15d428819225b6cd07f162a3b212945d816b01)

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