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

3276 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
a4e805685a Merge branch 'dev/folderSupport' into devel 2015-11-19 12:52:49 +01:00
Gina Häußge
5062c1ce68 Merge branch 'maintenance' into devel 
Conflicts:
	src/octoprint/plugins/cura/__init__.py
	src/octoprint/plugins/cura/templates/cura_settings.jinja2
 2015-11-19 11:51:16 +01:00
Gina Häußge
7820c17d08 [Cura] Make plugin a bit more verbose regarding usage & setup 2015-11-19 11:42:12 +01:00
Gina Häußge
43420163db Fixed some pinned versions for dependencies, introduced upper bounds 2015-11-19 10:48:06 +01:00
Gina Häußge
f1f55036e8 Simplistic folder add dialog 2015-11-18 18:36:23 +01:00
Gina Häußge
da890b036f Bugfix: emptyFolder filter was always active 2015-11-18 18:34:09 +01:00
Gina Häußge
1a20665729 Minor code style corrections 2015-11-18 17:45:15 +01:00
Gina Häußge
3db21f1a70 Fixed highlighting for files in folders 
While at it also adjusted highlighting so that the folder containing
the currently selected file will be highlighted if the selected file is
not within the current folder but in one of its sub folders.
 2015-11-18 17:44:11 +01:00
Gina Häußge
8b4aecde35 Merge branch 'devel' into dev/folderSupport 2015-11-18 17:16:12 +01:00
Gina Häußge
720cdadfbb Track browser tab visibility, only activate webcam/gcode viewer when visible 
This might help with #1065 if indeed is related to background tab suspending behaviours in
browsers, but is a completely blind guess at this point since I still have not been able to
reproduce that issue myself.
 2015-11-18 17:13:41 +01:00
Gina Häußge
50c3f99a42 virtual_printer: usage "screen" for the !!DEBUG commands 2015-11-18 13:56:39 +01:00
Gina Häußge
5d03b02baf virtual_printer: Refactoring for less error prone and more flexible command matching 2015-11-18 13:36:08 +01:00
Gina Häußge
66ad1150d5 Add toggle button to hide/show empty folders 2015-11-18 12:20:12 +01:00
Gina Häußge
d744c7e561 File search now operates recursively 2015-11-18 12:12:49 +01:00
Gina Häußge
306fd164d7 Refactoring of localstorage and added tests 
* improved internal metadata handling
  * less code duplication
  * individual locks per metadata file
  * unit tests for copy and move operations
 2015-11-18 10:47:49 +01:00
Salandora
9ed79adb8d Fix SD Support deactivated bug and added "unknown command" to the whitelist of errors 2015-11-17 19:32:34 +01:00
Gina Häußge
d85e93e79d Merge branch 'dev/clickClient' into devel 2015-11-17 08:41:37 +01:00
Gina Häußge
46e54b9d35 [SWU] First version of working CLI 2015-11-16 16:07:29 +01:00
Gina Häußge
21520f7fc5 Added octoprint client listen command and fixed socket client 2015-11-16 16:06:55 +01:00
Gina Häußge
77f34c47a3 Merge branch 'fix/indexCacheDuration' into devel 
Conflicts:
	src/octoprint/server/views.py
 2015-11-06 11:47:16 +01:00
Gina Häußge
b98348de02 Cache rendered page and translation files indefinitely 2015-11-06 11:46:12 +01:00
Gina Häußge
a5094d403a Merge branch 'maintenance' of github.com:foosel/OctoPrint into maintenance 2015-11-05 17:58:51 +01:00
Gina Häußge
c1afaa23f8 Merge branch 'fix/m25AsPause' into devel 2015-11-05 17:55:12 +01:00
Gina Häußge
6b0dee26e5 Interpret M25 as a pause when not printing from SD too 2015-11-05 17:33:27 +01:00
Gina Häußge
169aff4f8f CLI for the software update plugin 2015-11-05 17:09:37 +01:00
Gina Häußge
affb062c1d Refactored command line client to also include sockjs client 
Also changed the calling parameters a bit to also allow for GET request parameters.
 2015-11-05 17:05:08 +01:00
