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

3814 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
a33338684e Merge branch 'fix/slicingDocs' into devel 2016-07-12 11:52:59 +02:00
Gina Häußge
0fec3aeca9 Merge branch 'patch-1' of https://github.com/cvignac/OctoPrint into maintenance 2016-07-12 11:52:27 +02:00
cvignac
12fcfda481 Typo correction in slicing.rst 
In 'Retrieve all slicing profiles' :
'GET /api/slicing/profiles' -> 'GET /api/slicing'
 2016-07-10 15:40:24 +03:00
Gina Häußge
58ee5f17f7 Fix simulation of moves on virtual printer 2016-07-08 16:44:40 +02:00
Gina Häußge
9b6b4a9228 Have path set for SD files and strip leading / 2016-07-08 15:45:13 +02:00
Gina Häußge
42e54f0fbc Fix missing path attribute for sd files on API 2016-07-08 15:44:37 +02:00
Gina Häußge
7909672f51 Fix wrong location assignment for selected file 2016-07-08 15:43:48 +02:00
Gina Häußge
5bf5e336ec Extend payload in various events 
Added name and path various event print job events and
the upload event, deprecated the file property.

Had to move event triggering of the print job events to
the printer implementation, since the file manager
is not available in the comm layer. Added new callbacks
to the PrinterInterface to allow for that to be possible.
 2016-07-08 12:54:58 +02:00
Gina Häußge
3a4902367b New event placeholders for path & origin 2016-07-08 12:52:40 +02:00
Gina Häußge
0fd510a51f Less scary message on config.yaml parsing error 2016-07-08 12:35:46 +02:00
Gina Häußge
55ed4211f9 Fix highlighting of selected file in file list in frontend 2016-07-08 11:14:40 +02:00
Gina Häußge
db2c3bf10b Have frontend's printer state also track file path 
Also display it on mouse over on the selected file's name.
 2016-07-08 11:13:14 +02:00
Gina Häußge
d91c6256b4 Have GCODE viewer use file path instead of name 
That way it should also work for GCODE files contained in folders.
 2016-07-08 10:57:33 +02:00
Gina Häußge
dfb8f51238 Extend payload in MetadataAnalysis events 
Added name, path and origin, deprecated file property.
 2016-07-08 10:50:13 +02:00
Gina Häußge
2e8d104864 Fix resource URLs for files in folders 2016-07-08 10:42:50 +02:00
Gina Häußge
a7fe2d5148 Clean up old AND invalid entries in preemptive cache config 2016-07-07 10:22:37 +02:00
Gina Häußge
d96a91ecc3 Fix modal background of update confirmation not vanishing 2016-07-06 15:30:36 +02:00
Gina Häußge
0015d844a8 Merge branch 'improve/templateErrorResilience' into devel 
Conflicts:
	src/octoprint/server/__init__.py
 2016-07-06 15:12:19 +02:00
Gina Häußge
924d5c8d7d More error resilience in template rendering 
Wrapped potentially external and problematic includes in
custom try-endtry-blocks
 2016-07-06 15:09:38 +02:00
Gina Häußge
5126fc1093 Fixed an import error introduced through moving the jinja trycatch extension 
(cherry picked from commit 3ea77c7)
 2016-07-06 15:03:43 +02:00
Gina Häußge
162c4f11dd Moved jinja ExceptionHandlerExtension to octoprint.util.jinja 
(cherry picked from commit 3d0fc8d)
 2016-07-06 15:03:34 +02:00
Gina Häußge
240fe70902 Custom try-catch block for jinja 
Allows some more error checking in templates. Not used at the moment but
might come in handy in the future.
(cherry picked from commit 7708eea)
 2016-07-06 15:01:55 +02:00
Gina Häußge
5802c11689 Fixed a bug (variable not yet defined) 2016-07-06 14:06:38 +02:00
Gina Häußge
b1ffbf4a00 Added @eyck to AUTHORS.md 2016-07-06 14:04:21 +02:00
Gina Häußge
07dc0499d0 Merge branch 'gcode_arc_rendering' of https://github.com/eyck/OctoPrint into pr/eyck/gcode_arc_rendering 2016-07-06 13:38:54 +02:00
Gina Häußge
e133513bdc Merge remote-tracking branch 'origin/devel' into devel 2016-07-06 13:32:41 +02:00
Gina Häußge
a2cd46899c Merge branch 'improve/intermediaryUrlsAndTimeouts' into devel 
Conflicts:
	AUTHORS.md
	src/octoprint/plugins/virtual_printer/virtual.py
 2016-07-06 13:32:03 +02:00
