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

4565 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
10cb60acca [docs] Warn about the need to protect sensitive settings in plugins 2017-05-22 19:24:20 +02:00
Gina Häußge
5e55d637af Don't escape \t, \r or \n in terminal output 2017-05-22 14:06:12 +02:00
Gina Häußge
8942d7d50d Slight rewording for the webcam error message 
See #1925
 2017-05-19 18:25:40 +02:00
Gina Häußge
0ad09e422d Add stream URL to webcam error message for logged in users 2017-05-19 17:59:54 +02:00
Gina Häußge
0657160389 Different "webcam error" text for non-admins 2017-05-19 17:59:12 +02:00
Gina Häußge
cfde6342a8 Update SockJS to 1.1.2 
Also include source maps. While those are stripped when bundling, for
alternative UIs including sockjs they still might make sense.
 2017-05-19 12:29:40 +02:00
Gina Häußge
832c27ed18 Filter source maps from bundled assets 
At least for now. Might be re-evaluated in the future. URL rewrite
filter for such a case already in place.
 2017-05-19 12:28:20 +02:00
Gina Häußge
59d78ba893 Merge branch 'maintenance' of github.com:foosel/OctoPrint into maintenance 2017-05-18 11:20:54 +02:00
Gina Häußge
7770ee3d08 static/assets/vendor => static/vendor 
Our static folder is basically an assets folder (it just is named differently).
So let's get rid of the redundant directory level.
 2017-05-18 11:12:33 +02:00
Gina Häußge
2d9ad41e49 Moved FontAwesome css into vendor folder & use cssrewrite filter for webassets 
That fixes up the relative URLs to the font files and should make updates down the line
a thing of a quick copy and paste (plus allow some more sophisticated dependency
management down the road as well).

Also renamed fonts folder for FontAwesome 3.2.1 from font to fonts, for more
consistency.
 2017-05-18 11:10:37 +02:00
Gina Häußge
821156c9d6 Py3: basestring => past.builtins.basestring 2017-05-17 19:01:42 +02:00
Gina Häußge
9e5982be29 Attach on_sent callback to last command only 2017-05-17 18:51:34 +02:00
Gina Häußge
39c87d19b7 Fixed a left-over typo. 2017-05-17 17:47:58 +02:00
Gina Häußge
d029abc8f3 Updated docs with an example of multi command expansion 2017-05-17 17:47:58 +02:00
Gina Häußge
7b5848b9c3 Extracted handler result normalization and added tests for it 
Caught some more bugs while doing that.
 2017-05-17 17:47:57 +02:00
Gina Häußge
53bfbf5acf Refactored things a bit to remove a bit of repetition 2017-05-17 17:47:21 +02:00
Goswin von Brederlow
917c9e54ba Allow octoprint.comm.protocol.gcode.queuing hook to return a list of commands 2017-05-17 17:46:58 +02:00
Davide Depau
d8d9c7fe64 Merge branch 'maintenance' into fa-update 2017-05-17 17:46:01 +02:00
Davide Depau
6c0f2de780 upgrade FontAwesome CSS+fonts to 4.7.0, keeping 3.2.1 as fallback [2/2] 2017-05-17 17:35:49 +02:00
Davide Depau
700975d670 upgrade templates to use FontAwesome 4.7.0 classes [1/2] 2017-05-17 17:35:27 +02:00
Gina Häußge
9fac314d71 SWU: restart asynchronously instead of synchronously 
Otherwise we will block ourselves, waiting for the restart command to
complete which it only can when we are no longer there.

Should reduce restart times on update significantly.

Downside is that we no longer can wait for the return code of the
call. However, that should be caught by our UI handler timing out for
the restart and showing an error prompting the user to restart
manually.
 2017-05-17 13:44:11 +02:00
Gina Häußge
9dfee34f01 Fix various popup buttons allowing multiple clicks 
As suggested by @ntoff in #1914
 2017-05-17 13:44:08 +02:00
Gina Häußge
dc8473bc4d Add check for valid job file type to job validation 2017-05-17 13:44:04 +02:00
Ken
c1c75f032d Fixed webcam not loading bug if first/initial tab is "Control" 
(cherry picked from commit d66a4f3)
 2017-05-17 13:44:01 +02:00
Gina Häußge
9ad180c02a Disable "Upload to SD" ui elements while printing 
As suggested by @ntoff in #1914
 2017-05-17 13:43:57 +02:00
Gina Häußge
7795320fc8 Allow timelapse config through UI when not connected to printer 
That restriction didn't really make sense.

As mentioned in #1918
 2017-05-17 13:43:53 +02:00
