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

3491 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
cb687f01f7 Merge branch 'maintenance' into devel 
Conflicts:
	src/octoprint/static/js/app/viewmodels/files.js
	src/octoprint/util/pip.py
 2016-02-15 10:01:02 +01:00
Gina Häußge
0a3dc4b354 Fixed a bug that prevented the "Upload to SD" button from working 
Introduced with the bug fix for #1196

Closes #1224
 2016-02-15 09:58:04 +01:00
Gina Häußge
fe134e7986 Added back the "test without plugins" clause to the bug reporting guide 2016-02-12 12:10:19 +01:00
Gina Häußge
eacd9f7b66 Always read all available lines from stdout and stderr 
Should produce faster output.
 2016-02-11 10:37:56 +01:00
Gina Häußge
b5f40cfd69 Always read all available lines from stdout and stderr 
Should produce faster output.
 2016-02-11 10:36:19 +01:00
Gina Häußge
f07e3d9f2d Fixed output processing for pip processes 2016-02-11 09:55:44 +01:00
Gina Häußge
b2391322d4 Removed sudo stuff from plugin manager, don't display full pip command 2016-02-11 09:38:35 +01:00
Gina Häußge
98b512b32e Correctly handle pip 1.1 2016-02-11 09:38:09 +01:00
Gina Häußge
e28ca60f21 Merge branch 'maintenance' into devel 
Conflicts:
	CHANGELOG.md
 2016-02-10 16:46:56 +01:00
Gina Häußge
3fb9248d2a More timelapse unit tests 2016-02-10 16:44:46 +01:00
Gina Häußge
3dd0ace076 maintenance branch is now 1.2.10.dev 2016-02-10 16:44:18 +01:00
Gina Häußge
abe68adac8 Preparing release of 1.2.9 2016-02-10 14:47:18 +01:00
Gina Häußge
99c65b8cf4 Unit test for unrendered timelapse cleanup 2016-02-10 14:40:10 +01:00
Gina Häußge
742818c2ca Delete unrendered legacy timelapses when encountering them 2016-02-10 14:34:33 +01:00
Gina Häußge
d4072a3afd Updated translation files & german translation 2016-02-10 12:43:13 +01:00
Gina Häußge
92c65cb21c Added info about branches and versioning to contribution guide 2016-02-10 11:09:31 +01:00
Gina Häußge
d20a9f64a2 Updated AUTHORS.md 
(cherry picked from commit ab52e28)
 2016-02-10 10:16:04 +01:00
geoporalis
ed82488c5b typo fixed 
(cherry picked from commit 4e91284)
 2016-02-10 10:15:41 +01:00
Gina Häußge
ab52e2850a Updated AUTHORS.md 2016-02-10 10:15:01 +01:00
Gina Häußge
963f22db36 Merge pull request #1215 from geoporalis/typo 
Typo in git_commit.py
 2016-02-10 10:13:12 +01:00
Gina Häußge
5955d3d32e Added estimates total time from gcode viewer to gcode viewer tab 
Implements request in #1204
 2016-02-10 09:58:40 +01:00
Gina Häußge
14da24413b selef => self, setProgressBar => _setProgressBar 
The one in which @foosel finally understands why the progress bar didn't
seem to work on devel anymore.
 2016-02-10 08:45:57 +01:00
Gina Häußge
90353c6e7d Merge branch 'improve/uploadFileFilter' into devel 
Conflicts:
	src/octoprint/server/views.py
 2016-02-09 18:05:27 +01:00
Gina Häußge
682c3dd8e3 Limit file upload dialogs to supported file extensions 
See #1196
 2016-02-09 18:03:04 +01:00
Gina Häußge
56f2dc9d8e Make improve/... branches behave as maintenance branches 
Felt too wrong to call improvements fixes all the time.
 2016-02-09 17:55:29 +01:00
Gina Häußge
548bec682e Merge branch 'maintenance' into devel 
Conflicts:
	src/octoprint/util/pip.py
 2016-02-09 14:54:56 +01:00
Gina Häußge
71941f337d Include cursor control characters in CSI ANSI regex pattern 2016-02-09 14:48:30 +01:00
Gina Häußge
910d965ede Merge branch 'fix/stripAnsiFromPipOutput' into devel 
Conflicts:
	src/octoprint/util/pip.py
 2016-02-09 14:39:34 +01:00