Gina Häußge
2214b2ac42 First steps towards API based CLI commands - "octoprint client" 2015-11-04 18:54:51 +01:00
Gina Häußge
4fcb853ef2 Some fixes and unit tests for octoprint.util.atomic_write, .bom_aware_open and .tempdir 2015-11-03 18:11:54 +01:00
Gina Häußge
1728e579b1 Merge branch 'fix/temperatureYaxisCutoff' into devel 
Conflicts:
	AUTHORS.md
 2015-10-30 16:54:17 +01:00
Gina Häußge
a44eb43f0f Added @kevingelion to AUTHORS.md 2015-10-30 16:53:17 +01:00
Gina Häußge
b6a5cb47a1 Merge branch 'km/hotfix-flot-yaxis-cutoff' of https://github.com/kevingelion/OctoPrint into pr/kevingelion/km/hotfix-flot-yaxis-cutoff 2015-10-30 16:49:35 +01:00
Gina Häußge
03124ecc28 Merge remote-tracking branch 'origin/devel' into devel 2015-10-30 16:35:51 +01:00
Gina Häußge
8ed3bcb094 Slight changes in CLI structure for performance reasons 
Having the plugin commands on the first level of --help proved to be
a bad idea since it basically kills every chance of lazy loading the (expensive)
plugin context. Using a sub command for anything plugin related allows us
to only fire up the plugin context if a plugin command is expected, saving us
some precious seconds of operation in all other cases.

For conformity reasons the dev sub commands were now restructured
similarly.
 2015-10-30 16:28:34 +01:00
Kevin Murphy
65efcec008 Change instance of row to row-fluid to avoid conflict with responsive CSS 2015-10-30 11:18:44 -04:00
Gina Häußge
221b497932 Maker CLI a bit faster in responding 
We don't actually need the pip caller, which necessitates version
detection and hence increases waiting times tremendously - a simple
command line call with the auto detected pip command for
uninstalling stuff is enough and cuts off a lot of the CLI response times.
 2015-10-30 13:49:05 +01:00
Gina Häußge
32bb4dd50a Fixed a bug in the log_duration decorator 2015-10-30 13:45:49 +01:00
Gina Häußge
2d1b198261 Some development utils in the octoprint.util package... 2015-10-30 13:02:22 +01:00
Gina Häußge
e3fa916364 Forgot to declare self.hooks on OctoPrintPluginCommands 2015-10-30 12:56:49 +01:00
Gina Häußge
c6f1088ccf <plugin identifier>:<command> => plugin:<plugin identifier> command 2015-10-30 10:14:21 +01:00
Gina Häußge
ec491c3d0d devel:newplugin => dev:plugin new, +dev:plugin install, +dev:plugin uninstall 2015-10-30 10:10:47 +01:00
Gina Häußge
bc7b17b66f Fixed an issue with compatibility across cookiecutter versions 2015-10-29 18:58:51 +01:00
Gina Häußge
628b9edbab CLI command devel:newplugin now allows specifying most of the parameters of the template 2015-10-29 18:41:51 +01:00
Gina Häußge
3c2d2b579d Documention for CLI and its development 2015-10-29 17:37:05 +01:00
Gina Häußge
d9f0fb1667 Consolidated common options into custom decorators 2015-10-29 16:26:50 +01:00
Gina Häußge
f68ce34351 Moved urllib3 ssl message to more suitable logging location 2015-10-29 15:26:58 +01:00
Gina Häußge
70fb385650 Try to ensure a sound SSL environment for the process 
If the python version is < 2.7.9, we try to patch urllib3 with pyopenssl
to get rid of any InsecurePlatform issues.

That only works if pyopenssl plus dependencies are installed however,
hence we also log that.
 2015-10-29 14:55:04 +01:00
Gina Häußge
d373d257e3 Slight changes on logging verbosity 
Changed the intensity of logged warnings and ensured everything
but the octoprint package's log level to be WARN be default.
 2015-10-29 14:52:14 +01:00
Gina Häußge
56805ab13d Refactored Daemon helper, added status command and added unit tests for all of it 2015-10-29 12:45:58 +01:00
Gina Häußge
4476545a55 Forgot to specify default value for daemon pidfile 2015-10-29 09:53:15 +01:00
Andres
37730616c1 Fixed wrong urls 
(cherry picked from commit 119f3ba)
 2015-10-29 09:41:17 +01:00