pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2113 commits 20 branches 22 tags 141 MiB
Commit graph

2113 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
b0805a9bae Forgot to commit some files (argh) 2015-01-13 18:20:45 +01:00
Gina Häußge
f9fd4f9009 WIP: refactoring of templates 2015-01-13 18:20:13 +01:00
Gina Häußge
5b6b8b6ad1 And some more moving around of templates 2015-01-13 11:49:28 +01:00
Gina Häußge
8aede1dfe4 Moved settings components into individual template files as well 2015-01-13 11:31:45 +01:00
Gina Häußge
77cdb7bf43 Moved navbar, sidebar and tab contents from index.jinja2 into individual files 2015-01-13 11:20:37 +01:00
Gina Häußge
6880184cbb Increased default communication and connection timeouts 2015-01-13 11:09:42 +01:00
Gina Häußge
84122f9f54 Fixed changelog entry for last commit, was added to wrong section 2015-01-13 11:09:41 +01:00
Gina Häußge
c52d201808 Fix error where API state is requested and printer is offline 
(cherry picked from commit 619fe9a)
 2015-01-13 11:09:41 +01:00
Gina Häußge
466866c323 Merge remote-tracking branch 'origin/devel' into devel 2015-01-13 10:32:59 +01:00
Gina Häußge
be8ffeb724 WIP: Some documentation of plugins 2015-01-13 10:31:56 +01:00
Gina Häußge
868dc6d7a9 Increased default communication and connection timeouts 2015-01-12 17:34:08 +01:00
Gina Häußge
1ddb187518 Fixed changelog entry for last commit, was added to wrong section 2015-01-12 17:25:02 +01:00
Gina Häußge
b7badcbf02 Fix error where API state is requested and printer is offline 
(cherry picked from commit 619fe9a)
 2015-01-12 16:55:38 +01:00
C-o-r-E
684d12e60e Fix error where API state is requested and printer is offline 
(cherry picked from commit 619fe9a)
 2015-01-12 16:53:17 +01:00
Gina Häußge
4e4ad0be8b Fixed file sending to SD card 
Closes #709
 2015-01-12 16:00:37 +01:00
Gina Häußge
f238ef40ec Better error validation for printer profiles 
Data types loaded from disk were not properly ensured to match expected types and input validation also had deficits.

Should fix #714
 2015-01-12 15:07:14 +01:00
Gina Häußge
f5eef06e88 Fixed wrong variable name 
Closes #715
 2015-01-12 10:45:39 +01:00
Gina Häußge
76f7a40b7f Added changelog entry for PR #610 2015-01-12 09:59:51 +01:00
Gina Häußge
778d3f2853 Merge remote-tracking branch 'origin/devel' into devel 2015-01-12 09:46:15 +01:00
Gina Häußge
2ba681573f Key controls are now enabled when you mouse over the webcam picture, indicated by an overlay 
Also moved key control help in that overlay
 2015-01-12 09:40:45 +01:00
Gina Häußge
edafee7b22 Added setting to enable/disable the keycontrol feature 2015-01-12 09:37:52 +01:00
Gina Häußge
52056b0eeb Merge branch 'devel_keycontrol' of https://github.com/nEuDy/OctoPrint into nEuDy-devel_keycontrol 
Conflicts:
	src/octoprint/static/css/octoprint.css
 2015-01-10 13:56:51 +01:00
Gina Häußge
5a3df191a5 Merge pull request #712 from rspeed/sigterm-fix 
Daemon cleans up pidfile when receiving a SIGTERM
 2015-01-10 12:32:30 +01:00
Rob Speed
062131a10e Renamed delpid to term to better match its modified behavior. Moved the registration of the SIGTERM handler to avoid an extremely unlikely race condition. 2015-01-10 01:34:47 -08:00
Rob Speed
6c78049886 Fixes issue where a daemonized OctoPrint doesn't clean up after itself after receiving SIGTERM. 2015-01-10 00:24:25 -08: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