Commit graph

3136 commits

Author SHA1 Message Date
Teja
49fece1e14 return home after print done 2015-07-15 12:45:18 +02:00
Teja
131e99adbe default branch is "mrbeam-stable" instead of "master" 2015-07-15 11:54:03 +02:00
Teja
6a7a6f0ff2 instant save working on connection timeout 2015-07-15 09:56:36 +02:00
Teja
98eaab755f fixed image paths 2015-07-14 22:11:52 +02:00
Teja
79587644b4 fixed update source and deprecation warnings 2015-07-14 21:33:13 +02:00
Teja
7f5d45efdc fixed confirmation dialog. 2015-07-11 16:54:52 +02:00
Teja
7dcf2f38e2 upload button visible again. progress bar fix. 2015-07-11 16:25:32 +02:00
Teja
0ae0390dcf finally working implementation of ACC in the latest comm.py 2015-07-11 15:48:53 +02:00
Teja
0725ee23f3 cancelling print working. 2015-07-11 15:44:00 +02:00
Teja
23d29b29ba minor ui changes 2015-07-11 15:40:02 +02:00
Teja
08ab894ead support for ! and ~ commands 2015-07-11 10:10:39 +02:00
Teja
fee7b32413 basic acc attached. missing ! ~ command support. 2015-07-11 00:36:35 +02:00
Teja
64c0c0d473 just a test. inject acc to upstream comm.py 2015-07-10 23:35:56 +02:00
Teja
dffb123d0e little ui fixes. restart button removed as it was not working. 2015-07-09 18:05:01 +02:00
Teja
f842809db8 code cleanup 2015-07-09 17:02:58 +02:00
Teja
c1567b6742 enabled terminal filters per default 2015-07-09 16:59:44 +02:00
Teja
691d8e8d85 log is ignoring filtered messages. 2015-07-09 16:42:38 +02:00
Teja
7b548763f5 way faster update of laser position. 2015-07-09 16:12:54 +02:00
Teja
3b30e25e60 pause from web ui sends ! and M5 now 2015-07-08 20:56:32 +02:00
Teja
1e00eb55f9 bugfix. fix placement works better now. deprecation warnings fixed. 2015-07-08 11:56:34 +02:00
Teja
14fb9b9665 bugfix. validating NaN correct now 2015-07-08 11:25:04 +02:00
Teja
fc4f2340fe fixed limit hit warning and reconnect after. 2015-07-07 18:44:29 +02:00
Teja
4469f69cab settings fixed 2015-07-07 11:50:39 +02:00
Teja
af6310f5d3 position update works again 2015-07-06 19:36:18 +02:00
Teja
6148b82b7f focus mode works again 2015-07-06 17:11:32 +02:00
Teja
f0c5173dd1 fixed search and filter 2015-07-06 14:46:04 +02:00
Teja
31f2cbb64b files search works again. wip 2015-07-04 18:07:23 +02:00
Teja
867895ab81 terminal fixed 2015-07-04 17:06:46 +02:00
Teja
44671cfb40 WIP. slicing working again. 2015-07-04 16:19:56 +02:00
Teja
fa1bad7b7c wip 2015-07-03 17:08:15 +02:00
Teja
90b20d0be6 wip 2015-07-03 12:20:38 +02:00
Teja
a7acc7f7f4 Merge remote-tracking branch 'upstream/maintenance' into upstream_merge
Conflicts:
	requirements.txt
	src/octoprint/filemanager/__init__.py
	src/octoprint/plugins/cura/profile.py
	src/octoprint/plugins/cura/static/js/cura.js
	src/octoprint/plugins/cura/templates/cura_settings.jinja2
	src/octoprint/plugins/svgtogcode/__init__.py
	src/octoprint/printer/__init__.py
	src/octoprint/server/__init__.py
	src/octoprint/server/api/files.py
	src/octoprint/server/api/printer.py
	src/octoprint/server/api/settings.py
	src/octoprint/settings.py
	src/octoprint/static/js/app/main.js
	src/octoprint/static/js/app/viewmodels/appearance.js
	src/octoprint/static/js/app/viewmodels/connection.js
	src/octoprint/static/js/app/viewmodels/control.js
	src/octoprint/static/js/app/viewmodels/files.js
	src/octoprint/static/js/app/viewmodels/gcode.js
	src/octoprint/static/js/app/viewmodels/printerstate.js
	src/octoprint/static/js/app/viewmodels/settings.js
	src/octoprint/static/js/app/viewmodels/terminal.js
	src/octoprint/templates/dialogs/settings.jinja2
	src/octoprint/templates/dialogs/settings/serialconnection.jinja2
	src/octoprint/templates/index.jinja2
	src/octoprint/templates/navbar/settings.jinja2
	src/octoprint/templates/stylesheets.jinja2
	src/octoprint/util/comm.py
