Commit graph

4073 commits

Author SHA1 Message Date
Gina Häußge
f7eb12a3ee Docs for {Reload|Restart}NeedingPlugin 2016-10-14 14:15:33 +02:00
Gina Häußge
ee92fc6907 Docs for CLI of software update plugin 2016-10-14 13:57:01 +02:00
Gina Häußge
62939ef11b Clarification regarding webcam URL formats 2016-10-14 12:35:01 +02:00
Gina Häußge
5f60017bb2 Merge branch 'improve/curaImporter' into devel
# Conflicts:
#	src/octoprint/plugins/cura/templates/cura_settings.jinja2
2016-10-14 12:00:17 +02:00
Gina Häußge
c863562d12 Limit cura profile importer to .ini files and clarified support again 2016-10-14 11:58:39 +02:00
Gina Häußge
44402fda3a Use CleaningTimedRotatingFileHandler in virtual printer 2016-10-14 09:37:06 +02:00
Gina Häußge
7714aaca89 Merge branch 'fix/timelapseFramerateParameter' into devel 2016-10-13 19:23:26 +02:00
Gina Häußge
27fb397681 ffmpeg: Only modify the -framerate parameter for setting video fps
-r only allows a limited set of target framerates according to the mpeg2
 standard, but -framerate allows to specify how long each frame should
 be shown, giving us full control over "virtual" fps without causing errors
 when the user selects a non-standard frame rate
2016-10-13 19:23:15 +02:00
Gina Häußge
3606ed126a Fix a merge error causing timeouts on the virtual printer
Long lines (longer than rx buffer) could not be processed at all, leading
to a serial timeout exception thrown by the virtual printer. Adjusted
to allow for partial processing like on maintenance
2016-10-13 17:43:03 +02:00
Gina Häußge
613363379f Merge branch 'maintenance' into devel
# Conflicts:
#	CHANGELOG.md
#	src/octoprint/templates/javascripts.jinja2
2016-10-13 17:17:44 +02:00
Gina Häußge
eabff453cd Preparing release of 1.2.17rc3 2016-10-13 16:12:57 +02:00
Gina Häußge
6cd6b98c2b Core JS needs to go after plugin JS, or we might run into race conditions 2016-10-13 16:11:13 +02:00
Gina Häußge
5626b6d40b Merge branch 'maintenance' into devel
# Conflicts:
#	src/octoprint/templates/javascripts.jinja2
2016-10-13 15:52:03 +02:00
Gina Häußge
99004f14ba Core JS needs to go after plugin JS, or we might run into race conditions 2016-10-13 15:51:38 +02:00
Gina Häußge
71c2789fe7 Docs: fixed duplicated "injected properties" section 2016-10-13 14:25:24 +02:00
Gina Häußge
9de78001dd Merge branch 'maintenance' into devel
# Conflicts:
#	CHANGELOG.md
#	docs/plugins/concepts.rst
#	src/octoprint/__init__.py
#	src/octoprint/server/__init__.py
#	src/octoprint/templates/javascripts.jinja2
#	src/octoprint/timelapse.py

Merge branch 'devel' into dev/wizard

# Conflicts:
#	octoprint_octobullet/__init__.py
#	octoprint_octobullet/templates/octobullet_settings.jinja2

Merge branch 'devel' into dev/wizard

# Conflicts:
#	octoprint_octobullet/__init__.py
#	octoprint_octobullet/templates/octobullet_settings.jinja2
2016-10-13 14:22:40 +02:00
Gina Häußge
91ef5480b1 Preparing release of 1.2.17rc2 2016-10-13 12:12:09 +02:00
Gina Häußge
419f3370a2 Split JS/CSS/LESS assets between core+bundled plugins and external plugins
That way a JS error in an external plugin won't nuke the whole UI, which IMHO
is worth the additional requests needed to load the split up files.

See #1544 for an example of such a situation.
2016-10-13 12:07:00 +02:00
Gina Häußge
1370c7a9cc Inject plugin_info object into plugin implementations as well 2016-10-13 12:03:05 +02:00
Gina Häußge
982d121d3b Revert "Preparing release of 1.2.17"
This reverts commit 28de87441f.
2016-10-12 18:36:41 +02:00
Gina Häußge
67634e4f7c Merge branch 'improve/loggingHandlers' into maintenance 2016-10-12 18:15:12 +02:00
Gina Häußge
3d26e478e3 Fix a bug causing the update of OctoPrint to not work under certain circumstances
The bug only manifests if a user had installed 1.2.16 earlier and never once hit "Save" in the
settings before attempting to update to 1.2.17. With 1.2.16 the updater script and settings for
OctoPrint's own update mechanism were changed to prefer "checkout_folder" instead of
"update_folder". In earlier versions however "update_folder" was still used. Saving settings
even once (even without any changes!) will migrate the data. But if that's not done a
KeyError will be raised when trying to retrieve "update_folder" from the check config, with
"checkout_folder" as its fallback.

