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

3174 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
f52afb8660 Fixed translation feels not being properly copied over during installation 
Should solve initial problem reported in #720
 2015-01-15 16:28:22 +01:00
Gina Häußge
f2e98265e7 Fix generic plugin includes again (was still depending on a removed variable) 2015-01-15 15:13:55 +01:00
Gina Häußge
bb7aa6544f Adjusted bundled Cura plugin to not define already defined folder paths again, now included automatically 2015-01-15 14:53:23 +01:00
Gina Häußge
2324a1bf0e Correctly set custom element styles on navbar and tab items 2015-01-15 14:42:58 +01:00
Gina Häußge
ca278985b0 Correctly set selected element on first load in settings 2015-01-15 14:42:27 +01:00
Gina Häußge
4a9be80c98 Fixed login dialog again 2015-01-15 14:21:32 +01:00
Gina Häußge
23387d6e48 More work on the template refactoring and new template plugin types 2015-01-15 11:06:59 +01:00
Renha
6cf0550312 Bugfix for Invalid cross-device link on Linux when /tmp is on another fs 2015-01-13 22:24:35 +00:00
Gina Häußge
73466bb513 Merge branch 'devel' into dev/templateRefactoring 2015-01-13 18:27:10 +01:00
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
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