Teja
8d5cc52ee5
Merge branch 'mrbeam' into update_merge
...
Conflicts:
src/octoprint/plugins/cura/__init__.py
src/octoprint/plugins/cura/profile.py
src/octoprint/printer/__init__.py
src/octoprint/server/__init__.py
src/octoprint/server/api/printer.py
src/octoprint/server/api/settings.py
src/octoprint/static/js/app/main.js
src/octoprint/static/js/app/viewmodels/control.js
src/octoprint/static/js/app/viewmodels/settings.js
2015-01-22 17:51:28 +01:00
Teja
b41032cc1c
Merge branch 'mrbeam' into update_merge
2015-01-21 20:50:36 +01:00
Teja
cb983a4b38
code cleanup
2015-01-21 19:09:26 +01:00
Teja
3184b0251f
bugfixes! state model works again. feature: printing of placed svg files & direct gcode.
2015-01-21 17:38:53 +01:00
Teja
5ef6600ab6
bugfix. fixed status message filter in terminal
2015-01-21 12:31:41 +01:00
Teja
f19d2deffa
bugfix. working area svg stays where it is on modal dialogs.
2015-01-21 12:26:16 +01:00
Teja
a49f2b721f
meaningful gcode names
2015-01-21 11:54:46 +01:00
Teja
aab27fa181
progress in direct lasering the working area
2015-01-20 21:55:37 +01:00
Teja
33c3bd401c
force homing cycle if machine is locked.
2015-01-19 11:59:42 +01:00
Teja
1491d995cf
slicing works again after dealing with svg namespaces.
2015-01-18 22:33:04 +01:00
Teja
0c68913e56
first preview draft
2015-01-14 15:21:02 +01:00
Teja
59368ca240
grbl state alarm treatment
2015-01-09 21:47:57 +01:00
Philipp Engel
221ea637be
Merge remote-tracking branch 'upstream/devel' into mrbeam
...
Conflicts:
src/octoprint/printer/__init__.py
src/octoprint/server/__init__.py
src/octoprint/settings.py
src/octoprint/static/css/octoprint.css
src/octoprint/static/js/app/main.js
src/octoprint/static/js/i18n/de.js
src/octoprint/static/js/i18n/fr.js
src/octoprint/static/js/i18n/he.js
src/octoprint/static/js/i18n/nl.js
src/octoprint/static/js/i18n/no.js
src/octoprint/static/js/i18n/ro.js
src/octoprint/templates/index.jinja2
src/octoprint/templates/settings.jinja2
src/octoprint/translations/de/LC_MESSAGES/messages.mo
src/octoprint/translations/de/LC_MESSAGES/messages.po
src/octoprint/translations/fr/LC_MESSAGES/messages.mo
src/octoprint/translations/fr/LC_MESSAGES/messages.po
src/octoprint/translations/he/LC_MESSAGES/messages.mo
src/octoprint/translations/he/LC_MESSAGES/messages.po
src/octoprint/translations/messages.pot
src/octoprint/translations/nl/LC_MESSAGES/messages.mo
src/octoprint/translations/nl/LC_MESSAGES/messages.po
src/octoprint/translations/no/LC_MESSAGES/messages.mo
src/octoprint/translations/no/LC_MESSAGES/messages.po
src/octoprint/translations/ro/LC_MESSAGES/messages.mo
src/octoprint/translations/ro/LC_MESSAGES/messages.po
src/octoprint/util/comm.py
2015-01-09 18:11:40 +01:00
Teja
a87131ac1f
safety glasses popups
2015-01-09 16:47:08 +01:00
Teja
209de59714
styles... laser button color and animation
2015-01-09 16:21:09 +01:00
Teja
dc7576a9ef
save button replaced with auto saving.
2015-01-09 13:11:20 +01:00
Teja
b003c5ed0a
focus tab ... first draft
2015-01-08 22:50:54 +01:00
Teja
367712520b
fixed the M110 N... timeout.
2015-01-08 21:41:48 +01:00
Teja
77a827d5b1
visual fixes for jog distance slider
2015-01-08 20:24:28 +01:00
Teja
c097815a15
slicing works again. slider for jog distance. footer links open in new tab
2015-01-08 20:16:36 +01:00
Teja
36545f4bde
svgtogcode plugin settings persistance fixed
2015-01-08 16:12:14 +01:00
Teja
93acccf522
frequent position updates
2015-01-08 13:38:30 +01:00
Teja
cf23781326
lots of visual fixes. z-axis support
2015-01-08 12:13:56 +01:00
Teja
b2e3c07e73
working area resizing dynamically, coordinate conversion accordingly.
2015-01-07 22:47:50 +01:00
Teja
719feba921
working area dynamically enlarged as much as possible
2015-01-07 20:47:46 +01:00
Teja
cc68a06ce0
removed cura plugin, machine pos, terminal, controls
2015-01-07 16:45:06 +01:00
Teja
de58b08e90
zaxis setting, settings not a popup anymore
2015-01-04 18:24:52 +01:00
Teja
6f6c07c3dc
position updates are working right now.
2015-01-03 20:06:26 +01:00
Teja
358677f42c
movement of the laser via mouseclick works
2015-01-03 14:37:25 +01:00
Gina Häußge
3d5fdf2a91
Fixed bug that caused SSDP discovery not to work anymore
...
Blueprint was protected by API key which lead to the discovery.xml
file not being retrievable.
2015-01-01 01:52:41 +01:00
Gina Häußge
c9c4066331
Fixed a bunch of doc issues, updated /api/printer/command to have more meaningful error messages
2014-12-31 15:47:12 +01:00
Gina Häußge
835b973bdc
Merge branch 'patch-1' of https://github.com/bortek/OctoPrint into devel
...
Conflicts:
docs/api/printer.rst
2014-12-31 15:19:18 +01:00
Gina Häußge
bf6a32907c
Ported possibility to set external host via headers from reverse proxy to the devel branch
2014-12-31 15:09:31 +01:00
bortek
2b7885c3f8
Update printer.rst
2014-12-30 12:18:39 +01:00
Gina Häußge
749af60796
Merge branch 'master' into devel
...
Conflicts:
src/octoprint/server/util.py
src/octoprint/settings.py
src/octoprint/templates/index.jinja2
2014-12-30 10:49:03 +01:00
Gina Häußge
87ddcac2fc
Don't user server.host but server.forwardedHost as fallback for generated external URLs
...
Closes #698
2014-12-30 10:20:50 +01:00
Gina Häußge
e3383fe4c1
Generated URLs now take X-Forwarded-Host header sent by proxies into account for included host and port
2014-12-29 20:48:33 +01:00
Gina Häußge
292856e1bd
Fixed relative URL to sockjs endpoint, wasn't yet using the proper base url
2014-12-29 20:45:54 +01:00
Gina Häußge
3dacaaf03a
Merge branch 'master' into devel
2014-12-28 00:20:11 +01:00
Gina Häußge
6307b765e3
Only decrement the image counter if it is set and larger than 0
...
Backported from devel
2014-12-28 00:19:55 +01:00
Gina Häußge
eb2561175d
Merge branch 'master' into devel
...
Conflicts:
setup.py
src/octoprint/timelapse.py
2014-12-28 00:18:49 +01:00
Gina Häußge
a30e41f0b4
Timelapses: Do not try to use image counter if still set to None and synchronize decrementing of image counter via mutex as well
...
Possible fixes for #693 , the latter maybe also for #690
2014-12-28 00:12:19 +01:00
Gina Häußge
51341f6722
Added removal of pyc files (and their parent folders if they are empty after that) to the python setup.py clean command
...
(cherry picked from commit 9e014eb
2014-12-28 00:00:57 +01:00
Gina Häußge
fb15751703
Decrease image counter if an image could not be captured from webcam
...
Should keep rendering of timelapse from breaking if only a couple of images couldn't be captured due to whatever reason. Suggested by @midopple in #344
(cherry picked from commit bf9d5ef
2014-12-27 23:55:23 +01:00
Gina Häußge
a0105bcb2f
Better error handling for capture issues during timelapsing
...
Should help debugging issue #425 and any future problems in that area.
(cherry picked from commit 1a7a468
2014-12-27 23:52:38 +01:00
Teja
96223a53fe
quick fix. avoids sending M110 N0 command as it is not supported by grbl. fixes #2
2014-12-22 13:14:54 +01:00
Teja
b85ee58b4e
fixes fan on / off buttons. adds a focus disable button.
2014-12-22 12:57:29 +01:00
Gina Häußge
103e0796b7
Request available slicers and slicing profiles from backend asynchronously when opening the slicing dialog
...
Should make sure that slicers and new profiles are detected correctly even without reload.
Could maybe help with #689
2014-12-21 15:57:23 +01:00
Gina Häußge
363b23d6e3
Better handling of errors while sending to (disconnected) clients on the websocket
2014-12-21 15:47:24 +01:00
Gina Häußge
52ad02a08a
Updated the changelog with a lot of stuff that gone done the past weeks
2014-12-21 15:32:30 +01:00
