Commit graph

3037 commits

Author SHA1 Message Date
Gina Häußge
39a0441f34 Merge branch 'fix/logsDocsBug' into devel 2015-09-28 13:08:42 +02:00
Gina Häußge
9ff5c36370 Fixed a documentation bug 2015-09-28 13:08:35 +02:00
Gina Häußge
f3e242d3a0 Merge remote-tracking branch 'origin/devel' into devel 2015-09-28 13:02:38 +02:00
Gina Häußge
0b4e590a5b Refactored drop zone processing in GcodeFilesViewModel 2015-09-28 13:01:47 +02:00
Gina Häußge
96d479bd67 Merge branch 'fix/noDropFileuploads' into devel 2015-09-28 12:55:54 +02:00
Gina Häußge
1b4ea75466 Fix: Don't have file upload widgets listen to drop events by default
That way they won't be triggered by gcode uploads when all they are interested in
are uploads via a single file input.
2015-09-28 12:55:32 +02:00
Mark Walker
2411b4260e Update css for change 42d754 to the less 2015-09-23 11:51:36 -07:00
Gina Häußge
055a5d06f6 Fix: Correctly persist all changes to gcode scripts 2015-09-23 13:40:41 +02:00
Gina Häußge
0a30438040 Merge branch 'fix/contentTypeHeaderCheck' into devel 2015-09-22 15:43:57 +02:00
Gina Häußge
b4b5689bc4 Fix: Correctly handle unset Content-Type header for command requests 2015-09-22 15:23:50 +02:00
Gina Häußge
b38b38e359 Merge branch 'fix/pmgrPipConfig' into devel 2015-09-22 11:39:55 +02:00
Gina Häußge
fd4271a962 PipCaller: Added back missing member variable 2015-09-22 11:39:45 +02:00
Gina Häußge
2a4ee5072c Merge branch 'fix/pmgrPipConfig' into devel
Conflicts:
	src/octoprint/plugins/pluginmanager/__init__.py
	src/octoprint/util/pip.py
2015-09-22 11:39:02 +02:00
Gina Häußge
65bc28a03e PMGR: Added configuration dialog and info re used pip binary & version 2015-09-22 11:36:57 +02:00
Gina Häußge
c26515c13d PipCaller: Allow update of used pip command 2015-09-22 11:35:47 +02:00
Gina Häußge
25a4d4b79b SWU: Track check origins, ignore if from unavailable plugin
There was a problem with software update checks configurations stored in
config.yaml for which the providing plugin was then removed, since those
check definitions then lacked their default values to be merged on whatever
was stored in config.yaml, causing incomplete check configurations as a
consequence over which the plugin tripped.

This patch fixes that in that it tracks which check config keys are provided
by plugins and only returns those as the active check configurations that
belong to plugins that are still in the system.

TODO: This is only half of the solution. Check configurations of plugins
that are being uninstalled should be removed from the config if the
user decides to remove any settings by the plugin too. We need some
adjustments in the lifecycle tracking in order to make this possible
however, so for now this must suffice to at least prevent any errors from
occuring when incomplete configs are encountered.
(cherry picked from commit 8af8b8f)
2015-09-21 16:46:44 +02:00
Gina Häußge
43ca4d8252 SWU: Do not overwrite check information again
Current version information of OctoPrint from a check definition
could be overwritten for checks under certain circumstances.
2015-09-21 16:42:11 +02:00
Gina Häußge
a05e3a44af Updated tornado, sockjs-tornado and psutil dependencies 2015-09-21 15:00:06 +02:00
Gina Häußge
cbc500a939 Merge branch 'patch-1' of https://github.com/dragondgold/OctoPrint into pr/dragondgold/patch-1 2015-09-21 09:00:04 +02:00
Gina Häußge
d2e2cb814f M400 and proper M114 in virtual printer 2015-09-21 08:41:28 +02:00
Andres
119f3ba45b Fixed wrong urls 2015-09-20 17:44:49 -03:00
Gina Häußge
a431331aa9 Merge pull request #1066 from punkkeks/devel
changed magic line from python->python2
2015-09-19 16:29:17 +02:00
Marcel Hellwig
e46e7b3ee2 changed magic line from python->python2
Since python is sometimes (and for me on arch linux) a symlink to the
python3 utils, you should be more explicit with that.
2015-09-17 18:04:14 +02:00
Gina Häußge
9efa14058d Merge pull request #1060 from CapnBry/estimate-fwretract
Include a time estimate for gcode which uses firmware retract
2015-09-14 19:04:22 +02:00
Bryan Mayland
0253f525b0 Include a time estimate for gcode which uses firmware retract, if retract settings are seen in gcode 2015-09-12 11:32:52 -04:00
Gina Häußge
8af8b8f79a SWU: Track check origins, ignore if from unavailable plugin
There was a problem with software update checks configurations stored in
config.yaml for which the providing plugin was then removed, since those
check definitions then lacked their default values to be merged on whatever
was stored in config.yaml, causing incomplete check configurations as a
consequence over which the plugin tripped.

