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

4531 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
1cc3ddb03c Add levels & color to browser console log 2017-05-30 17:46:03 +02:00
Gina Häußge
33cafbbd8a Make stream timeout adjustable 
As suggested by @ntoff in #1937
 2017-05-30 17:26:30 +02:00
Gina Häußge
d274a9c73d Fixed a couple of FontAwesome issues 
* fa-circle-blank does not exist, replaced with fa-circle-o (see also
    report in #1928)
  * fa-trash-o instead of fa-trash (same look and feel)
  * fa-check instead of fa-check-circle (same look and feel)
  * fixed toggleContent binding to also be able to toggle fa icons
  * fix deletion spinner in file list (was still using old icon-
    classes which of course weren't there anymore and hence not
    toggleable)
  * icons-ul => fa-ul
  * remove superfluous fa class from some places

Follow-up to #1915.
 2017-05-29 13:42:11 +02:00
Gina Häußge
c3619a3795 No scary message on autodetect fail 2017-05-24 18:04:11 +02:00
Gina Häußge
dffb33727d More sensible sorting of baudrates for auto detect 
115200 is the most likely baudrate candidate for printers, followed
by 250000. Any additional baudrates that were configured are even more
likely.
 2017-05-24 17:56:01 +02:00
Gina Häußge
78724163b1 No need for programmer mode for detecting one port 2017-05-24 17:54:30 +02:00
Gina Häußge
b6a09abb83 Fix an issue causing non-gcode commands not to be sent 
Introduced by multi-command returns from comm handlers
 2017-05-24 17:51:01 +02:00
Gina Häußge
77b6d83e0b Set X-Robots-Tag and remove Server header in responses 
Also set robots meta tag in index.jinja2
 2017-05-24 16:53:54 +02:00
Gina Häußge
7c6b85a0ad Merge branch 'staging/maintenance' into maintenance 2017-05-24 14:51:24 +02:00
Gina Häußge
df038e6a4d staging/maintenance is now 1.3.3rc4.dev 2017-05-24 14:50:18 +02:00
Gina Häußge
ce1541e956 Preparing release of 1.3.3rc3 2017-05-24 13:26:06 +02:00
Gina Häußge
bd1d0e6073 Merge branch 'rc/maintenance' into staging/maintenance 2017-05-24 12:33:40 +02:00
Gina Häußge
ff89cdf6d0 Fix versioneer lookup entry for 1.3.3rc3 staging branch 2017-05-24 12:28:09 +02:00
Gina Häußge
76f58e05ec Better fix for #1821 
Instead of disabling capturing of postroll by default (which we actually
don't want and doing so was a mistake thanks to misremembering the
meaning of the variable in question), we now properly reset the
default value for that check box (which wasn't properly set only due to
a very stupid typo).
 2017-05-24 12:26:14 +02:00
Gina Häußge
2a600d7d00 Fix consecutive timed timelapses without postroll capture 
Due to the timer never properly resetting to None only one timelapse
was ever done.

Introduced in 7e2382fed4, covered until
315a80a7a7.

Closes #1934
 2017-05-24 11:57:02 +02:00
Gina Häußge
4a84fa95e4 [docs] Fix another typo in the SettingsPlugin docs 2017-05-23 10:15:04 +02:00
Gina Häußge
557c761e80 [docs] Fix a typo in the SettingsPlugin docs 2017-05-23 10:13:04 +02:00
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