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
d5b0bd2518
Merge branch 'dev/hook_recieved_line' into devel
2015-09-07 15:42:56 +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
Gina Häußge
9299cb54a4
Improved M112 handling
...
Use new synchronized sending method and also make sure that heaters
will get disabled in case M112 is NOT understood by the firmware
before disconnecting. That's about all we can do for now.
(cherry picked from commit 5406b2b
2015-08-28 08:12:12 +02:00
Gina Häußge
b965d4cbde
comm: Synchronized write access to line number
...
New method wraps line sending and incrementing
(cherry picked from commit f8e72c9
2015-08-28 08:11:56 +02:00
Mark Walker
7d922f3c77
Clean up the comment
...
(cherry picked from commit f519070
2015-08-28 08:09:16 +02:00
Mark Walker
7e894d2ac2
ClearableQueue redundant with self.close
...
Closing the printer connection and then reopening (when the users clicks
connect) will create a new fresh MachineCom object so the queues will
start out empty. Plus ClearableQueue was even more tied to the Queue
implementation that the current _get/_put overrides.
(cherry picked from commit e7584cd
2015-08-28 08:09:02 +02:00
Mark Walker
948e20b269
Send M112 to printer immediately
...
Address #1031 with an immediate send of M112 followed by closing the
serial connection to reset the host state
(cherry picked from commit 3d1d745
2015-08-28 08:08:26 +02:00
Salandora
5c257758ad
Edge Fix
...
Thanks @foosel for the Informations
2015-08-28 06:31:25 +02:00
Gina Häußge
0e863ad776
Made diskspace running low a bit more obvious
...
* Added "total" space to "free" in file list
* Added configurable space thresholds. If free space is below "warning"
threshold, exclamation sign will be added to report. If free space is below
"critical" threshold, report will be styled bold and red.
(cherry picked from commit 097800a
2015-08-27 17:14:10 +02:00
Gina Häußge
a42b65eca0
Merge branch 'devel' into test/immediateM112
2015-08-27 16:44:09 +02:00
Gina Häußge
51b1535a29
Make sure stdout is a string when we try to treat it as such...
2015-08-27 16:43:58 +02:00