This patch fixes that in that it tracks which check config keys are provided
by plugins and only returns those as the active check configurations that
belong to plugins that are still in the system.

TODO: This is only half of the solution. Check configurations of plugins
that are being uninstalled should be removed from the config if the
user decides to remove any settings by the plugin too. We need some
adjustments in the lifecycle tracking in order to make this possible
however, so for now this must suffice to at least prevent any errors from
occuring when incomplete configs are encountered.
2015-09-12 11:09:28 +02:00
Gina Häußge
ef06c51154 Added @punkkeks to AUTHORS.md 2015-09-11 11:53:33 +02:00
Gina Häußge
2c0eed266c Fixed some wrong indentation that somehow made it through editorconfig 2015-09-11 11:48:38 +02:00
Gina Häußge
e4ae150457 Merge remote-tracking branch 'origin/devel' into devel 2015-09-11 11:31:35 +02:00
Gina Häußge
96f54ffa63 Merge pull request #1059 from punkkeks/devel
Add errorhandler decorator for the blueprintplugin
2015-09-11 11:30:54 +02:00
Marcel Hellwig
b6053c14f9 add errorhandler decorator to blueprintplugin
This will allow you to add an errorhandler for your blueprint easily.
2015-09-11 11:20:41 +02:00
Gina Häußge
b56ba6589c Ignore update definitions that are lacking the type
Caused a KeyError so far, update definitions that are broken like that
will now just be ignored instead.

Closes #1057
(cherry picked from commit 2efc5c4)
2015-09-11 08:36:02 +02:00
Gina Häußge
5c9b507cb7 User user id, not user name, for all user operations
(cherry picked from commit 7021b9f)
2015-09-11 08:35:08 +02:00
Gina Häußge
7021b9fe89 User user id, not user name, for all user operations 2015-09-11 08:34:05 +02:00
Gina Häußge
cd7ac032f4 Fixed an issue that cause user sessions to not be properly associated
Sessions could get duplicated, wrongly saved etc. The reason was not
persisting the actual user object to the internal session map (but the
LocalProxy instead). That could lead to multiple sessions being
created for one login, or the session user being set to an
anonymous user, or various other odd effects depending on timing.
(cherry picked from commit 8aeac51)
2015-09-11 08:20:16 +02:00
Gina Häußge
2efc5c4fdb Ignore update definitions that are lacking the type
Caused a KeyError so far, update definitions that are broken like that
will now just be ignored instead.

Closes #1057
2015-09-11 08:15:15 +02:00
Gina Häußge
f0ab517857 Merge branch 'dev/uiPlugin' into devel 2015-09-10 16:25:34 +02:00
Gina Häußge
19c8b8e905 Documented UiPlugin type and enhanced existing docs 2015-09-10 15:43:30 +02:00
Gina Häußge
93da761918 Divided Core UI specific render_kwargs and general kwargs
Also refactored version kwarg into dictionary with all three version
information pieces.
2015-09-10 15:43:08 +02:00
Gina Häußge
ff956ca4c4 Merge remote-tracking branch 'origin/devel' into devel 2015-09-09 16:13:59 +02:00
Gina Häußge
8aeac51124 Fixed an issue that cause user sessions to not be properly associated
Sessions could get duplicated, wrongly saved etc. The reason was not
persisting the actual user object to the internal session map (but the
LocalProxy instead). That could lead to multiple sessions being
created for one login, or the session user being set to an
anonymous user, or various other odd effects depending on timing.
2015-09-09 16:13:10 +02:00
Gina Häußge
03460021d2 Merge pull request #1051 from markbastiaans/fix-realpath-checks
Fix checks with os.path.realpath() for systems with symlinked paths
2015-09-08 13:16:39 +02:00
Mark Bastiaans
406fe75bc4 Added name to authors 2015-09-08 13:14:43 +02:00
Mark Bastiaans
b7c9949caf Fixed checks with os.path.realpath() for systems with symlinked paths 2015-09-08 11:35:53 +02:00
Mark Walker
d3abeed3a9 Update changelog for 42d754 fix for #1047 2015-09-07 17:19:16 -07:00
Mark Walker
42d7654009 Fix issue #1047 rotate 90 degrees on iOS Safari
The iOS version of webkit still requires the browser prefixes for
transform, see http://stackoverflow.com/a/27304061/4414220
2015-09-07 11:51:54 -07:00
Gina Häußge
d5b0bd2518 Merge branch 'dev/hook_recieved_line' into devel 2015-09-07 15:42:56 +02:00
Gina Häußge
c1880a7006 New UiPlugin for serving custom UIs on / depending on request 2015-09-07 13:57:10 +02:00
Gina Häußge
38dabfc1c0 Only try to convert sorting_value to int if it's not None 2015-09-07 11:34:09 +02:00
Nicanor Romero Venier
74b0056095 Added info to the hook's docs 2015-09-07 10:52:03 +02:00