Rather stupid error really.
2016-10-12 18:13:46 +02:00
Gina Häußge
28de87441f Preparing release of 1.2.17 2016-10-12 16:50:22 +02:00
Gina Häußge
e8ee9d712c Better reporting of timelapse capture errors
* show special error if timelapse can't be rendered due to no frames having
    been captured
  * inform user during print about repeated capture errors
  * do not start post roll recording if after a print no frames were captured at all
  * also interpret non-ok-ish return codes from snapshot url as capture error
  * documentation for CaptureFailed event
2016-10-12 15:12:28 +02:00
Gina Häußge
6143985517 Merge remote-tracking branch 'origin/devel' into devel 2016-10-11 16:35:57 +02:00
Gina Häußge
d88bf78242 Document Shutdown event 2016-10-11 16:35:29 +02:00
Gina Häußge
4de8154064 Stop event queue on shutdown and join on it 2016-10-11 16:34:30 +02:00
Gina Häußge
c0ba4da562 Merge branch 'devel' into dev/shutdownEvent 2016-10-11 13:34:35 +02:00
Gina Häußge
688a998dd2 Use CleaningTimedRotatingFileHandler in bundled plugins 2016-10-11 10:54:16 +02:00
Gina Häußge
343631b3c6 Custom SerialLoggingHandler
Does roll overs on next connections to the printer
2016-10-11 10:53:37 +02:00
Gina Häußge
139b2277d1 Fix missing absolute import declarations 2016-10-10 19:45:34 +02:00
Gina Häußge
e8123a6ab1 Custom logging handler that cleans files on startup 2016-10-10 19:27:18 +02:00
Gina Häußge
aeb1970270 Merge pull request #1538 from kevans91/daemon_error_fix
print() uses file=, not stream= -- fix that, fix the error
2016-10-10 09:43:13 +02:00
Kyle Evans
35f4b9e601 print() uses file=, not stream= -- fix that, fix the error 2016-10-07 14:46:03 -05:00
Salandora
f1891fedb4 Fixed a bug which caused the layer up/down keyboard implementation to fail. 2016-10-06 19:20:04 +02:00
Gina Häußge
e39e512e48 Fixed an issue with the file move API command 2016-10-06 17:12:18 +02:00
Gina Häußge
d802602e1e Merge branch 'maintenance' into devel
# Conflicts:
#	CHANGELOG.md
2016-10-06 16:21:13 +02:00
Gina Häußge
891fd18f0e Preparing release of 1.2.17rc1 2016-10-06 15:31:28 +02:00
Gina Häußge
41fe997af4 Make sure to also delete any un-suffixed cookies when deleting a cookie
Follow-up to a161feb
2016-10-06 15:25:13 +02:00
Gina Häußge
c850646539 Merge branch 'maintenance' into devel
# Conflicts:
#	src/octoprint/static/js/lib/less.min.js
2016-10-06 09:22:36 +02:00
Gina Häußge
6c21ee32a8 Fix broken filtering on ItemListHelper
Filter toggling didn't remove the specific filter but always the last item
in the filter list. No, I don't know either why I didn't notice this earlier m(
2016-10-05 19:52:28 +02:00
Gina Häußge
bcef804a4a Updated less.js to current version 2.7.1 2016-10-05 12:54:57 +02:00
Gina Häußge
e1814e9c7e Merge branch 'maintenance' into devel 2016-10-05 12:43:11 +02:00
Gina Häußge
39d5446789 Fixed encoding bug in HTTP request processing, causing weird flask issues
If a content type header was present on a multipart form data part it would turn
the rewritten body into a unicode instead of a byte array, causing a later conversion
to a byte stream to not capture.

Fixed both the fact that the rewritten body would turn into unicode by making
sure the content type header was provided as byte array and fixed the byte stream
conversion to also trigger on unicode instances.

Solves #1531
2016-10-05 12:33:02 +02:00
Gina Häußge
c5259338dc Merge remote-tracking branch 'origin/devel' into devel 2016-10-04 18:40:34 +02:00
Gina Häußge
1456a3e360 Merge branch 'maintenance' into devel 2016-10-04 18:37:58 +02:00
Gina Häußge
a161feb106 Fix bug causing remember_me cookie not to deleted properly on logout 2016-10-04 18:34:45 +02:00
Gina Häußge
29f74768ea Merge pull request #1530 from I-am-me/patch-3
Added @I-am-me to AUTHORS.md
2016-10-04 17:44:09 +02:00
I-am-me
75489bf71b Added @I-am-me to AUTHORS.md 2016-10-04 17:30:57 +02:00
Gina Häußge
8c74b9e74d SettingsPlugins may now mark paths as restricted
That way they can ensure that no sensitive settings data may be
 sent on the REST API.
2016-10-04 16:10:01 +02:00