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

1558 commits

Author SHA1 Message Date
Gina Häußge
7232df686a Merge branch 'fix/compatibilityCheck' into devel 
Conflicts:
	src/octoprint/plugins/pluginmanager/__init__.py
 2015-12-14 14:24:30 +01:00
Gina Häußge
eae68f04ca Use PEP440 compatible version compatibility check 
Also make sure that if we have a pkg_resources version that returns
tuples we not only remove any intermediary version parts if the base
version is requested, but we also append "*final" to the tuple afterwards,
otherwise the compatibility check will fail.
 2015-12-14 14:14:44 +01:00
Gina Häußge
7e947a8403 Merge branch 'maintenance' into devel 
Conflicts:
	src/octoprint/server/__init__.py
 2015-12-14 11:58:21 +01:00
Gina Häußge
7fcd04ae61 Also use pre-calculated revision information instead of fetching anew 2015-12-14 10:16:29 +01:00
Gina Häußge
365c852769 Merge branch 'fix/fasterUpdateCheck' into devel 
Conflicts:
	src/octoprint/plugins/pluginmanager/__init__.py
	src/octoprint/plugins/softwareupdate/__init__.py
 2015-12-14 09:57:20 +01:00
Gina Häußge
28eb436c88 Merge branch 'fix/includeReleasenotesInUpdateNotifications' into devel 2015-12-10 17:12:11 +01:00
Gina Häußge
1a4920fc36 Display remote version in update message, not local one... 2015-12-10 17:12:02 +01:00
Gina Häußge
dcd67e7645 Merge branch 'fix/includeReleasenotesInUpdateNotifications' into devel 
Conflicts:
	src/octoprint/plugins/softwareupdate/static/css/softwareupdate.css
	src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js
	src/octoprint/plugins/softwareupdate/static/less/softwareupdate.less
	src/octoprint/static/css/octoprint.css
	src/octoprint/static/less/octoprint.less
 2015-12-10 14:45:39 +01:00
Gina Häußge
8149a3b4a8 Include release notes in update notification 
... and confirmation dialog and settings dialog.

github_release fetches release notes link from github. Check configurations
can always set individual release notes links via the new `release_notes`
property. The URL also supports placeholders `{octoprint_version}`,
`{target_version}` and `{target_name}`. A custom release note URL
hence could be configured by a plugin via

    def get_update_information(self):
        return dict(
            myplugin=dict(
                [...]
                release_notes="https://me.github.io/MyPlugin/my/custom/releasenotes.html#version_{target_version}"
                [...]
            )
        )

and if a new release "1.3.4" was now to be released would be displayed to the user as

    https://me.github.io/MyPlugin/my/custom/releasenotes.html#version_1.3.4

The same of course is possible via config.yaml:

    plugins:
      softwareupdate:
        checks:
          myplugin:
            release_notes: 'https://me.github.io/MyPlugin/my/custom/releasenotes.html#version_{target_version}'
 2015-12-10 14:41:46 +01:00
Salandora
e8bd29ef99 Replace get_versions() calls with octoprint.server.VERSION, to get some time improvment 2015-12-09 10:29:24 +01:00
Gina Häußge
8a7d234571 Merge branch 'fix/commTimeoutOnSupressedScriptCommands' into maintenance 2015-12-08 14:24:47 +01:00
Gina Häußge
f82d9817dc Merge branch 'maintenance' into devel 2015-12-08 14:24:17 +01:00
Gina Häußge
c5c5383e0e Fixed clean up of preemptive cache entries 2015-12-08 14:23:40 +01:00
Gina Häußge
b4d25db9c8 Merge branch 'fix/betterUiCaching' into maintenance 2015-12-08 13:45:37 +01:00
Gina Häußge
ed6834ac0b Merge branch 'fix/intermediaryStartupPage' into devel 
Conflicts:
	src/octoprint/server/__init__.py
 2015-12-08 13:36:01 +01:00
Gina Häußge
ef876cfd35 Fire up intermediary server on host and port 
That way people will not see connection failed messages while the server is
still starting up.

Served intermediary page als "pings" an image on the backend to detect if
a) the backend is still responding at all ("intermediary.gif") and b) whether the
server has fully started up ("online.gif").

If the backend stops responding for 5s, a message is output that tells the user
that something went really wrong and to please check the log file.

Once the server becomes online, the intermediary page reloads/switches to the
actual UI.
 2015-12-08 13:28:12 +01:00
Gina Häußge
8d226dfbaa Merge branch 'maintenance' into devel 
Conflicts:
	AUTHORS.md
	CHANGELOG.md
	src/octoprint/static/css/octoprint.css
 2015-12-07 15:00:27 +01:00
Gina Häußge
cda399f11a Merge branch 'fix/ignoreCannotOpenSubdir' into maintenance 2015-12-07 13:21:57 +01:00
Gina Häußge
c98d3d1655 Also assume presence of heated bed in "add profile" dialog 2015-12-07 11:53:41 +01:00
Gina Häußge
5e96bd8b6a Fix: "Server Offline" should always win against "Please reload" 
Nothing to reload if the server is offline, so show the offline message above
the reload one.
 2015-12-07 11:51:20 +01:00
Gina Häußge
2b4a985d85 Assume the presence of a heated bed in the default profile 2015-12-07 11:04:09 +01:00
Gina Häußge
0982c8cc62 Ignore the "cannot (open|error) subdir" errors from Marlin 2015-12-07 09:26:25 +01:00
Mark Bastiaans
d90a9e7fc4 Fixed checks with os.path.realpath() for systems with symlinked paths 
(cherry picked from commit b7c9949)
 2015-12-04 17:36:49 +01:00
