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
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
Mark Bastiaans
b7c9949caf
Fixed checks with os.path.realpath() for systems with symlinked paths
2015-09-08 11:35:53 +02: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
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
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
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
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
50bff32cd5
Merge branch 'devel' of https://github.com/Mikk36/OctoPrint into pr/Mikk36/devel
2015-09-02 15:09:36 +02:00
Mikk Kiilaspää
2692044c13
Associate Z-lift moves with the layer they were made on
2015-09-02 15:50:36 +03:00
Mikk Kiilaspää
783fbd9c1e
Fix formatting
2015-09-02 15:49:02 +03:00
Gina Häußge
628a9f43e9
Let's up the restart-detection-timeout a bit
...
Just for experimental purposes.
2015-09-02 11:34:32 +02:00
Gina Häußge
b52422db2e
Simplifier comm _monitor thread a bit
...
Should now also trigger comm timeouts when not printing
2015-09-02 09:36:34 +02:00
Gina Häußge
a79e38a350
Settings saving now supports callbacks, SWU plugin utilizes those
2015-09-01 17:18:08 +02:00
Gina Häußge
8294082652
Fix: properly save terminal filters
2015-09-01 16:26:57 +02:00
Gina Häußge
098c169ca5
SWU: Do not show "settings refreshed" dialog when saving plugin settings
2015-09-01 10:43:52 +02:00
Gina Häußge
42e11acb44
Fixed a merge error
2015-09-01 09:42:44 +02:00
Gina Häußge
4f3e2d7f49
Merge branch 'maintenance' into devel
...
Conflicts:
.versioneer-lookup
CHANGELOG.md
src/octoprint/plugins/softwareupdate/__init__.py
src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js
src/octoprint/plugins/softwareupdate/updaters/pip.py
src/octoprint/plugins/softwareupdate/updaters/update_script.py
src/octoprint/plugins/virtual_printer/virtual.py
src/octoprint/server/util/sockjs.py
src/octoprint/server/views.py
src/octoprint/static/css/octoprint.css
src/octoprint/static/js/app/helpers.js
src/octoprint/static/js/app/viewmodels/settings.js
src/octoprint/templates/dialogs/settings.jinja2
src/octoprint/templates/dialogs/settings/features.jinja2
src/octoprint/templates/dialogs/settings/server.jinja2
src/octoprint/translations/de/LC_MESSAGES/messages.mo
src/octoprint/translations/de/LC_MESSAGES/messages.po
src/octoprint/util/comm.py
translations/de/LC_MESSAGES/messages.mo
translations/de/LC_MESSAGES/messages.po
translations/messages.pot
2015-09-01 08:34:24 +02:00
Gina Häußge
96fc70bdb2
Preparing release of 1.2.5
2015-08-31 10:28:52 +02:00
Gina Häußge
8ed0befd62
Fixed bug that made browser crash when trying to log in
...
Trying to serialize view models or browser events as username/password probably was not the best of ideas ;)
(cherry picked from commit c7fd480
2015-08-31 09:44:52 +02:00
Salandora
7d50563666
Custom Control fix in less file
...
(cherry picked from commit 10ad8dd
2015-08-31 09:26:20 +02:00
Gina Häußge
8fddd8dd87
Updated CSS
2015-08-31 09:19:39 +02:00
Salandora
10ad8dd953
Custom Control fix in less file
2015-08-31 08:54:03 +02:00
Gina Häußge
9b9ecfe9be
Two new callbacks for RepeatedTimer when cancelled or condition untrue
2015-08-28 16:53:22 +02:00
Salandora
4011f60ff9
Edge Fix
...
Thanks @foosel for the Informations
Conflicts:
src/octoprint/server/views.py
2015-08-28 09:36:47 +02:00
Gina Häußge
37950cb466
Fixing some more merge errors
2015-08-28 08:58:12 +02:00
Gina Häußge
5df088cfee
Merge pull request #1035 from Salandora/edgeFix
...
Edge Fix
2015-08-28 08:57:38 +02:00
Gina Häußge
2824b967ff
Fixed a merge error
2015-08-28 08:20:20 +02:00
Gina Häußge
7b8bf2cf5c
M112 support or the virtual printer
...
(cherry picked from commit 22a6604
2015-08-28 08:19:03 +02:00
