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

2773 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
8a79c6cdfe Merge pull request #1014 from DanLipsitt/fix/assert_called_once 
Fix call to non-existent Mock method.
 2015-08-07 14:01:23 +02:00
Dan Lipsitt
39d00a1d94 Fix calls to non-existent Mock method. 2015-08-06 17:31:43 -07:00
Gina Häußge
d773b9d486 Merge pull request #1002 from markwal/connectiontabunfold1001 
Fix for #1001 connection tab not unfolding
 2015-07-30 11:16:53 +02:00
Mark Walker
af67d8bfb5 Fix for #1001 connection tab not unfolding 
Defer collapsing the connection element until the whole wrapper part is
visible (it's hidden for non-admins).
 2015-07-30 01:43:10 -07:00
Gina Häußge
94625c45b9 Merge branch 'devel' of github.com:foosel/OctoPrint into devel 2015-07-29 09:19:02 +02:00
Gina Häußge
7c90fe599c Added @masterhou to AUTHORS.md 2015-07-29 09:16:55 +02:00
Gina Häußge
a564de25f6 Merge branch 'master-wave' of https://github.com/masterhou/OctoPrint into pr/masterhou/master-wave 2015-07-29 09:13:51 +02:00
Thomas Hou
200ad3b888 fixed bug: when new job start, job progress is last 100%. 2015-07-28 17:51:32 +08:00
Gina Häußge
2e27b94769 responsive => snappy 
Finally found a replacement for the word "responsive", which these 
days is almost inclusively understood as "viewport adjusting" 
instead of its original meaning "reacting quickly".

Thanks to the javascript world, even "reactive" isn't an option
anymore, this term has now been hijacked as well.
 2015-07-27 23:12:55 +02:00
Gina Häußge
1bb28ddbc2 Merge pull request #989 from Diaoul/patch-2 
Add status support to init script
 2015-07-26 16:33:54 +02:00
Antoine Bertin
9ed122a3bd Add status support to init script 2015-07-26 15:41:02 +02:00
Gina Häußge
88eb124a35 Improved settings dialog behaviour 
* Show when settings are saving
  * Show when settings are being retrieved
  * Disable Send/Cancel buttons while settings are saving
  * Prevent concurrent retrieval
 2015-07-24 14:27:02 +02:00
Gina Häußge
7708eeaa87 Custom try-catch block for jinja 
Allows some more error checking in templates. Not used at the moment but
might come in handy in the future.
 2015-07-24 12:15:36 +02:00
Gina Häußge
d25202d94e Capture compilation errors on additional templates 
Shouldn't cause the whole page not to render but log an error. Should
provide more resilience against bad plugins.
 2015-07-24 12:14:00 +02:00
Gina Häußge
6f5c6f5404 PipCaller now manages special parameters on its own 
The class knows about which pip versions support --process-dependency-links, which
need --no-use-wheel and which are broken altogether and adds/removes these parameters
accordingly or outright reports the broken pip version.
 2015-07-23 15:00:47 +02:00
Gina Häußge
795c2c87f5 Merge branch 'maintenance' into devel 
Conflicts:
	.versioneer-lookup
	CHANGELOG.md
	src/octoprint/plugins/pluginmanager/__init__.py
	src/octoprint/util/__init__.py
 2015-07-23 12:22:02 +02:00
Gina Häußge
1f0dbf8f7f maintenance branch is now 1.2.5-dev 2015-07-23 12:19:27 +02:00
Gina Häußge
9a6099ffc2 PMGR: Dependency links can make pip install take longer 
Depending on the pip version pip might first fetch the full index of packages available
on PyPI instead of just directly processing the provided link.

Display corresponding message to user from backend to make sure they don't
think something broke.
 2015-07-23 10:54:39 +02:00
Gina Häußge
25de95dc93 Preparing release of 1.2.4 2015-07-23 09:54:27 +02:00
Gina Häußge
57f6e1e1bc Some more hints where to find documentation and support 2015-07-23 08:48:11 +02:00
Gina Häußge
edf9c40941 Re-added dependency_links option for create_plugin_setup_parameters 
(cherry picked from commit a59642b)
 2015-07-22 22:10:31 +02:00
Gina Häußge
a59642bb2b Re-added dependency_links option for create_plugin_setup_parameters 2015-07-22 22:08:15 +02:00
Gina Häußge
4dd4a2cc9c Revert "Remove dependency_links support again" 
This reverts commit be423e49fd.

Conflicts:
	src/octoprint/plugins/pluginmanager/__init__.py
	src/octoprint/plugins/softwareupdate/updaters/pip.py
(cherry picked from commit c24ba82)
 2015-07-22 19:06:39 +02:00
Gina Häußge
c24ba824d6 Revert "Remove dependency_links support again" 
This reverts commit be423e49fd.

Conflicts:
	src/octoprint/plugins/pluginmanager/__init__.py
	src/octoprint/plugins/softwareupdate/updaters/pip.py
 2015-07-22 16:57:32 +02:00
Gina Häußge
4ddef52fb2 Changelog entry for server command settings 2015-07-22 11:03:34 +02:00
Gina Häußge
40e5addef0 Merge branch 'feature/newSettingServerCommands' into devel 2015-07-22 11:01:22 +02:00
Gina Häußge
14c1069e41 Fixed two swapped vars 2015-07-21 18:29:32 +02:00
Gina Häußge
21350fa95a Added documentation for server commands 2015-07-21 18:07:52 +02:00
Gina Häußge
e2e6318391 Reordered and tooltipped new server commands 2015-07-21 18:02:24 +02:00
Gina Häußge
7986a2ff56 Remove left over observables that are no longer needed 2015-07-21 18:02:03 +02:00
Gina Häußge
f1075f648c Only migrate server commands when not already set 
Also migrate for any config version < 4 (incl. None) and make sure
the other migrations may happen on top of that if necessary. Added
some comments to explain necessary migrations.
 2015-07-21 17:55:08 +02:00
Gina Häußge
b04da70ce6 Allow deletion of a key from settings that is no longer in defaults 2015-07-21 17:52:49 +02:00
Gina Häußge
81bc8c784a Don't reopen notification on mouse-over while closing 
(cherry picked from commit 9839f4b)
 2015-07-21 16:57:39 +02:00
Gina Häußge
9839f4b9a9 Don't reopen notification on mouse-over while closing 2015-07-21 16:55:14 +02:00
Gina Häußge
294e7fc2db Patch for the js warnings referred to in #966 2015-07-21 11:54:06 +02:00
Gina Häußge
e21ae9fabc Removed unpatched minified bootstrap2 js again 2015-07-21 11:44:27 +02:00
Gina Häußge
625515a9d2 Upgrade of jQuery & Bootstrap2 
Bootstrap2 also includes a patch for the js warnings referred to in #966
 2015-07-21 11:42:54 +02:00
Nicanor Romero Venier
1cdd61fcbf Added migration step for new settings. 2015-07-20 19:21:45 +02:00
Gina Häußge
4f5dc70828 Refactored timelapse core 
Capturing is now queue based, rendering will not start until all images have been captured,
and timed postroll does not depend on system time anymore.

Also refactored some of the names to be python naming compliant while at it.
 2015-07-20 16:42:28 +02:00
Gina Häußge
3c5a9766c6 RepeatedTimer now supports callback when timer stops 2015-07-20 16:29:29 +02:00
Marc
6e632d02a0 Fixes usersettings never reached the client's browser 
(cherry picked from commit 8e235af)
 2015-07-20 10:10:00 +02:00
Gina Häußge
50ff0d810f Fixed a missing self.buffer() 
(cherry picked from commit 0fa22937e0)
 2015-07-20 10:09:33 +02:00
Mark Walker
d4be7f18e2 transpose=2 is counter clockwise, plus filter order should be rotation 
last to match the css application order
(cherry picked from commit bdb55e0)
 2015-07-20 09:37:56 +02:00
Gina Häußge
4f9c69965c Merge pull request #978 from Salandora/userSettings 
Fixes usersettings never reached the client's browser
 2015-07-20 09:25:01 +02:00
Gina Häußge
d1a9044981 Merge pull request #975 from Salandora/terminalFix 
Fixed a missing self.buffer()
 2015-07-20 09:24:45 +02:00
Marc
8e235af339 Fixes usersettings never reached the client's browser 2015-07-20 04:18:15 +02:00
Marc
0fa22937e0 Fixed a missing self.buffer() 2015-07-17 18:48:34 +02:00
Gina Häußge
1d3eecd7d0 Added changelog entry for CuraEngine 15.06 support 2015-07-17 13:56:45 +02:00
Nicanor Romero Venier
fd788e737f Added support for CuraEngine 15.06 2015-07-17 13:56:45 +02:00
Nicanor Romero Venier
dab328527a Added settings to specify server commands. 
Added commands for system shutdown and restart and
for server restart.
 2015-07-16 16:01:47 +02:00