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

3112 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
62478fd98f More pip data in plugin manager front end 2015-09-29 14:51:58 +02:00
Gina Häußge
22509f02b5 Make sure to include testballoon package in install 2015-09-29 14:23:10 +02:00
Gina Häußge
cae73c1ee5 Cache for pip setup and version information 
Can take a bit of time to collect that data since it needs some invocations of
pip, so we cache that data unless told otherwise.
 2015-09-29 14:22:29 +02:00
Gina Häußge
5df576b73e Install testballoon using pip install . in testballoon folder 2015-09-29 13:53:48 +02:00
Gina Häußge
000f8e9310 Debug logging for testballoon install 2015-09-29 13:47:35 +02:00
Gina Häußge
7d38d66489 PipUtil now uses --user argument with pip install if detected as necessary 2015-09-29 13:39:08 +02:00
Gina Häußge
705f0706fd Merge branch 'fix/pmgrPipWithSudo' into devel 
Conflicts:
	src/octoprint/util/pip.py
 2015-09-28 20:21:40 +02:00
Gina Häußge
fce7b40b51 pip: Use string representation of version for display in UI 2015-09-28 20:20:56 +02:00
Gina Häußge
697affc62d Merge branch 'fix/pmgrPipWithSudo' into devel 
Conflicts:
	src/octoprint/plugins/pluginmanager/__init__.py
	src/octoprint/util/pip.py
 2015-09-28 19:57:05 +02:00
Gina Häußge
1178fe9e95 Support sudo for installing plugins, but warn about it 2015-09-28 19:53:30 +02:00
Gina Häußge
bdc5d72613 Fixes OctoPrint.files.download method 2015-09-28 18:41:40 +02:00
Gina Häußge
e57ed92294 Less repetitious code 2015-09-28 18:24:56 +02:00
Gina Häußge
73c235d67f Migrate SettingsViewModel.requestData to using promises 
Fallback implementation for old callback parameter is still present,
logs warning about deprecation.
 2015-09-28 18:17:43 +02:00
Gina Häußge
7a06f496de Let's get rid of another callback 2015-09-28 17:08:40 +02:00
Gina Häußge
7b7f21d126 Migrate to new utility methods for testing URLs & executable paths 2015-09-28 17:08:25 +02:00
Gina Häußge
c5f0ccdb94 Migrated client to module factory pattern 
This should _hopefully_ also make it compatible to AMD implementations,
but I have to admit that I haven't tried that yet...
 2015-09-28 17:07:37 +02:00
Gina Häußge
1a469e1c97 Take login data from data, not request.values 
That was a left-over from the previous implementation...
 2015-09-28 17:06:08 +02:00
Gina Häußge
6bc8bca99c Merge branch 'devel' into dev/clientlib 2015-09-28 13:09:58 +02:00
Gina Häußge
2f24e73fcb Merge branch 'fix/logsDocsBug' into maintenance 2015-09-28 13:08:57 +02:00
Gina Häußge
39a0441f34 Merge branch 'fix/logsDocsBug' into devel 2015-09-28 13:08:42 +02:00
Gina Häußge
9ff5c36370 Fixed a documentation bug 2015-09-28 13:08:35 +02:00
Gina Häußge
f3e242d3a0 Merge remote-tracking branch 'origin/devel' into devel 2015-09-28 13:02:38 +02:00
Gina Häußge
0b4e590a5b Refactored drop zone processing in GcodeFilesViewModel 2015-09-28 13:01:47 +02:00
Gina Häußge
96d479bd67 Merge branch 'fix/noDropFileuploads' into devel 2015-09-28 12:55:54 +02:00
Gina Häußge
1b4ea75466 Fix: Don't have file upload widgets listen to drop events by default 
That way they won't be triggered by gcode uploads when all they are interested in
are uploads via a single file input.
 2015-09-28 12:55:32 +02:00
Gina Häußge
eafca5d77a Some bug fixing of client migration 2015-09-25 17:09:07 +02:00
Gina Häußge
e5f12ae4c0 Merge branch 'devel' into dev/clientlib 2015-09-25 13:53:51 +02:00
Gina Häußge
bbd728c51b Migrated existing javascript application files to use client lib 
TODO: Testing & Debugging
 2015-09-25 13:53:42 +02:00