2015-07-02 22:36:30 +02:00
Gina Häußge
95c26a7850 Fix: Don't automatically persist or return _config_version
Should only ever be read or written by the plugin system itself, not
by on_settings_save or on_settings_load
(cherry picked from commit 77f7d59)
2015-07-02 15:27:35 +02:00
Gina Häußge
885e6f916c Fix: Don't persists checks when saving SWUpdate settings
(cherry picked from commit 8d10be6)
2015-07-02 15:27:27 +02:00
Gina Häußge
d7a86a4d28 Use UTF-8 for _all_ output from sarge
Lines taking from the asynchronous processing of stdout/stderr where
left as str, leading to encoding problems when utf8 characters showed
up in the stream and were being interpreted as ascii encoding.
(cherry picked from commit 9373be3)
2015-07-02 15:27:17 +02:00
Gina Häußge
7b3e0563cc SWUpdate: Only use version cache from same version of OP
When using the version cache only use the version cache if the OctoPrint
version stored within it matches the one of the currently running
instance. Otherwise we might report false positives with regards to
available updates under some circumstances.
(cherry picked from commit bb7b0cb)
2015-07-02 15:26:02 +02:00
Gina Häußge
50a62bf00a maintenance branch is now 1.2.3-dev 2015-06-30 21:49:37 +02:00
Gina Häußge
1c6b0554c7 Preparing release of 1.2.2 2015-06-30 21:19:50 +02:00
Gina Häußge
537c205757 Use lowercase when matching extensions
(cherry picked from commit 29cee16)
2015-06-30 19:12:58 +02:00
Gina Häußge
f07b2477f5 Fixed some comments that were outdated
(cherry picked from commit 18816b6)
2015-06-30 19:12:52 +02:00
Gina Häußge
5e5531f6d8 Verify extension of uploaded language packs & plugins
Should be valid zip archives/tarballs. Also use only the extension
of an uploaded plugin archive as suffix for the temporary file that's
used for installing it.
(cherry picked from commit a1ff698)
2015-06-30 19:12:45 +02:00
Gina Häußge
eadc9ee795 Fix: We don't need the shell for pip
(cherry picked from commit 2db3228)
2015-06-30 19:12:37 +02:00
Gina Häußge
0b3f94b6bd maintenance branch is now 1.2.2-dev 2015-06-30 10:12:14 +02:00
Gina Häußge
9f8d30a66c Preparing release of 1.2.1 2015-06-30 08:42:16 +02:00
Gina Häußge
2a8eea086c Only print command of event handler to log when debug flag is present
(cherry picked from commit 49d28c5)
2015-06-30 08:28:16 +02:00
Gina Häußge
bb0bfaee56 Fix: Increase max body size for plugin archives
Closes #957
(cherry picked from commit af89097)
2015-06-29 21:01:21 +02:00
Gina Häußge
b8209e8e09 Switch to pkg_resources for compatibility check
Plugin Manager now internally uses pkg_resources.parse_version and
pkg_resources.parse_requirements to check for version compatibility
with plugins from the repository. That will allow to directly use
the OctoPrint version string once it's PEP440 compatible.
(cherry picked from commit 8eb61a9)
2015-06-29 18:24:23 +02:00
Gina Häußge
a5b87a9067 Updated changelog 2015-06-29 17:49:19 +02:00
Gina Häußge
b3e547c60f Fix: Don't reload page on search form submits
Both file search and plugin repository search reloaded the page when
hitting enter in the search field. This fixes that.
(cherry picked from commit 60043cc)
2015-06-29 17:40:15 +02:00
Teja
a205c352ad made local translation text permanent 2015-06-29 17:10:31 +02:00