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

2980 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
8abf152d40 SorteablePlugin => SortablePlugin 2015-09-04 16:42:49 +02:00
Gina Häußge
e4dd4483d4 Sanity checking of the order data returned by plugins 2015-09-04 16:08:57 +02:00
Gina Häußge
89ccfae919 Fixed get_filtered_implementation again 
Apparently, *args and named but optional arguments in combination are
more tricky to get right than they first appear.
 2015-09-04 15:54:48 +02:00
Gina Häußge
5863f99b75 Always sort plugins by their identifier by default 2015-09-04 15:38:15 +02:00
Gina Häußge
2a52b6d1a2 Allow sorting of Startup and ShutdownPlugins 2015-09-04 15:01:35 +02:00
Gina Häußge
44c76fa70b Made hooks and templates sortable 2015-09-04 11:25:27 +02:00
Gina Häußge
aa6998ec5e Merge branch 'dev/increase_temp_polling' into devel 2015-09-03 19:01:16 +02:00
Gina Häußge
64bb1adf8c Added CHANGELOG entry for second temperature polling interval 2015-09-03 18:59:05 +02:00
Gina Häußge
f6acca5db2 Set default value for temperature polling when target is set to 2s 
1s might be a bit fast as a default for certain boards, so better leave it at
something less spammy.
 2015-09-03 18:57:11 +02:00
Gina Häußge
24f769ff80 Moved both temperature intervals into the same "section" 2015-09-03 17:46:03 +02:00
Gina Häußge
f2c07e8f96 First throw at an "About" dialog 2015-09-03 17:08:15 +02:00
Nicanor Romero Venier
1e93638794 Changed UI layout for the temperature interval 2015-09-03 15:52:43 +02:00
Nicanor Romero Venier
558465fdcd Added a new timeout for polling when a target temperature is set 2015-09-03 15:23:44 +02:00
Gina Häußge
540cf4f4d9 Merge branch 'maintenance' into devel 
Conflicts:
	.versioneer-lookup
	CHANGELOG.md
 2015-09-02 20:19:29 +02:00
Gina Häußge
a2e5fc0c5c maintenance branch is now 1.2.7-dev 2015-09-02 20:18:18 +02:00
Gina Häußge
536bb31965 Forgot the commit link in the changelog 2015-09-02 19:59:49 +02:00
Gina Häußge
ef46a49430 Also included #1041 in 1.2.6 2015-09-02 19:55:24 +02:00
Gina Häußge
8e28ddd6a4 Fixed versioneer lookup file again 
Runaway regex ;)
(cherry picked from commit 78277ac)
 2015-09-02 19:53:18 +02:00
Koen Kooi
ab8b0230bd versioneer lookup: add support for detached checkouts 
When doing 'git checkout <rev>' or 'git checkout <tag>' there will be no
branch info:

	$ git branch
	* (detached from 96fc70b)

After whitelisting '\(detached.*' we get:

	$ python setup.py version
	running version
	got version from git {'version': '1.2.5-1-gfd73e02', 'branch': 'HEAD',
	'full': 'fd73e02f4fa9f286407ad688feeeee3ebaffea60'}
	Version is currently: 1.2.5-1-gfd73e02

The '-1-gfd73e02' is this commit on top of the 1.2.5 tag.

While detached checkouts should be discouraged some buildsystems (e.g.
OpenEmbedded) have no real way to avoid it, which is what this patch
fixes. Actual people doing a checkout should use a branch.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
(cherry picked from commit 987e637)
 2015-09-02 19:51:11 +02:00
Gina Häußge
754ef428a0 Preparing release of 1.2.6 2015-09-02 19:49:49 +02:00
Gina Häußge
455474841e Pinned psutil version to 3.1.1 (and all other dependencies) 
Something in the recently released psutil 3.2.0 version causes installations via
python setup.py install to fail that list psutil as requirement.

Pinning to 3.1.1 solves that problem for now.
 2015-09-02 19:38:18 +02:00
Gina Häußge
50bff32cd5 Merge branch 'devel' of https://github.com/Mikk36/OctoPrint into pr/Mikk36/devel 2015-09-02 15:09:36 +02:00
Mikk Kiilaspää
2692044c13 Associate Z-lift moves with the layer they were made on 2015-09-02 15:50:36 +03:00
Mikk Kiilaspää
783fbd9c1e Fix formatting 2015-09-02 15:49:02 +03:00
Gina Häußge
628a9f43e9 Let's up the restart-detection-timeout a bit 
Just for experimental purposes.
 2015-09-02 11:34:32 +02:00
Gina Häußge
78277acd3c Fixed versioneer lookup file again 
Runaway regex ;)
 2015-09-02 10:03:39 +02:00
Gina Häußge
b52422db2e Simplifier comm _monitor thread a bit 
Should now also trigger comm timeouts when not printing
 2015-09-02 09:36:34 +02:00
