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

3942 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
e42ef3d070 Small fixes on the layer buttons 
Removed unnecessary (and broken) call to event.preventDefault,
moved styles to less/css and also made sure to disable the buttons
not currently usable.
 2016-08-31 17:20:23 +02:00
Gina Häußge
d2b0387994 Be sure that opts.url == urlToCall 2016-08-31 15:51:15 +02:00
Gina Häußge
e00de7145f Fixed some indentation 2016-08-30 18:05:22 +02:00
Gina Häußge
a13e12bb5e More work on JS Client documentation 2016-08-26 17:47:38 +02:00
Gina Häußge
12bc85694b Small optimizations on copy and move commands 2016-08-26 17:47:28 +02:00
Gina Häußge
efca776102 Merge branch 'maintenance' into devel 
Conflicts:
	src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2
	src/octoprint/plugins/softwareupdate/updaters/update_script.py
 2016-08-26 14:24:13 +02:00
Gina Häußge
21b7339187 SWU: Move branch config to update check & fix release version detection again 2016-08-26 14:18:17 +02:00
Gina Häußge
df1a97b0e1 SWU: Only enforce unequality comparison on release channel switch 2016-08-26 10:40:01 +02:00
Gina Häußge
66da377b64 SWU: Minor fixes in the octoprint check population 2016-08-26 10:19:20 +02:00
Gina Häußge
34e5b5d50f SWU: Sort github releases by version, not publication date 
We can't rely on the publication date anymore with the introduction of prerelease
channels, since e.g. a current devel prerelease might have been published
earlier than the latest stable but should still be considered the latest release for
this release channel
 2016-08-26 10:18:35 +02:00
Gina Häußge
882cf3a142 SWU: git reset => git reset --hard for forced version 2016-08-25 16:49:18 +02:00
Gina Häußge
d9a4ff47b6 Make sure to switch back to master for stable release channel 2016-08-25 16:30:35 +02:00
Gina Häußge
d538b3fd38 Adjust swu plugin settings to selected update method 2016-08-25 15:45:25 +02:00
Gina Häußge
f8386649bf Fix release channel selector 2016-08-25 13:32:18 +02:00
Gina Häußge
4fe944eb85 Actually trigger the beforePrintStarted script on print start 
Missing trigger caused by 5bf5e336ec
 2016-08-25 09:56:20 +02:00
Gina Häußge
b5bc03e711 First throw at release channels 
We start out with master (Stable), rc/maintenance (Maintenance) and rc/devel (Devel)
 2016-08-25 09:41:12 +02:00
Gina Häußge
2e27e640cd Better yet, mirror actual active login 2016-08-24 16:27:23 +02:00
Gina Häußge
1d8dea4d1b Fully mirror regular passive_login for auto login 2016-08-24 16:23:41 +02:00
Gina Häußge
4ff869c2fa Docs for settings overlay & improved hook docs 2016-08-19 15:40:43 +02:00
Gina Häußge
9165c9475d Docs for about dialog panels through the TemplatePlugin mixin 2016-08-19 13:57:58 +02:00
Gina Häußge
27ada38855 Update of docs for preemptive cache methods on UiPlugin + method rename 2016-08-19 13:49:32 +02:00
Gina Häußge
5b0bc8c3a8 Some text changed for the first and last page on the first run wizard 2016-08-19 13:36:31 +02:00
Gina Häußge
98b57650d9 Add first run wizard dialog for default printer profile 2016-08-19 11:42:06 +02:00
Gina Häußge
d2f8b957bc Modularize printer profile manager UI components 2016-08-19 11:41:29 +02:00
Gina Häußge
dedffe3514 Allow tracking if printer profiles where modified 
Needed for a first time setup wizard to configure default
printer profile.
 2016-08-19 11:39:25 +02:00
Gina Häußge
650cfac1cf Removed semi-finished CuraEngine 15.06+ implementation 
We'll need to turn that into a separate plugin and while at it also
move away from the generalized slicing profile format.

That's more a topic for after 1.3.0 however, so for now, just
clean this up.
 2016-08-19 09:57:19 +02:00
