pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4028 commits 20 branches 22 tags 141 MiB
Commit graph

4028 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Gina Häußge
3d959c1d5f maintenance branch is now 1.2.17.dev 2016-09-23 12:29:56 +02:00
Gina Häußge
354042b84d Preparing release of 1.2.16 2016-09-23 09:51:45 +02:00
Gina Häußge
0b551f6b7e Some more documentation 2016-09-22 22:21:52 +02:00
Gina Häußge
9845e3b4ea Restored accidentally removed file 2016-09-22 16:32:05 +02:00
Gina Häußge
8e8853c9c3 Lots of documentation updates + some related code fixes 2016-09-22 16:27:06 +02:00
Gina Häußge
b0a6a5675a Fixed two documentation bugs 
Thanks @Salandora
 2016-09-21 14:35:43 +02:00
Gina Häußge
6f029d6bf4 Docs and minor fixes for printer profile API 2016-09-21 12:05:17 +02:00
Gina Häußge
fc891ac651 Make sure volume.depth for circular beds is forced to width 
Both width and depth should be the diameter. Adjusted docs
accordingly to reflect this too.
 2016-09-21 10:45:40 +02:00
Gina Häußge
24322f9204 Refactored printer profile editor 
It's now spread across multiple pages, with explanations
added where the data will be used.
 2016-09-21 10:11:38 +02:00
Gina Häußge
133377c424 Also allow None for lastmodified and etag value 2016-09-20 15:09:47 +02:00
Gina Häußge
234cb501e7 Also accept int values for check_lastmodified 2016-09-20 14:32:19 +02:00
Gina Häußge
b8159cf16f Docs bug: Maximum feedrate for axes is mm/min 2016-09-20 13:46:47 +02:00
Gina Häußge
0833d9efce Fixed a link 2016-09-20 10:30:41 +02:00
Gina Häußge
0ac3881897 Use better name than "hook" for various plugin hook documentation 2016-09-20 10:29:53 +02:00
Gina Häußge
c7055440cc Migrated docs for all bundled plugins from wiki 2016-09-20 10:27:21 +02:00
Gina Häußge
7b4b638a2b Merge branch 'fix/pluginDocs' into dev/bundledPluginsDocs 2016-09-19 17:15:20 +02:00
Gina Häußge
85e23c976b Sane defaults for empty printer profile fields 2016-09-19 14:35:04 +02:00
Gina Häußge
d017e507aa Directly determine file download URL in js client 
We don't need an extra round trip here
 2016-09-16 18:36:09 +02:00
Gina Häußge
53c0ad0889 Fixed unit tests for octoprint.timelapse 2016-09-16 18:35:30 +02:00
Gina Häußge
d2ed80baca Merge branch 'dev/apiCaching' into devel 
# Conflicts:
#	src/octoprint/filemanager/storage.py
#	src/octoprint/static/js/app/viewmodels/files.js
 2016-09-16 17:11:14 +02:00
clemniem
74fd5e8956 Fixed KeyError in events.py that prevented a command associated with the ClientOpened event from execution. 
The if-statement checked against currentData["job"] is not None, although it was not None even if there was no job.
 2016-09-16 16:21:28 +02:00
Gina Häußge
650e1971d4 Merge branch 'maintenance' into devel 
# Conflicts:
#	CHANGELOG.md
#	src/octoprint/static/js/app/viewmodels/usersettings.js
 2016-09-16 14:11:43 +02:00
Gina Häußge
26fb208f48 Preparing release of 1.2.16rc2 2016-09-16 12:54:48 +02:00
Gina Häußge
2fc86e095f 1.2.16rc1 was actually pushed out on 2016-09-09, not -08 2016-09-12 12:49:04 +02:00
Gina Häußge
0167015b46 Fix generate/delete API key functionality in user settings 
Closes #1491
 2016-09-12 12:48:10 +02:00
Gina Häußge
8b99c89acf Return 400 Bad Request if a multipart request lacks the boundary 
It's mandatory according to RFC2046, section 5.1

See also #1486
 2016-09-12 12:48:10 +02:00
Mathias Rangel Wulff
b794a4672f Correct check for undefined variable 
The code was comparing the result of `typeof` with a variable named `undefined`.

As typeof returns a string it should compare to `'undefined'`.
 2016-09-12 09:43:46 +00:00
Gina Häußge
0bb6f5215d "prerelease" key might not be in check if tracking stable releases 2016-09-12 09:25:34 +02:00
Gina Häußge
b6fbbb353a Merge branch 'maintenance' into devel 
# Conflicts:
#	CHANGELOG.md
#	src/octoprint/filemanager/storage.py
#	src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2
 2016-09-09 12:31:29 +02:00