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

3791 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Gina Häußge
2c1b36b922 Spinner on add folder & scroll to new folder 2016-07-04 16:04:25 +02:00
Gina Häußge
aacb07091e Don't reload on enter in create folder dialog 
Instead submit dialog and create new folder. Also have input
field focused on dialog show.
 2016-07-04 16:03:20 +02:00
Gina Häußge
1991a9e2c7 Fix hide empty folders option 
Now hides folders which contain no files at all
 2016-07-04 16:01:50 +02:00
Gina Häußge
0371fdd497 Merge branch 'improve/wrongUploadError' into devel 
Conflicts:
	src/octoprint/static/css/octoprint.css
	src/octoprint/static/js/app/viewmodels/files.js
 2016-07-04 15:19:25 +02:00
Gina Häußge
1e561e7b4a Merge branch 'fix/scrollToUpload' into devel 
Conflicts:
	src/octoprint/static/css/octoprint.css
	src/octoprint/static/js/app/viewmodels/files.js
 2016-07-04 13:28:56 +02:00
Gina Häußge
cdbc8fcfbd Merge branch 'improve/wrongUploadError' into maintenance 2016-07-04 13:20:30 +02:00
Gina Häußge
e453201c1a Better "upload error" message with supported extensions 2016-07-04 13:20:15 +02:00
Gina Häußge
ec97765c80 Scroll to uploaded file, highlight it 2016-07-04 13:17:16 +02:00
Gina Häußge
be34f7309d Scroll to uploaded file, highlight it 2016-07-04 13:14:38 +02:00
Gina Häußge
20ca50f0b5 Only fetch showFahrenheit flag from settings if they are available 2016-07-04 11:08:53 +02:00
Gina Häußge
b07c352b48 Merge branch 'improve/slicingFlexibility' into devel 
Conflicts:
	src/octoprint/filemanager/__init__.py
	src/octoprint/server/api/files.py
	src/octoprint/static/js/app/viewmodels/slicing.js
 2016-07-04 10:24:43 +02:00
Gina Häußge
dbf1273e9d Use first destination extension for default target name 2016-07-02 18:10:05 +02:00
Gina Häußge
944775abde Fixed registered destination extensions in cura plugin 2016-07-02 18:07:59 +02:00
Gina Häußge
e7c21b1978 Support alternative source file types in SlicerPlugin 
Also limit list of slicers in slicer dialog to compatible slicers.

Implements #935
 2016-07-02 18:05:11 +02:00
Gina Häußge
294203ffd5 Add absolute jog mode to printer API 2016-07-01 17:54:26 +02:00
Gina Häußge
d9e3553c7c Some fixes in the client lib for better usability 2016-07-01 17:53:37 +02:00
Gina Häußge
52d272bd24 More work on the docs 2016-07-01 17:52:40 +02:00
Gina Häußge
08de33e27d Add path into file and folder entries & allow non recursive listings 2016-07-01 17:51:21 +02:00
Gina Häußge
72bc30eae5 Merge branch 'devel' into dev/jsclientdocs 
Conflicts:
	src/octoprint/static/js/app/viewmodels/printerstate.js
 2016-06-30 13:04:57 +02:00
Gina Häußge
2971c29f10 Merge branch 'improve/pauseApiCommand' into devel 
Conflicts:
	src/octoprint/static/js/app/viewmodels/printerstate.js
 2016-06-30 13:01:13 +02:00
Gina Häußge
73a85646c5 Added only pause/resume sub commands to job API 
Implements #1393
 2016-06-30 12:56:18 +02:00
Gina Häußge
cec2f7d917 WIP: More work on the documentation of the js client lib 2016-06-30 12:06:08 +02:00
Gina Häußge
176dd84739 Merge branch 'maintenance' into devel 2016-06-29 12:21:55 +02:00