Gina Häußge
a54c8fbeb7 maintenance branch is now 1.3.4.dev 2017-05-17 13:43:49 +02:00
Gina Häußge
337957198b Introducing staging/* branches for rc preparation 
That way we can switch maintenance over to follow-up stable release
preparation earlier and don't have to hold back commits.
 2017-05-17 13:33:28 +02:00
Gina Häußge
2bae87b85a Preparing release of 1.3.3rc2 2017-05-17 10:59:48 +02:00
Gina Häußge
51959319eb PGMR: Fix call to non existing onAlways 
Closes #1919
 2017-05-16 16:00:40 +02:00
Gina Häußge
6d73e6557b Timelapse: Disable "save as default" along other controls 
Fixes #1918
 2017-05-15 13:03:40 +02:00
Gina Häußge
4c65313c7f Fix a regression causing job data to be reset on completion of a print 
Fixes #1917
 2017-05-15 12:40:05 +02:00
Gina Häußge
41cf85d9db Some rephrasing 2017-05-12 14:58:30 +02:00
Gina Häußge
3fbd477d15 Preparing release of 1.3.3rc1 2017-05-11 15:25:43 +02:00
Gina Häußge
2c73dd36c5 Final fixes before 1.3.3rc1 2017-05-11 15:23:45 +02:00
Gina Häußge
c91fe0c4fc Further decouple some plugin fetch tasks from initial startup thread 2017-05-11 15:23:41 +02:00
Gina Häußge
3bfc4725d2 SWU: Added cache timestamp to UI 
Implements #1521
 2017-05-11 12:45:02 +02:00
Gina Häußge
b6fbe6fafd Added docs for bitbucket_commit check type 
Update to #1898
 2017-05-11 12:12:22 +02:00
Gina Häußge
263c297bed Made last/pause/cancel temperature available in GCODE scripts 
Implements #1910
 2017-05-11 10:00:54 +02:00
Gina Häußge
dba95ee94f Handle G90/G91 and M82/M83 distinct by default 
By default G90/G91 define relativeMode, M82/M83 define relativeE. The
extruder coordinate will be viewed as relative when either
relativeMode or relativeE are set. This mirrors the implementation in
Marlin (current and legacy forks) as well as Repetier.

SmoothieWare's implementation resets the relative mode of the
extruder on a G90/G91. To still accomodate this different
implementation a new settings has been added under Settings >
Feature: "G90/G91 overrides relative extruder mode". Checking this
switches to the alternative interpretation for future gcode analysis
and visualization.

The only difference between the two of them is that the following
segment of GCODE:

    M83
    G90

will have the extruder still set to relative on Marlin and
Repetier but set to absolute on Smoothieware.

Please note that the setting in all likelihood will be moved to
the printer profile in the future, since it makes more sense to have
it on a per printer basis. It's not part of the set of features
available for auto detection since it's required for GCODE analysis
and hence needs to be known even outside of a connection to the
printer.

Implements #1818
 2017-05-10 16:43:20 +02:00
Gina Häußge
f0b63a8e7f Set lines in log outputs to "display: block" 
Taken from reverted commits 6465175e09
and 0f6edabea3.
 2017-05-10 09:58:02 +02:00
Gina Häußge
e166765f7f Revert "Also use fastForEach in working dialogs of PMGR & software update" 
This reverts commit 0f6edabea3.
 2017-05-10 09:25:53 +02:00
Gina Häußge
15e8bbe147 Revert "Improve terminal performance by adding FastForEach" 
This reverts commit 6465175e09.

# Conflicts:
#	src/octoprint/static/css/octoprint.css
#	src/octoprint/static/less/octoprint.less
 2017-05-10 09:25:18 +02:00
Gina Häußge
853bb2fc16 Have G92 set pos directly, use offset only for tool offsets 
See #1906 for related discussion
 2017-05-09 17:17:08 +02:00
Gina Häußge
ccc3c4ef32 Detect invalid settings data to persist (not a dict), send 400 2017-05-09 14:36:45 +02:00
Gina Häußge
72898360f3 Get rid of ridiculous float precision in temperature commands 
"M104 S200.00000000" is completely unnecessary when "M104 S200" works
just fine.
 2017-05-09 09:38:10 +02:00
Gina Häußge
2caa10f15e Don't send T with temperature set commands for shared nozzles 
Fixes #1907
 2017-05-09 09:29:52 +02:00
Gina Häußge
399ec5a909 Allow configuring the webcam stream's aspect ratio 
Options are 16:9 and 4:3, 16:9 is the default.
 2017-05-08 17:35:51 +02:00
Gina Häußge
c844217f82 Placeholder for webcam image to avoid moving controls on load 
An aspect ratio of 16:9 is assumed, with other ratios showing black
letterbox borders as required.

During loading a text "Webcam loading..." is displayed in the webcam
space. On loading error, the (broken) image is hidden and an error
text is displayed instead.

Solves #478
 2017-05-08 17:04:03 +02:00
Gina Häußge
f32d7c434d Docs: Added note that coordinates in script context might be None 
Wasn't made clear before.
 2017-05-03 20:18:11 +02:00