Commit graph

3012 commits

Author SHA1 Message Date
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
7021b9fe89 User user id, not user name, for all user operations 2015-09-11 08:34:05 +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
Nicanor Romero Venier
fa95507177 Included an early return if ret is None
Also corrected typos, received instead of recieved.
2015-09-07 10:04:06 +02:00
Gina Häußge
b326b6bd33 Merge branch 'dev/tabCycleLogin' into devel 2015-09-07 09:35:35 +02:00
Gina Häußge
9f49e39333 We do that tab cycling slightly differently
Moving from the button to the username field probably makes even more
sense and while we are at it we can also extract the element access into
proper variables.
2015-09-07 09:35:28 +02:00
Gina Häußge
c98f1332be Some tests for the new plugin core functionality 2015-09-04 16:43:10 +02:00
Gina Häußge
8abf152d40 SorteablePlugin => SortablePlugin 2015-09-04 16:42:49 +02:00
Gina Häußge
e4dd4483d4 Sanity checking of the order data returned by plugins 2015-09-04 16:08:57 +02:00
Gina Häußge
89ccfae919 Fixed get_filtered_implementation again
Apparently, *args and named but optional arguments in combination are
more tricky to get right than they first appear.
2015-09-04 15:54:48 +02:00
Gina Häußge
5863f99b75 Always sort plugins by their identifier by default 2015-09-04 15:38:15 +02:00
Gina Häußge
2a52b6d1a2 Allow sorting of Startup and ShutdownPlugins 2015-09-04 15:01:35 +02:00
Gina Häußge
44c76fa70b Made hooks and templates sortable 2015-09-04 11:25:27 +02:00
Nicanor Romero Venier
c2c5d96f8f Modified tab cycle in Login dialog
The cycle now includes the 'remember' checkbox.
2015-09-04 10:05:20 +02:00
Gina Häußge
aa6998ec5e Merge branch 'dev/increase_temp_polling' into devel 2015-09-03 19:01:16 +02:00
Gina Häußge
64bb1adf8c Added CHANGELOG entry for second temperature polling interval 2015-09-03 18:59:05 +02:00
Gina Häußge
f6acca5db2 Set default value for temperature polling when target is set to 2s
1s might be a bit fast as a default for certain boards, so better leave it at
something less spammy.
2015-09-03 18:57:11 +02:00
Nicanor Romero Venier
ced18c86e0 Added docs for the gcode.recieved hook 2015-09-03 18:43:07 +02:00
Gina Häußge
24f769ff80 Moved both temperature intervals into the same "section" 2015-09-03 17:46:03 +02:00
Gina Häußge
f2c07e8f96 First throw at an "About" dialog 2015-09-03 17:08:15 +02:00
Nicanor Romero Venier
d1612e426a Added hook for recieved lines 2015-09-03 17:07:33 +02:00
Nicanor Romero Venier
1e93638794 Changed UI layout for the temperature interval 2015-09-03 15:52:43 +02:00
Nicanor Romero Venier
558465fdcd Added a new timeout for polling when a target temperature is set 2015-09-03 15:23:44 +02:00
Gina Häußge
540cf4f4d9 Merge branch 'maintenance' into devel
Conflicts:
	.versioneer-lookup
	CHANGELOG.md
2015-09-02 20:19:29 +02:00
Gina Häußge
a2e5fc0c5c maintenance branch is now 1.2.7-dev 2015-09-02 20:18:18 +02:00
Gina Häußge
536bb31965 Forgot the commit link in the changelog 2015-09-02 19:59:49 +02:00
Gina Häußge
ef46a49430 Also included #1041 in 1.2.6 2015-09-02 19:55:24 +02:00
Gina Häußge
8e28ddd6a4 Fixed versioneer lookup file again
Runaway regex ;)
(cherry picked from commit 78277ac)
2015-09-02 19:53:18 +02:00