Gina Häußge
1678951d84 Client library should now cover all APIs 
TODO: Testing & Debugging
 2015-09-25 13:52:31 +02:00
Mark Walker
2411b4260e Update css for change 42d754 to the less 2015-09-23 11:51:36 -07:00
Gina Häußge
055a5d06f6 Fix: Correctly persist all changes to gcode scripts 2015-09-23 13:40:41 +02:00
Gina Häußge
5f8c3d967c Added files and connection API and socket library 2015-09-22 18:33:27 +02:00
Gina Häußge
0a30438040 Merge branch 'fix/contentTypeHeaderCheck' into devel 2015-09-22 15:43:57 +02:00
Gina Häußge
b4b5689bc4 Fix: Correctly handle unset Content-Type header for command requests 2015-09-22 15:23:50 +02:00
Gina Häußge
b38b38e359 Merge branch 'fix/pmgrPipConfig' into devel 2015-09-22 11:39:55 +02:00
Gina Häußge
fd4271a962 PipCaller: Added back missing member variable 2015-09-22 11:39:45 +02:00
Gina Häußge
2a4ee5072c Merge branch 'fix/pmgrPipConfig' into devel 
Conflicts:
	src/octoprint/plugins/pluginmanager/__init__.py
	src/octoprint/util/pip.py
 2015-09-22 11:39:02 +02:00
Gina Häußge
65bc28a03e PMGR: Added configuration dialog and info re used pip binary & version 2015-09-22 11:36:57 +02:00
Gina Häußge
c26515c13d PipCaller: Allow update of used pip command 2015-09-22 11:35:47 +02:00
Gina Häußge
25a4d4b79b SWU: Track check origins, ignore if from unavailable plugin 
There was a problem with software update checks configurations stored in
config.yaml for which the providing plugin was then removed, since those
check definitions then lacked their default values to be merged on whatever
was stored in config.yaml, causing incomplete check configurations as a
consequence over which the plugin tripped.

This patch fixes that in that it tracks which check config keys are provided
by plugins and only returns those as the active check configurations that
belong to plugins that are still in the system.

TODO: This is only half of the solution. Check configurations of plugins
that are being uninstalled should be removed from the config if the
user decides to remove any settings by the plugin too. We need some
adjustments in the lifecycle tracking in order to make this possible
however, so for now this must suffice to at least prevent any errors from
occuring when incomplete configs are encountered.
(cherry picked from commit 8af8b8f)
 2015-09-21 16:46:44 +02:00
Gina Häußge
43ca4d8252 SWU: Do not overwrite check information again 
Current version information of OctoPrint from a check definition
could be overwritten for checks under certain circumstances.
 2015-09-21 16:42:11 +02:00
Gina Häußge
a05e3a44af Updated tornado, sockjs-tornado and psutil dependencies 2015-09-21 15:00:06 +02:00
Gina Häußge
cbc500a939 Merge branch 'patch-1' of https://github.com/dragondgold/OctoPrint into pr/dragondgold/patch-1 2015-09-21 09:00:04 +02:00
Gina Häußge
d2e2cb814f M400 and proper M114 in virtual printer 2015-09-21 08:41:28 +02:00
Andres
119f3ba45b Fixed wrong urls 2015-09-20 17:44:49 -03:00
Gina Häußge
a431331aa9 Merge pull request #1066 from punkkeks/devel 
changed magic line from python->python2
 2015-09-19 16:29:17 +02:00
Marcel Hellwig
e46e7b3ee2 changed magic line from python->python2 
Since python is sometimes (and for me on arch linux) a symlink to the
python3 utils, you should be more explicit with that.
 2015-09-17 18:04:14 +02:00
Gina Häußge
9efa14058d Merge pull request #1060 from CapnBry/estimate-fwretract 
Include a time estimate for gcode which uses firmware retract
 2015-09-14 19:04:22 +02:00
Bryan Mayland
0253f525b0 Include a time estimate for gcode which uses firmware retract, if retract settings are seen in gcode 2015-09-12 11:32:52 -04:00
Gina Häußge
8232126684 WIP 2015-09-12 11:21:42 +02:00