Commit graph

4058 commits

Author SHA1 Message Date
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
Gina Häußge
ad21bbb2ff Merge remote-tracking branch 'origin/devel' into devel 2016-10-04 12:28:11 +02:00
Gina Häußge
52de4cba9a Uniform labeling in extended file info
Either "Like This" or "Like this", not both.
2016-10-04 12:27:40 +02:00
Gina Häußge
1c3de9019b data.prints.last.lastPrintTime => data.prints.last.printTime 2016-10-04 12:26:36 +02:00
Gina Häußge
ecde4b81d0 Merge branch 'patch-1' of https://github.com/I-am-me/OctoPrint into pr/I-am-me/patch-1 2016-10-04 11:33:22 +02:00
Gina Häußge
bc0880711b Log full stack trace on socket connection errors when debug logging
Might help bring some clarity for #1523
2016-10-04 10:18:48 +02:00
I-am-me
369e43eb0e Changed "Last (estimated) print time" to real time
To answer https://github.com/foosel/OctoPrint/issues/1048 I changed L357 to "output += gettext("Last Print Time") + ": " + formatDuration(data["prints"]["last"]["printTime"]);" as proposed by @ntoff
2016-09-29 14:26:47 +02:00
Gina Häußge
73e8d5e0a9 Merge branch 'maintenance' into devel
Conflicts:
	src/octoprint/server/util/flask.py
2016-09-28 13:48:47 +02:00
Gina Häußge
e038cfa4dc Track bypassed views on cache too
Only keep the cache keys, but that way we know when
we were going to cache something and then didn't
due to environmental factors, e.g. headers on request
or response.

Necessary to be able to track if the preliminary caching
has been done during startup to properly reflect that
on cached.gif
2016-09-28 13:44:59 +02:00
Gina Häußge
82ae52e619 More docs & client fixes 2016-09-28 12:53:43 +02:00
Gina Häußge
4e69b260a1 Docs for user API
Also some fixes on said API and some fixes in the docs
2016-09-28 11:18:43 +02:00
Gina Häußge
82ae3f6f6e Re-added two utility methods removed in d9e3553c7c
They are still useful for other clients than the core application. Renamed them to fit the
general naming on the API however:

  * pathForElement is now called pathForEntry
  * elementByPath is now called entryForPath
2016-09-28 10:21:27 +02:00
Gina Häußge
aca3dfae49 Merge branch 'maintenance' into devel
# Conflicts:
#	CHANGELOG.md
2016-09-23 14:35:31 +02:00
Gina Häußge
e700891dba Marked some paths for github's linguist 2016-09-23 14:26:58 +02:00
Gina Häußge
080a6e9ccd Extend atomic_write to allow setting & persisting file permissions 2016-09-23 14:26:33 +02:00
Gina Häußge
3a13dd9022 Fixed printerParameters config migrator
Was marking the config as dirty just when printerParameters entry existed,
which always exists - various sub entries of that are what needs to be checked
instead.
2016-09-23 12:37:41 +02:00