Gina Häußge
a79e38a350 Settings saving now supports callbacks, SWU plugin utilizes those 2015-09-01 17:18:08 +02:00
Gina Häußge
8294082652 Fix: properly save terminal filters 2015-09-01 16:26:57 +02:00
Gina Häußge
098c169ca5 SWU: Do not show "settings refreshed" dialog when saving plugin settings 2015-09-01 10:43:52 +02:00
Gina Häußge
42e11acb44 Fixed a merge error 2015-09-01 09:42:44 +02:00
Gina Häußge
65ee0ccd2f Merge pull request #1041 from koenkooi/detached-checkouts 
versioneer lookup: add support for detached checkouts
 2015-09-01 09:33:16 +02:00
Koen Kooi
987e637067 versioneer lookup: add support for detached checkouts 
When doing 'git checkout <rev>' or 'git checkout <tag>' there will be no
branch info:

	$ git branch
	* (detached from 96fc70b)

After whitelisting '\(detached.*' we get:

	$ python setup.py version
	running version
	got version from git {'version': '1.2.5-1-gfd73e02', 'branch': 'HEAD',
	'full': 'fd73e02f4fa9f286407ad688feeeee3ebaffea60'}
	Version is currently: 1.2.5-1-gfd73e02

The '-1-gfd73e02' is this commit on top of the 1.2.5 tag.

While detached checkouts should be discouraged some buildsystems (e.g.
OpenEmbedded) have no real way to avoid it, which is what this patch
fixes. Actual people doing a checkout should use a branch.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
 2015-09-01 09:06:06 +02:00
Gina Häußge
4f3e2d7f49 Merge branch 'maintenance' into devel 
Conflicts:
	.versioneer-lookup
	CHANGELOG.md
	src/octoprint/plugins/softwareupdate/__init__.py
	src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js
	src/octoprint/plugins/softwareupdate/updaters/pip.py
	src/octoprint/plugins/softwareupdate/updaters/update_script.py
	src/octoprint/plugins/virtual_printer/virtual.py
	src/octoprint/server/util/sockjs.py
	src/octoprint/server/views.py
	src/octoprint/static/css/octoprint.css
	src/octoprint/static/js/app/helpers.js
	src/octoprint/static/js/app/viewmodels/settings.js
	src/octoprint/templates/dialogs/settings.jinja2
	src/octoprint/templates/dialogs/settings/features.jinja2
	src/octoprint/templates/dialogs/settings/server.jinja2
	src/octoprint/translations/de/LC_MESSAGES/messages.mo
	src/octoprint/translations/de/LC_MESSAGES/messages.po
	src/octoprint/util/comm.py
	translations/de/LC_MESSAGES/messages.mo
	translations/de/LC_MESSAGES/messages.po
	translations/messages.pot
 2015-09-01 08:34:24 +02:00
Gina Häußge
ae4e4f22c4 maintenance branch is now 1.2.6-dev 2015-08-31 15:57:11 +02:00
Gina Häußge
96fc70bdb2 Preparing release of 1.2.5 2015-08-31 10:28:52 +02:00
Gina Häußge
8ed0befd62 Fixed bug that made browser crash when trying to log in 
Trying to serialize view models or browser events as username/password probably was not the best of ideas ;)
(cherry picked from commit c7fd480)
 2015-08-31 09:44:52 +02:00
Gina Häußge
766c0c21d4 Adjusted README 
(cherry picked from commit 92c02df)
 2015-08-31 09:26:28 +02:00
Salandora
7d50563666 Custom Control fix in less file 
(cherry picked from commit 10ad8dd)
 2015-08-31 09:26:20 +02:00
Gina Häußge
8fddd8dd87 Updated CSS 2015-08-31 09:19:39 +02:00
Gina Häußge
92c02dfbc6 Adjusted README 2015-08-31 09:19:32 +02:00
Salandora
10ad8dd953 Custom Control fix in less file 2015-08-31 08:54:03 +02:00
Gina Häußge
024cf88589 Unit tests for octoprint.util.CountedEvent 2015-08-28 17:14:58 +02:00
Gina Häußge
73620678c4 Unit tests for octoprint.util.RepeatedTimer 2015-08-28 16:56:14 +02:00
Gina Häußge
9b9ecfe9be Two new callbacks for RepeatedTimer when cancelled or condition untrue 2015-08-28 16:53:22 +02:00
Salandora
4011f60ff9 Edge Fix 
Thanks @foosel for the Informations

Conflicts:
	src/octoprint/server/views.py
 2015-08-28 09:36:47 +02:00
Gina Häußge
37950cb466 Fixing some more merge errors 2015-08-28 08:58:12 +02:00
Gina Häußge
5df088cfee Merge pull request #1035 from Salandora/edgeFix 
Edge Fix
 2015-08-28 08:57:38 +02:00
Gina Häußge
2824b967ff Fixed a merge error 2015-08-28 08:20:20 +02:00
Gina Häußge
7b8bf2cf5c M112 support or the virtual printer 
(cherry picked from commit 22a6604)
 2015-08-28 08:19:03 +02:00