Commit graph

1490 commits

Author SHA1 Message Date
Gina Häußge
2b856e4508 Forgot to check in the new VERSION file 2013-12-02 17:42:20 +01:00
Gina Häußge
ac75ee9831 Starting documentation based on Sphinx 2013-12-02 17:40:31 +01:00
Gina Häußge
9f7fc73441 data["print"] is now a boolean, so we don't need to check against valid_boolean_trues anymore but can use it directly instead
Fixes #317
2013-11-25 16:54:44 +01:00
Gina Häußge
677d33e448 Fixed sending of command again. Also now make g and m codes appear in uppercase automatically. 2013-11-25 11:46:24 +01:00
Gina Häußge
1dd0aba8f5 More intelligent handling of disabling and re-enabling the webcam stream.
See #314
2013-11-24 17:33:05 +01:00
Gina Häußge
1b4a7c7896 Disable webcam stream when control tab is not in focus.
Fixes #316
2013-11-24 16:55:14 +01:00
Gina Häußge
5b8126ae17 Use G28 for homing (G1 was a copy-paste-error)
Fixes #314
2013-11-24 13:12:02 +01:00
Gina Häußge
a1350c9344 Corrected merge bugs 2013-11-20 22:01:09 +01:00
Gina Häußge
84012d1232 Properly calculate time deltas (forgot the days) 2013-11-20 22:00:47 +01:00
Gina Häußge
0199599880 Merge branch 'master' into devel
Conflicts:
	octoprint/server.py
	octoprint/util/__init__.py
	setup.py
	src/octoprint/printer.py
	src/octoprint/static/js/app/main.js
	src/octoprint/templates/index.jinja2
2013-11-20 21:57:20 +01:00
Gina Häußge
2f3c3c0c20 Properly calculate time deltas (forgot the days)
Fixes #313
2013-11-20 20:22:03 +01:00
Gina Häußge
e690053fd4 Added user apikeys, made ajax api available via apikeys, restified ajax api (WIP) 2013-11-19 22:53:26 +01:00
Gina Häußge
ae3e474c92 Fix relative path to git root 2013-11-18 13:35:40 +01:00
Gina Häußge
297d101f5f Only apply the temperature offset if the temperature being set from the GCODE isn't 0 ("heaters off") 2013-11-18 11:35:38 +01:00
Gina Häußge
4d2213544e Made metadata saving for gcode files more error resilient (hopefully that is) 2013-11-15 20:54:13 +01:00
Gina Häußge
895d077d85 Refactored parts of comm.py to reduce length of _monitor 2013-11-11 22:03:15 +01:00
Gina Häußge
35b010b059 Better fitting error message when opening a known serial port fails (e.g. due to permission problems), auto detection errors now got their own message
Fixes #294
2013-11-10 20:29:37 +01:00
Gina Häußge
204128e1ca Fixed #296
(cherry picked from commit fdfa433)
2013-11-10 18:57:44 +01:00
Gina Häußge
fdfa433243 Fixed #296 2013-11-10 18:55:36 +01:00
Gina Häußge
aa69d181bf Fixed load API 2013-11-10 17:31:55 +01:00
Gina Häußge
e9f218208d Merge remote-tracking branch 'origin/devel' into devel 2013-11-09 20:30:04 +01:00
Gina Häußge
8ca3baee04 Fixed a couple of things with the new blueprints, should work now 2013-11-09 20:26:18 +01:00
Gina Häußge
3c68353c57 Merge pull request #293 from tonnerre/sane-ulimit
Don't give everyone write access to octoprint data.
2013-11-04 09:22:32 -08:00
Gina Häußge
fe37ab3cd8 Refactored server.py into submodules, extracted ajax and rest api into their own blueprints, and while doing all this also took care of #291 2013-10-28 22:08:36 +01:00
Gina Häußge
f2b0bfb7dc Merge pull request #292 from tonnerre/devel
Remove the version name from the minified less.js version.
2013-10-27 10:58:52 -07:00
Tonnerre LOMBARD
f7f8c09a77 Actually, umask 002 is what we want here. 2013-10-27 02:39:29 +02:00
Tonnerre LOMBARD
37c949e83b Currently, octoprint gives write access to all files in its data
directory to everybody.

