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

4117 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
d28e0988fb Merge branch 'maintenance' into devel 2016-11-07 16:18:26 +01:00
Gina Häußge
2952b2622e Do not hiccup on ipv6 addresses in the HTTP Host header 
Fixed port extraction. Now supports hostname, hostname + port,
ipv4, ipv4 + port, ipv6, ipv6 + port

Fixes #1571
 2016-11-07 16:17:16 +01:00
Gina Häußge
e847b355cd Fixed an issue with versioneer detecting sdist version 
Implicit match on \n appears to be causing issues when
generating the sdist tarball under Windows. Matching against
\s+ instead works reliably. Simply including the newline in the
matched JSON string would also work fine.
 2016-11-07 14:24:53 +01:00
Gina Häußge
970880dee6 Added user roles and enabled plugins to settings ETag 
Otherwise the cache of /api/settings would not be properly invalidated
on a change in either the user login state or the set of active plugins.

See also #1576
 2016-11-07 11:55:26 +01:00
Gina Häußge
4689a405a3 Merge branch 'dev/positionRecordingOnPause' into devel 2016-11-04 12:12:38 +01:00
Gina Häußge
fae27c77b5 Have virtual printer coordinates start at 0.0 2016-11-04 12:12:30 +01:00
Gina Häußge
3f0bfa0fc8 New POSITION_UPDATE event for responses to M114 2016-11-04 12:11:16 +01:00
Gina Häußge
35cf623f81 Merge pull request #1550 from dattas/feature/cancel-confirmation 
Add confirmation dialog to cancel to prevent accidental cancel of prints
 2016-10-26 11:03:40 +02:00
Gina Häußge
7abd35196e Merge pull request #1554 from FHeilmann/FHeilmann-adjust_values_func 
Adjust output of values() classmethod to not include function itself
 2016-10-26 11:02:12 +02:00
Gina Häußge
21e342ff8a Merge pull request #1561 from donovan6000/devel 
Fixed Cura plugin's get_pos_x/y returning the wrong value when self._…
 2016-10-26 08:51:32 +02:00
donovan6000
6114ee4f32 Fixed Cura plugin's get_pos_x/y returning the wrong value when self._posX/Y is 0 2016-10-25 22:46:32 -07:00
Florian Heilmann
5ac934bcc4 Fix Typos 
Note to self: double and triple check more!

turn "=" into "=="
 2016-10-22 12:53:32 +02:00
Florian Heilmann
fd1016695f Adjust output of values() classmethod 
The way it was before, the function would also return itself. This isn't really a problem here, but if someone takes this function as a guide (like me) they can run into problems when iterating over the returned array, as it contains an element representing "values()" itself.

Another approach would be make use of the inspect package and replace name="values" with inspect.ismethod(name)
 2016-10-22 12:39:16 +02:00
Gina Häußge
728172136a Record position on pause & track F 2016-10-21 20:38:15 +02:00
Gina Häußge
d3cc96523e Fix M114 in virtual printer 2016-10-21 20:37:41 +02:00
Dattas Moonchaser
7fb2745f8f Add confirmation dialog to cancel to prevent accidental cancel of print (which is hard to undo!) 2016-10-19 15:22:15 -06:00
Gina Häußge
b38d1810dc Preparing release of 1.3.0rc1 2016-10-19 12:32:25 +02:00
Gina Häußge
0fcef2a8aa Updated german translation 2016-10-19 12:17:34 +02:00
Gina Häußge
6b41b8826e Slight rewording in Cura wizard 2016-10-19 12:17:17 +02:00
Gina Häußge
d96991bbf6 Fix detection if webcam wizard is required 2016-10-19 11:05:05 +02:00
Gina Häußge
8c336afeab Mark support annountement as seen by default 
devel has wizard screen to hint people at support page
 2016-10-19 11:03:49 +02:00
Gina Häußge
bfae91d737 Another jquery update 2016-10-18 12:58:26 +02:00
Gina Häußge
8e90555381 Updated & renamed some JS dependencies 2016-10-18 12:31:56 +02:00
Gina Häußge
20d15b2abb Documented usage of js client lib 2016-10-18 11:26:17 +02:00
Gina Häußge
df5eae91a6 Adjust empty asset handling to match style in devel 2016-10-17 14:31:56 +02:00
Gina Häußge
c66be226b1 Merge branch 'maintenance' into devel 
# Conflicts:
#	CHANGELOG.md
 2016-10-17 14:24:17 +02:00
