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

1086 commits

Author SHA1 Message Date
Richard Joyce
0d7965ebf1 Fix missing kwargs in PluginSettings remove 2016-01-04 09:25:58 -08:00
Gina Häußge
cda399f11a Merge branch 'fix/ignoreCannotOpenSubdir' into maintenance 2015-12-07 13:21:57 +01:00
Gina Häußge
c98d3d1655 Also assume presence of heated bed in "add profile" dialog 2015-12-07 11:53:41 +01:00
Gina Häußge
5e96bd8b6a Fix: "Server Offline" should always win against "Please reload" 
Nothing to reload if the server is offline, so show the offline message above
the reload one.
 2015-12-07 11:51:20 +01:00
Gina Häußge
2b4a985d85 Assume the presence of a heated bed in the default profile 2015-12-07 11:04:09 +01:00
Gina Häußge
0982c8cc62 Ignore the "cannot (open|error) subdir" errors from Marlin 2015-12-07 09:26:25 +01:00
Mark Bastiaans
d90a9e7fc4 Fixed checks with os.path.realpath() for systems with symlinked paths 
(cherry picked from commit b7c9949)
 2015-12-04 17:36:49 +01:00
Gina Häußge
bad88da2fe Fixed a scrolling issue on the terminal tab 2015-12-02 18:12:08 +01:00
Gina Häußge
c5bc000b56 Increased timeout for waiting for restart after update 
20sec is too little.
 2015-12-02 17:12:04 +01:00
Gina Häußge
612005c4f6 Fixed a bug preventing OctoPrint from updating via github releases 
Noticed while testing update path from 1.2.7 to 1.2.8

*bangs her head against a wall*
 2015-12-02 09:25:15 +01:00
Gina Häußge
1d8cf86215 Updated translation source files and german translation 2015-12-01 11:42:57 +01:00
Gina Häußge
93bbedae86 Only process bed temps & commands if printer profile has heated bed 
Solves #1125
 2015-11-30 11:11:35 +01:00
Gina Häußge
40fe74ef45 Cut off terminal after 3000 lines 
When autoscroll was disabled, terminal could run on endlessly, eating
memory until the browser crashes. Now a hard upper limit ensures
that not more than 3000 lines are ever stored in the terminal. If autoscroll
is disabled and the limit is reached, no more log lines will be added. That
ensures that the log will not scroll and the current log excerpt will stay put.
 2015-11-27 15:05:55 +01:00
Gina Häußge
043b213a96 Move event processing for gcodefiles into corresponding viewmodel 
Also fixes a javascript error (gcodeFileViewModel unknown)
 2015-11-27 11:31:17 +01:00
Gina Häußge
6db57122b4 Catch and log all exceptions that might be raised in the watchdog 
Solves #1120
 2015-11-26 16:07:29 +01:00
Gina Häußge
d0eca800fb Make the current request's baseurl to a part of the cache key 
This way we create separate caches for URLs access via different schemes/prefixes/etc.
Otherwise our generated page might not work when accessing OctoPrint from external
after accessing it from internal once.
 2015-11-23 12:17:57 +01:00
Gina Häußge
a52a5ca338 GCodeViewer: Even if off screen render 100% view on PrintDone event 
Otherwise the GCODE Viewer will get stuck "half way through" if
"sync with progress" is enabled but the tab/browser tab loses focus
during printing and only regains it after the print has finished.
 2015-11-20 11:40:06 +01:00
Gina Häußge
acc85127c5 Track browser tab visibility, only activate webcam/gcode viewer when visible 
This might help with #1065 if indeed is related to background tab suspending behaviours in
browsers, but is a completely blind guess at this point since I still have not been able to
reproduce that issue myself.

Backported.

(cherry picked from commit 720cdad)
 2015-11-20 11:06:25 +01:00
Gina Häußge
a731f748d9 Moved existing hidden file checks to utilize octoprint.util.is_hidden_path 2015-11-20 10:02:06 +01:00
Gina Häußge
9a7bddd530 Also don't include hidden files in other templates 2015-11-19 19:03:04 +01:00
Gina Häußge
83f66e133e Do not include hidden files in listed gcode scripts 2015-11-19 18:58:56 +01:00
Gina Häußge
ab97abf13e Some fixes and unit tests for octoprint.util.atomic_write, .bom_aware_open and .tempdir 
(cherry picked from commit 4fcb853)
 2015-11-19 15:15:35 +01:00