Gina Häußge
b347e96748 Pip 8 outputs ANSI codes which we don't want in our output 2016-02-09 12:54:59 +01:00
Gina Häußge
b51274c145 Merge branch 'fix/m28hiccup' into devel 2016-02-09 11:33:20 +01:00
Gina Häußge
8069d08d3b Do not hiccup on manually sent M28 commands 
In case of trying to switch to state printing with no selected file that
scenario is now caught by setting an internal manualStreaming flag.
That will stop the M105 polling until M29 is sent (through whatever
means).

Note that printing is not disabled... this is merely for testing stuff and
not encouraged to be used for actually streaming files to the printer,
use the built-in functionality for that!
 2016-02-09 11:32:56 +01:00
geoporalis
d7e86810e6 Merged in geoporalis/typo-fixed-1455011257678 (pull request #1) 
typo fixed
 2016-02-09 10:52:29 +01:00
geoporalis
4e9128454a typo fixed 2016-02-09 09:47:49 +00:00
Gina Häußge
ae23f09edf Merge branch 'maintenance' into devel 2016-02-09 10:46:14 +01:00
Gina Häußge
4b7552e56e Fixed file manager unit tests, added tests for print recovery functionality 2016-02-09 10:45:54 +01:00
Gina Häußge
d54dcd1d8d Merge branch 'maintenance' into devel 
Conflicts:
	src/octoprint/util/comm.py
 2016-02-09 09:41:49 +01:00
Gina Häußge
c4a1ed2590 Merge branch 'maintenance' into fix/persistPrintRecoveryData 2016-02-08 19:28:40 +01:00
Gina Häußge
e443c7df2f Use path in storage instead of full path for print recovery 2016-02-08 16:44:37 +01:00
Gina Häußge
cf545c454a Merge branch 'maintenance' into devel 
Conflicts:
	src/octoprint/server/views.py
 2016-02-08 13:06:14 +01:00
Gina Häußge
b9372d7300 Fixed wrongly positioned parenthesis 
Caused an internal server error if / was requested with a different default language than
english that was not available in the i18n bundles.
 2016-02-08 13:04:02 +01:00
Gina Häußge
9e8b5312d5 Persist print recovery data on print failures 2016-02-08 12:47:13 +01:00
Gina Häußge
892ebf3979 Fixed something missed by refactoring due to different branch... 2016-02-08 11:30:48 +01:00
Gina Häußge
fd90326fba Use [sys.executable, "-m", "pip"] for the CLI pip stuff too 2016-02-04 13:55:42 +01:00
Gina Häußge
7a7b0e7c68 Have the plugin manager use the LocalPipCaller 
We don't need user-definable pip command paths here,
that will only lead to tears when the pip command belongs
to a wrong Python environment and nothing installs as
expected.
 2016-02-04 13:55:10 +01:00
Gina Häußge
e68ec435ea Made PipCaller compatible to pip 8.0.0 
pip 8 doesn't output ANY of the generated stdout output from
setup.py anymore. So instead of transfering the info we need about
a pip environment on stdout, we now need a temporary folder.

Yay.
 2016-02-04 13:54:03 +01:00
Gina Häußge
c3776106ec Merge branch 'maintenance' into devel 2016-02-03 12:53:12 +01:00
Gina Häußge
f79d496c7c Revert "Only trigger drag overlay for files, not texts" 
This reverts commit 1e429606e1.

Commit used functionality that currently is only available in
Chrome and maybe Opera. No alternative solution could be found
that works reliably across browsers.
 2016-02-03 11:43:55 +01:00
Gina Häußge
6f0bfb38d7 Merge branch 'maintenance' into devel 
Conflicts:
	src/octoprint/static/css/octoprint.css
 2016-02-03 09:16:20 +01:00
Gina Häußge
73a587b3e4 Added missing entries to AUTHORS.md 2016-02-03 09:04:27 +01:00
Gina Häußge
fac4aad05f Merge branch 'master' of https://github.com/2ndalpha/OctoPrint into pr/2ndalpha/master 2016-02-03 08:58:59 +01:00