Gina Häußge
7efdeced62 Merge branch 'rc/maintenance' into maintenance 2016-10-17 14:23:43 +02:00
Gina Häußge
2f79d9d226 Preparing release of 1.2.17rc4 2016-10-17 12:25:51 +02:00
Gina Häußge
88f8077b77 Plugin JS files might be empty, need to handle that 
Otherwise webassets will explode with empty file list on bundle creation.
 2016-10-17 12:16:53 +02:00
Gina Häußge
2f7a400c5a Support for M116 
When encountered: set heatup and long_running_command flags to True, set heatup start time
 2016-10-17 11:50:23 +02:00
Gina Häußge
4724153637 Restrict upload dialogs for plugins and language packs to supported extensions 2016-10-17 11:33:23 +02:00
Gina Häußge
93196993d1 Last modified may be any of int, long, float 
... and complex for good measure. Basically: a number.
 2016-10-17 10:46:49 +02:00
Gina Häußge
696979789e Merge branch 'improve/supportRinTempCommands' into devel 
# Conflicts:
#	src/octoprint/plugins/virtual_printer/virtual.py
 2016-10-17 10:44:18 +02:00
Gina Häußge
696904bc49 Support M1{09|90} R<temp> in virtual printer too 2016-10-17 10:41:39 +02:00
Gina Häußge
cd578dc2e1 Checking M109/M190 for R should actually check for R and not S 
Thanks @FHeilmann
 2016-10-17 10:29:16 +02:00
Gina Häußge
0d8fdfae26 Trust Tc over T when parsing temps from the firmware 2016-10-17 10:27:06 +02:00
Gina Häußge
534b56b721 Merge branch 'improve/supportRinTempCommands' into devel 2016-10-17 09:48:15 +02:00
Gina Häußge
e15956883a Add support for R parameter in M109/M190 2016-10-14 18:19:08 +02:00
Gina Häußge
9fb8883923 Merge branch 'fix/issue1541' into devel 2016-10-14 16:24:43 +02:00
Gina Häußge
3f8dde75d5 Persist settings after changing default printer profile 
Fixes #1541
 2016-10-14 16:23:47 +02:00
Gina Häußge
6e39ea046f Merge branch 'fix/issue1543' into devel 2016-10-14 16:02:00 +02:00
Gina Häußge
bc5044b125 Fix target temperature propagation from comm layer 
When setting the tracked target temperature from a sent temperature
command, the changes in tracked temperature were not propagated
from the comm layer to registered callbacks.

But since the standard printer also didn't make a copy of the mutable
dict of tool temperatures, those were in fact updated even without
propagation in the printer implementation when the values in the
comm layer got updated, whereas the bed temperature - an immutable
tupel - was not.

Two wrongs sometimes do in fact make a right. In this case that led
to target temperature changes on the tools immediately reflecting
in printer.get_current_temperatures after the command was sent,
but changes to the bed target taking until the next M105 response
to propagate.

Decoupling the data structures and adding propagation commands
to the comm layer solves this issue.

Fixes #1543
 2016-10-14 16:01:03 +02:00
Gina Häußge
d1f79dffd8 Docs: update screenshot of plugin manager 2016-10-14 14:43:38 +02:00
Gina Häußge
243e4107a3 Docs: Update cura_engine binary + compiling instructions for jessie 2016-10-14 14:35:22 +02:00
Gina Häußge
f7eb12a3ee Docs for {Reload|Restart}NeedingPlugin 2016-10-14 14:15:33 +02:00
Gina Häußge
ee92fc6907 Docs for CLI of software update plugin 2016-10-14 13:57:01 +02:00
Gina Häußge
62939ef11b Clarification regarding webcam URL formats 2016-10-14 12:35:01 +02:00
Gina Häußge
5f60017bb2 Merge branch 'improve/curaImporter' into devel 
# Conflicts:
#	src/octoprint/plugins/cura/templates/cura_settings.jinja2
 2016-10-14 12:00:17 +02:00
Gina Häußge
c863562d12 Limit cura profile importer to .ini files and clarified support again 2016-10-14 11:58:39 +02:00
Gina Häußge
44402fda3a Use CleaningTimedRotatingFileHandler in virtual printer 2016-10-14 09:37:06 +02:00