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

3050 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Gina Häußge
8c80e3ac4a Scalar3D => Vector3D 2016-07-05 14:53:16 +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
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
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
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
73a85646c5 Added only pause/resume sub commands to job API 
Implements #1393
 2016-06-30 12:56:18 +02:00
Gina Häußge
0376bc4235 Only use first value for X-Scheme for reverse proxy setup 
Solves #1391
 2016-06-29 12:16:28 +02:00
Gina Häußge
c70708e915 Fixed changelog for 1.2.13 
Will stay this way now for 1.2.13 though, already released. Follow up versions
should reflect the contents of the release notes however.
 2016-06-16 13:26:30 +02:00
Gina Häußge
01c5b77f7b maintenance branch is now 1.2.14.dev 2016-06-16 13:14:33 +02:00
Gina Häußge
cb2e0d449f Preparing release of 1.2.13 2016-06-16 12:19:17 +02:00
Gina Häußge
6c20e58529 Handle browsers w/o support for visibility tracking 2016-06-16 12:10:14 +02:00
Gina Häußge
611c1ccf4a Disable GCODE viewer if browser is unsupported 2016-06-16 12:08:46 +02:00
Gina Häußge
397f762182 Don't trigger initial passive login before viewmodels are available 
Closes #1374
 2016-06-15 17:15:57 +02:00
Gina Häußge
ad201b040d Don't parse B: in position as bed temperature 
Closes #1373
 2016-06-15 16:27:51 +02:00
Gina Häußge
0274b0f25b Have virtual printer report back with "B:" in line 
Similar to Marlin with enabled COREXY. Useful for testing
parser behaviour.
 2016-06-15 16:22:37 +02:00
Gina Häußge
0bb467e884 Ensure temperature graph to be properly initialized 2016-06-09 13:41:14 +02:00
Gina Häußge
be711dd691 maintenance branch is now 1.2.13.dev 2016-06-09 12:16:27 +02:00
Gina Häußge
685ce16c85 Preparing release of 1.2.12 (part three) 
Forgot to add the news category of the blog to the announcement
plugin and also updated the list of patrons again.
 2016-06-09 09:31:36 +02:00
Gina Häußge
885b48911e Preparing release of 1.2.12 (part two) 
Another update of the CHANGELOG after fixing a bug. Shifted release date
to tomorrow to leave more time for final tests that was now eaten up by the
last minute bug fix.

Also updated CONTRIBUTING file to explain new prerelease branch.
 2016-06-08 16:48:39 +02:00
Gina Häußge
d7ef60b4d2 Slight change in function definition of reused functions (JS) 2016-06-08 16:33:08 +02:00
Gina Häußge
63cec660ca Solve a race condition that could cause 401 responses and a broken UI 
Closes #1364. See ticket for details.
 2016-06-08 16:21:25 +02:00
Gina Häußge
4c34cb84c7 Preparing release of 1.2.12 2016-06-08 13:09:04 +02:00
Gina Häußge
d3d4d4e407 Merge branch 'prerelease' into maintenance 2016-06-08 11:21:22 +02:00
Gina Häußge
e9f80c6616 Added new prerelease branch to versioneer config 
Can be used in the future for tracking prereleases and testing
proper version updates without having to push to master directly.
 2016-06-08 11:19:21 +02:00
Gina Häußge
5006b019af Add events for slicing profile manipulation 
Events SlicingProfile(Added|Modified|Deleted). Initially thought to be necessary
to properly refresh available profiles in slicing dialog, not needed for that after
all but still left in and documented, might be useful for someone.
 2016-06-06 18:12:32 +02:00
Gina Häußge
4f3e4f7f38 Force rescanning of available slicing profiles for slicer on update 
Should make newly uploaded profiles available in the slicing dialog without
having to first deselect and then reselected the current slicer.
 2016-06-06 16:20:47 +02:00
Gina Häußge
a0697f8bad Use movie prefix for timelapse notifications 
Also added a missing lock.

Also part of the fix for #1320
 2016-06-02 12:03:57 +02:00
Gina Häußge
2833372603 Allow deletion of *.mp4 timelapse files 
That one was missing in a00faf2.

Fixes #1320
 2016-06-02 11:11:06 +02:00
Gina Häußge
8ce1eafd5d Properly track unrendered timelapses that are being processed 
UI removes action buttons for them and displays a spinner
indicating that the timelapse in question is either being
recorded or being rendered at the moment.

Should prevent users from accidentally trying to render an
incomplete timelapse.
 2016-06-02 10:11:54 +02:00
Gina Häußge
21a4033f73 Don't concurrently delete unrendered timelapses 
Could trigger lots of errors if an unrendered timelapse currently
being collected was deleted from a separate thread from right
under the collection thread.

Also only log errors while processing already deleted files
if debug logging is enabled.

Finally trigger MovieDone event AFTER deleting unrendered
files (otherwise just rendered timelapse might still be present
when list of timelapses is queried right after).

Should solve #1326
 2016-06-02 10:05:44 +02:00
Gina Häußge
51a1953d99 Move timelapse event processing to timelapse viewmodel 2016-06-01 13:24:29 +02:00
Gina Häußge
30b6211157 Whitelist .g extensions on sd file upload 
That way uploading something like auto0.g will not
cause a rename to auto0.gco anymore.

Closes #1314
 2016-06-01 12:29:42 +02:00