Gina Häußge
aaeb2ef4db Forgot to call the default_view if no plugin felt responsible 2016-08-19 09:00:38 +02:00
Gina Häußge
b435ecf9e8 Slightly modified logging for preemptive cache execution 2016-08-18 16:46:51 +02:00
Gina Häußge
066907391a Only cache responses with status codes >= 200 and < 400 2016-08-18 16:46:18 +02:00
Gina Häußge
3a79805b6f g.locale might be None 2016-08-18 16:45:21 +02:00
Gina Häußge
5a38e9a412 X-Force-View, not X-Forced-View 2016-08-18 16:44:44 +02:00
Gina Häußge
f93212b06d Merge branch 'maintenance' into devel 
Conflicts:
	src/octoprint/server/__init__.py
	src/octoprint/server/util/flask.py
	src/octoprint/server/views.py
 2016-08-18 16:17:54 +02:00
Gina Häußge
0a78c92407 Do access logging via custom request header instead of global flag 
We don't want any weird things to happen due to multithreading...
 2016-08-18 16:14:03 +02:00
Gina Häußge
95a449530e Force view via request headers instead of temporary flag 
The flag approach is not thread safe.
 2016-08-18 15:56:27 +02:00
Gina Häußge
d92df9c698 Merge branch 'maintenance' into devel 
Conflicts:
	src/octoprint/server/util/flask.py
	src/octoprint/server/views.py
	src/octoprint/settings.py
 2016-08-18 15:48:31 +02:00
Gina Häußge
60c46a3fc4 Fixed use of preemptive cache exceptions in "unless" implementation 2016-08-18 14:05:12 +02:00
Gina Häußge
8782f77577 Slightly modified logging for cached.gif 2016-08-18 14:01:25 +02:00
Gina Häußge
08f9529c6d Merge remote-tracking branch 'origin/maintenance' into maintenance 2016-08-18 13:58:38 +02:00
Gina Häußge
6499bd160f Only wait for preemptive cache if it's enabled for path & view 2016-08-18 13:56:46 +02:00
Gina Häußge
f43381ce30 Merge branch 'maintenance' into devel 
Conflicts:
	src/octoprint/filemanager/__init__.py
 2016-08-18 12:28:13 +02:00
Gina Häußge
599098a589 Have intermediary reload only after preliminary caching 2016-08-18 12:27:30 +02:00
Gina Häußge
aa57277ff8 Only report files as enqueued for analysis which actually are 2016-08-18 08:39:19 +02:00
Gina Häußge
7cc3403a41 Info logging for preemptively caching plugins 2016-08-18 08:34:43 +02:00
Gina Häußge
74a94469b6 Fix an issue with global_get from 3rd party plugins 2016-08-17 14:50:53 +02:00
Gina Häußge
00923427cb Really do force a plugin view during preemptive caching 
We don't need to check if the plugin will handle the UI, we just force
it to handle it.
 2016-08-16 14:04:45 +02:00
Gina Häußge
79c95aa3b4 Merge branch 'maintenance' into devel 
Conflicts:
	src/octoprint/filemanager/storage.py
	src/octoprint/templates/sidebar/state.jinja2
 2016-08-16 09:34:49 +02:00
Gina Häußge
217e54d81c Make sure we are still in printing state before sending next line 
We might just have "eaten" a line used for triggering a pause (e.g. an M0)
and thus might not be eligible to send the next line from the streamed file
anymore.

Solves #1448
 2016-08-16 09:29:29 +02:00
Gina Häußge
b05beb27b5 Don't sanitize . or .. folder names 2016-08-15 16:13:35 +02:00
Gina Häußge
d81ec15f43 Improvements in fuzzy print time algorithm 
Also use new fuzzy print time in gcode viewer to have some consistency.
 2016-08-15 15:42:06 +02:00
Gina Häußge
39372a9475 Also sanitize leading . 
That way hidden files that are uploaded will be "de-hidden".

Note that NO "de-hiding" of existing files will take place!
 2016-08-15 14:19:36 +02:00