Gina Häußge
66b71199e4 Merge branch 'maintenance' into devel 
Conflicts:
	CHANGELOG.md
	src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js
 2015-12-03 12:03:56 +01:00
Gina Häußge
af1cd1f9e3 profile.key => profile.id 2015-12-03 09:53:37 +01:00
Gina Häußge
1f9ebe7201 Fixed a typo 2015-12-02 21:42:30 +01:00
Gina Häußge
bad88da2fe Fixed a scrolling issue on the terminal tab 2015-12-02 18:12:08 +01:00
Gina Häußge
090671a044 Merge branch 'maintenance' into fix/commTimeoutOnSupressedScriptCommands 2015-12-02 17:26:25 +01:00
Gina Häußge
c5bc000b56 Increased timeout for waiting for restart after update 
20sec is too little.
 2015-12-02 17:12:04 +01:00
Gina Häußge
111cf2c140 Merge branch 'fix/commTimeoutOnSupressedScriptCommands' into devel 
Conflicts:
	CHANGELOG.md
	src/octoprint/plugins/softwareupdate/__init__.py
	src/octoprint/plugins/virtual_printer/virtual.py
	src/octoprint/util/comm.py
 2015-12-02 11:16:59 +01:00
Gina Häußge
c0774d0dd8 Fix: Do not stall comm when a command is supressed while printing 2015-12-02 11:08:51 +01:00
Gina Häußge
612005c4f6 Fixed a bug preventing OctoPrint from updating via github releases 
Noticed while testing update path from 1.2.7 to 1.2.8

*bangs her head against a wall*
 2015-12-02 09:25:15 +01:00
Gina Häußge
1d8cf86215 Updated translation source files and german translation 2015-12-01 11:42:57 +01:00
Gina Häußge
fbc0b8af91 Merge branch 'maintenance' into fix/betterUiCaching 2015-12-01 10:40:57 +01:00
Gina Häußge
966bec2bed Merge branch 'fix/onlyShowBedIfPrinterHasBed' into devel 2015-11-30 11:11:51 +01:00
Gina Häußge
93bbedae86 Only process bed temps & commands if printer profile has heated bed 
Solves #1125
 2015-11-30 11:11:35 +01:00
Gina Häußge
ecd7045b84 Only use data for preemptive caching from plugins if it's set 2015-11-27 16:35:33 +01:00
Gina Häußge
1fc50b9940 Merge branch 'fix/terminalMemoryUsage' into devel 2015-11-27 15:06:17 +01:00
Gina Häußge
40fe74ef45 Cut off terminal after 3000 lines 
When autoscroll was disabled, terminal could run on endlessly, eating
memory until the browser crashes. Now a hard upper limit ensures
that not more than 3000 lines are ever stored in the terminal. If autoscroll
is disabled and the limit is reached, no more log lines will be added. That
ensures that the log will not scroll and the current log excerpt will stay put.
 2015-11-27 15:05:55 +01:00
Gina Häußge
8eab664a34 Merge branch 'fix/wrongJsReference' into devel 
Conflicts:
	src/octoprint/static/js/app/dataupdater.js
 2015-11-27 11:32:41 +01:00
Gina Häußge
043b213a96 Move event processing for gcodefiles into corresponding viewmodel 
Also fixes a javascript error (gcodeFileViewModel unknown)
 2015-11-27 11:31:17 +01:00
Gina Häußge
8a7cf88f8d A method that's called putJson should actually put JSON and not formdata... 2015-11-27 10:06:34 +01:00
Gina Häußge
6f83a175da Replaced way too lax SourceRootFileLoader with SelectedFileLoader 2015-11-26 19:51:57 +01:00
Gina Häußge
fc4e786745 Merge branch 'fix/betterUiCaching' into dev/betterUiCaching 
Conflicts:
	src/octoprint/util/jinja.py
 2015-11-26 19:49:32 +01:00
Gina Häußge
63d095ab00 Refactored implementation of get_all_template_paths 2015-11-26 19:48:44 +01:00
Gina Häußge
4fc43ebd1c Merge branch 'fix/betterUiCaching' into dev/betterUiCaching 
Conflicts:
	src/octoprint/server/util/flask.py
	src/octoprint/server/views.py
	src/octoprint/static/js/app/dataupdater.js
	src/octoprint/util/jinja.py
 2015-11-26 19:45:17 +01:00
Gina Häußge
47670a1bbd Merge branch 'fix/1120' into devel 2015-11-26 16:07:53 +01:00
Gina Häußge
6db57122b4 Catch and log all exceptions that might be raised in the watchdog 
Solves #1120
 2015-11-26 16:07:29 +01:00
Gina Häußge
c595d02f22 reload(true) shouldn't be necessary any more 
UI + assets should actually have ETag and LastModified headers and proper
IfMatch handling on the server side and hence the server should do the
right thing on its own.
 2015-11-26 14:15:06 +01:00
Gina Häußge
2e23cd39a4 Added ETag and LastModified headers + processing to UI index 
That should improve performance tremendously.

Both ETag and LastModified depend on all files the template rendering
depends on. If any of the depended on files changes, both values will
change as well. That allows us to track whether our cached copy is
still current (and force a refresh if not) and also process IfMatch request
headers and reply with a 304 directly so that we do not even have to
transfer the data if nothing changed and the browser still has it.
 2015-11-26 13:32:32 +01:00