This was probably considered appropriate for the case of octoprint
running on a single-user device, but given that Unix has groups
support, it is not necessary, and can be very harmful.
2013-10-27 02:32:14 +02:00
Tonnerre LOMBARD
b35258fad6 Remove the version name from the minified less.js version. 2013-10-26 23:28:38 +02:00
Gina Häußge
1a6030c737 Added missing docstring 2013-10-21 10:29:59 +02:00
Gina Häußge
9008a2fb7f Moved axes inverting to printer settings, changed naming and data format a bit 2013-10-20 22:22:58 +02:00
Gina Häußge
47f8ab24d9 Introduced event queue to properly decouple event processing from firing 2013-10-20 22:21:42 +02:00
Gina Häußge
4b41a47f93 Merge branch 'CapnBry-invertany' into devel
Conflicts:
	src/octoprint/templates/settings.jinja2
2013-10-20 15:28:18 +02:00
Gina Häußge
5d69ee8abc Added installation section to README with links to the setup guides in the Wiki and OctoPi 2013-10-20 15:24:13 +02:00
Gina Häußge
edd801aa7b Only process gcode files during backlog processing (compare #268) 2013-10-20 15:05:22 +02:00
Gina Häußge
ef8787acf9 Removed obsolete GcodeLoader in printer module
(cherry picked from commit a7eb5f6493)
2013-10-20 15:03:14 +02:00
Gina Häußge
29a9ee40d5 SwallowOkAfterResend isn't repetier only anymore
(cherry picked from commit 48f5a44)
2013-10-20 14:53:31 +02:00
Gina Häußge
4094d28c07 Make swallowOkAfterResend default to True, part of the fix for #166
(cherry picked from commit 5a6cd58)
2013-10-20 14:52:37 +02:00
Gina Häußge
20df2b330b Preparing official "release" of a first rc to help in packaging 2013-10-20 14:39:38 +02:00
Gina Häußge
a7eb5f6493 Removed obsolete GcodeLoader in printer module 2013-10-20 14:37:10 +02:00
Gina Häußge
48f5a44bc5 SwallowOkAfterResend isn't repetier only anymore 2013-10-20 14:36:40 +02:00
Gina Häußge
5a6cd58f19 Make swallowOkAfterResend default to True, part of the fix for #166 2013-10-20 14:35:03 +02:00
Gina Häußge
3b56cdaaa3 Unbind old click handlers from confirmation dialog before use.
Fixes #279
2013-10-13 19:38:04 +02:00
Gina Häußge
f62e868c02 Unbind old click handlers from confirmation dialog before use.
Fixes #279
2013-10-13 19:33:19 +02:00
Gina Häußge
079806f11c Merge pull request #278 from DanLipsitt/patch-1
Delete empty .gitmodules
2013-10-13 03:43:11 -07:00
DanLipsitt
69052d7670 Delete empty .gitmodules
The empty .gitmodules file creates problems with git<->bzr interop.
2013-10-11 16:23:27 -07:00
Bryan Mayland
2afd715f77 Move the Invert Controls checkboxes to the bottom of the settings dialog
Also replace my tabs with space. We're doing spaces instead of tabs now?
Maybe just for html.
2013-09-26 09:44:33 -04:00
Bryan Mayland
8d78104be8 Allow inverting of any control axis from the webui, not just Z
Users who have already set the "invert Z" option must re-enable the
setting as the storage of the option has changed.
2013-09-26 09:41:09 -04:00
Gina Häußge
b51da4bd1a Properly restart sd prints
Fixes #258
(cherry picked from commit 076c676)
2013-09-23 21:59:48 +02:00
Gina Häußge
076c6764a0 Properly restart sd prints
Fixes #258
2013-09-23 21:57:54 +02:00
Gina Häußge
8ff48ed88d Moved filetype decision stuff into gcodefiles module 2013-09-23 21:36:12 +02:00