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

1056 commits

Author SHA1 Message Date
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
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
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
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
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
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
Gina Häußge
c2eb8828de Merge pull request #973 from Voxel8/jm/more-longRunningCommands 
Add M400 and M226 to longRunningCommands
 2015-07-16 12:16:01 +02:00
Jack Minardi
466195b067 add M400 and M226 to longRunningCommands 2015-07-15 17:24:48 -04:00
Mark Walker
bdb55e0efc transpose=2 is counter clockwise, plus filter order should be rotation 
last to match the css application order
 2015-07-15 12:59:07 -07:00
Nicanor Romero Venier
6d24a46e88 Fixed form field truncation in upload requests 
(cherry picked from commit 1f6c852)
 2015-07-15 10:35:59 +02:00
Nicanor Romero Venier
1f6c85228b Fixed form field truncation in upload requests 2015-07-15 10:29:26 +02:00
Gina Häußge
1409b79ab5 Path testing shall only continue if path is not None 2015-07-14 11:56:15 +02:00
Gina Häußge
7a007a6417 Stop RepeatedTimers on server shutdown by default 
daemon flag was missing, leading to the timer staying active even when a shutdown
 was triggered. Added new daemon flag to timer constructor, defaulting to true, that
 fixes that behaviour.
(cherry picked from commit 48fe23b)
 2015-07-14 09:26:25 +02:00
Gina Häußge
96aad9d34f Better resilience against errors within plugins 
(cherry picked from commit 75992ef)
 2015-07-14 09:26:20 +02:00
Gina Häußge
48fe23b1f1 Stop RepeatedTimers on server shutdown by default 
daemon flag was missing, leading to the timer staying active even when a shutdown
 was triggered. Added new daemon flag to timer constructor, defaulting to true, that
 fixes that behaviour.
 2015-07-14 09:09:29 +02:00
Gina Häußge
75992ef837 Better resilience against errors within plugins 2015-07-10 11:46:51 +02:00
Gina Häußge
2745f49d28 Fixed white panes in settings dialog on Safari 8 
Absolute positioning caused panes to sometimes not render when being
selected. Switching to static positioning again makes the dialog look a bit
weird, but that's probably still preferable to no content showing. It seems
to be a browser bug that not's present with Safari 7, more tests to pinpoint
what exactly is causing this are probably necessary, but this at least is a
functional workaround for now.
(cherry picked from commit a18cbf7)
 2015-07-09 21:52:59 +02:00
Gina Häußge
a18cbf71bd Fixed white panes in settings dialog on Safari 8 
Absolute positioning caused panes to sometimes not render when being
selected. Switching to static positioning again makes the dialog look a bit
weird, but that's probably still preferable to no content showing. It seems
to be a browser bug that not's present with Safari 7, more tests to pinpoint
what exactly is causing this are probably necessary, but this at least is a
functional workaround for now.
 2015-07-09 21:49:51 +02:00
Gina Häußge
5470aaaa3a Set no-cache headers on page while firstRun is True 
(cherry picked from commit f1afb70)
 2015-07-09 09:45:35 +02:00
Gina Häußge
f89cbc9133 Allow to not cache responses that set no-cache headers 
(cherry picked from commit 163100b)
 2015-07-09 09:45:29 +02:00
Gina Häußge
f1afb70b47 Set no-cache headers on page while firstRun is True 2015-07-09 09:28:31 +02:00
Gina Häußge
163100bd44 Allow to not cache responses that set no-cache headers 2015-07-09 09:27:38 +02:00
Gina Häußge
3761995aff Removed unneeded parameter and added missing semicolon 
(cherry picked from commit 29b3b62)
 2015-07-08 17:42:47 +02:00
Gina Häußge
e62cef590b Fixed preventDefault issues also for files search 
(cherry picked from commit 4894c6e)
 2015-07-08 17:42:41 +02:00