Gina Häußge
bef989961d Added @MoonshineSG to AUTHORS.md 2016-07-06 13:30:28 +02:00
Gina Häußge
eeaf68d61a Better timeout defaults for intermediary page 
In some situations an error could be displayed otherwise since
online.gif was available, intermediary.gif wasn't anymore, but pinging
the latter timed out before the next ping of the former.

(cherry picked from commit 7809ba8)
 2016-07-06 13:16:01 +02:00
Gina Häußge
674d625150 Transfer query & fragment on intermediary page reload 
Also user window.location.reload if URL to reload is the same as the current one,
otherwise reloading will be a no-op if a fragment is provided.

(cherry picked from commit a367902)
 2016-07-06 13:15:50 +02:00
MoonshineSG
bfecb5fadf fix intermediary.html for url with parameters 
(cherry picked from commit 2cc5eaf)
 2016-07-06 13:15:34 +02:00
Mark Walker
5eefee3a4d RepRapFirmware style M23 select file 
RepRapFirmware enumerates the gcode files starting at /gcode, it will
also interpret any relative path as being relative to that folder.
However a full absolute path will actually interpret as from the real
root of the SD card :-(

(cherry-picked from ac68570)
 2016-07-06 05:17:44 +00:00
Mark Walker
02b0e906f1 Allow M23 "File opened" response with no filename 
(cherry-picked from ba4b7c0)
 2016-07-06 05:17:29 +00:00
Mark Walker
3069e05766 Add RepRapPro style file opened to virtual printer 
(cherry-picked from 257c4ed)
Conflicts:
	src/octoprint/plugins/virtual_printer/virtual.py
 2016-07-06 05:14:10 +00:00
Mark Walker
25ae5786c7 Merge remote-tracking branch 'origin/dev/rrfSdCard' into devel 2016-07-06 04:48:47 +00:00
Gina Häußge
9fca41c76c Merge branch 'maintenance' into devel 2016-07-05 14:53:54 +02:00
Gina Häußge
8c80e3ac4a Scalar3D => Vector3D 2016-07-05 14:53:16 +02:00
Gina Häußge
66792da5bc MinMax3D type for tracking printing area & include dimensions in analysis 2016-07-05 14:40:00 +02:00
Gina Häußge
5a9852e7b8 Merge branch 'maintenance' into devel 
Conflicts:
	src/octoprint/util/gcodeInterpreter.py
 2016-07-05 14:37:17 +02:00
Gina Häußge
79d660f377 Further GCODE interpreter fixes & optimizations 
* Introduce Vector3D type to help with coordinate back and
    forth calculations
  * Fix typo in movement calculation (Y twice instead of Y and Z)
  * Removed some code duplication
 2016-07-05 13:22:16 +02:00
Salandora
2ae2405792 Add diff part to retract too because of things like G1 X-10 Y-10 Z1 E-5 
(cherry picked from commit de325c3)
 2016-07-05 13:16:07 +02:00
Salandora
6e42e3e0ef Add calculation for moves in Z direction 
(cherry picked from commit b9cf42f)
 2016-07-05 13:16:02 +02:00
Salandora
ad3ae405f6 Check for moveType == move instead of x,y,z is not None, otherwise x,y,z,e moves wouldn't be seen as extrude/retract moves 
(cherry picked from commit 1b6a46c)
 2016-07-05 13:15:55 +02:00
Gina Häußge
93b247b088 Display fuzzy time estimates in frontend 2016-07-05 13:15:20 +02:00
Mark Walker
d767d19ffb Remove extra paren 
Syntax error from c2fc139
 2016-07-04 11:50:52 -07:00
Gina Häußge
c2fc139b97 Merge branch 'fix/overeagerPreemptiveCache' into devel 
Conflicts:
	src/octoprint/filemanager/storage.py
	src/octoprint/server/views.py
 2016-07-04 19:57:10 +02:00
Gina Häußge
6018bf8428 Fix overeager preemptive caching, even on broken protocols 2016-07-04 19:28:20 +02:00
Gina Häußge
a49bc9ca75 Fixed wrong placeholders in format string for exception 2016-07-04 19:02:12 +02:00
Gina Häußge
277860b831 Allow removal of folders 2016-07-04 18:59:06 +02:00
Gina Häußge
69b231139f Slight rewording to better reflect filter 2016-07-04 16:05:12 +02:00