Gina Häußge
7820c17d08 [Cura] Make plugin a bit more verbose regarding usage & setup 2015-11-19 11:42:12 +01:00
Salandora
9ed79adb8d Fix SD Support deactivated bug and added "unknown command" to the whitelist of errors 2015-11-17 19:32:34 +01:00
Gina Häußge
b98348de02 Cache rendered page and translation files indefinitely 2015-11-06 11:46:12 +01:00
Gina Häußge
a5094d403a Merge branch 'maintenance' of github.com:foosel/OctoPrint into maintenance 2015-11-05 17:58:51 +01:00
Gina Häußge
6b0dee26e5 Interpret M25 as a pause when not printing from SD too 2015-11-05 17:33:27 +01:00
Gina Häußge
b6a5cb47a1 Merge branch 'km/hotfix-flot-yaxis-cutoff' of https://github.com/kevingelion/OctoPrint into pr/kevingelion/km/hotfix-flot-yaxis-cutoff 2015-10-30 16:49:35 +01:00
Kevin Murphy
65efcec008 Change instance of row to row-fluid to avoid conflict with responsive CSS 2015-10-30 11:18:44 -04:00
Gina Häußge
a53195d2a0 Added Unit Tests for BlueprintPlugin mixin 
(cherry picked from commit 53a62ab)
 2015-10-26 09:15:54 +01:00
Marcel Hellwig
084fd8d433 add errorhandler decorator to blueprintplugin 
This will allow you to add an errorhandler for your blueprint easily.
(cherry picked from commit b6053c1)
 2015-10-26 09:12:17 +01:00
Gina Häußge
33306b6787 Fixed an earlier merge error 2015-10-26 09:11:44 +01:00
Gina Häußge
b4cb0dec87 Unit tests and some fixes for improved plugin settings processing 
(cherry picked from commit bcd0f34)
 2015-10-26 08:53:08 +01:00
Gina Häußge
063251fe03 Use get_all_data instead of get([], ...) construct 
(cherry picked from commit ffcbdba)
 2015-10-26 08:52:58 +01:00
Gina Häußge
9b3ef8b693 Fix: Persist all data different from default, not just current changes 
We need to merge with our current data since we only might get partial data
from our caller.
(cherry picked from commit 7ea1578)
 2015-10-26 08:52:46 +01:00
Gina Häußge
a5ce071939 Make sure only difference to default config is persisted for plugins 
This change should make sure that only those settings actually make it into config.yaml
per plugin that do differ from the default settings. Up until now the full dictionary as received
e.g. from the REST API was saved, regardless whether it contained (only) default values or not.
That led to a lot of "null" entries in the config.yaml file, which for one looked horrible and also
led to problems when a plugin actually wanted to change its default values.

With this commit, two things are done. One, upon saving a configuration the default
implementation of the save routine in the settings plugin now first diffs the new data against
the defaults and only saves what is different. Two, upon server startup a cleanup method is
now called on settings plugins whose default implementation fetches the current data stored
in config.yaml, diffs that against the defaults and only writes back the diff result. If that is empty
the entry is completely deleted from config.yaml.
(cherry picked from commit d70fe32)
 2015-10-26 08:52:05 +01:00
Gina Häußge
5c8d9007f6 Fixed some missing exception capturing 
(cherry picked from commit 2f86a6a)
 2015-10-23 13:36:27 +02:00
Gina Häußge
91163dc4f4 Fixed existing doctests, added some new ones, enabled doctests in nosetests 
(cherry picked from commit 02c3bf8)
 2015-10-23 13:36:18 +02:00
Gina Häußge
e875d042a7 Refreshed versioneer again 
(cherry picked from commit 7cd0adb)
 2015-10-23 09:53:25 +02:00
Gina Häußge
f05f850175 Switched to new version of versioneer 
Versions should now be PEP440 compatible.
(cherry picked from commit 711810d)
 2015-10-23 09:53:13 +02:00
Gina Häußge
9ce9af28c3 Updating versioneer & switch to PEP440 versioning 
(cherry picked from commit 137db0b)
 2015-10-23 09:51:50 +02:00
Gina Häußge
57bf457d97 Fix: current filename in job data should never be prefixed with / 
That was a tiny detail missing in 8bef18c2a8 that
caused issues with detecting which file was currently selected on the printer's
SD card (for "do not delete that" checks on the API).
 2015-10-22 13:42:57 +02:00
Gina Häußge
aa5099340e Two new callbacks for RepeatedTimer when cancelled or condition untrue 
(cherry picked from commit 9b9ecfe)
 2015-10-20 12:07:24 +02:00
Gina Häußge
693633bd1d RepeatedTimer now supports callback when timer stops 
(cherry picked from commit 3c5a976)
 2015-10-20 12:05:12 +02:00
Gina Häußge
c932e496fa SWU: Show reload dialog after update 
The notification and the (forced) dialog afterwards were way too
redundant.
 2015-10-08 17:08:36 +02:00
Gina Häußge
bbbdb3dde6 Note that z-based timelapses don't work when printing from SD 2015-10-08 10:22:09 +02:00
Gina Häußge
b9460b4890 Merge branch 'fix/uiEscaping' into maintenance 2015-10-08 09:52:08 +02:00
Gina Häußge
947f4c89cc Fixed a win-only issue causing the gcode view not to reload on file modification 2015-10-07 18:52:18 +02:00
Gina Häußge
5f982ec6c8 Merge branch 'fix/atomicWrites' into maintenance 2015-10-07 17:53:43 +02:00
Gina Häußge
859ea0d0e4 Added mime type guessing for downloads to Tornado 2015-10-07 17:19:18 +02:00