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

117 commits

Author SHA1 Message Date
Gina Häußge
9de78001dd Merge branch 'maintenance' into devel 
# Conflicts:
#	CHANGELOG.md
#	docs/plugins/concepts.rst
#	src/octoprint/__init__.py
#	src/octoprint/server/__init__.py
#	src/octoprint/templates/javascripts.jinja2
#	src/octoprint/timelapse.py

Merge branch 'devel' into dev/wizard

# Conflicts:
#	octoprint_octobullet/__init__.py
#	octoprint_octobullet/templates/octobullet_settings.jinja2

Merge branch 'devel' into dev/wizard

# Conflicts:
#	octoprint_octobullet/__init__.py
#	octoprint_octobullet/templates/octobullet_settings.jinja2
 2016-10-13 14:22:40 +02:00
Gina Häußge
3d26e478e3 Fix a bug causing the update of OctoPrint to not work under certain circumstances 
The bug only manifests if a user had installed 1.2.16 earlier and never once hit "Save" in the
settings before attempting to update to 1.2.17. With 1.2.16 the updater script and settings for
OctoPrint's own update mechanism were changed to prefer "checkout_folder" instead of
"update_folder". In earlier versions however "update_folder" was still used. Saving settings
even once (even without any changes!) will migrate the data. But if that's not done a
KeyError will be raised when trying to retrieve "update_folder" from the check config, with
"checkout_folder" as its fallback.

Rather stupid error really.
 2016-10-12 18:13:46 +02:00
Gina Häußge
aca3dfae49 Merge branch 'maintenance' into devel 
# Conflicts:
#	CHANGELOG.md
 2016-09-23 14:35:31 +02:00
Gina Häußge
080a6e9ccd Extend atomic_write to allow setting & persisting file permissions 2016-09-23 14:26:33 +02:00
Gina Häußge
d2ed80baca Merge branch 'dev/apiCaching' into devel 
# Conflicts:
#	src/octoprint/filemanager/storage.py
#	src/octoprint/static/js/app/viewmodels/files.js
 2016-09-16 17:11:14 +02:00
Gina Häußge
650e1971d4 Merge branch 'maintenance' into devel 
# Conflicts:
#	CHANGELOG.md
#	src/octoprint/static/js/app/viewmodels/usersettings.js
 2016-09-16 14:11:43 +02:00
Gina Häußge
0bb6f5215d "prerelease" key might not be in check if tracking stable releases 2016-09-12 09:25:34 +02:00
Gina Häußge
b6fbbb353a Merge branch 'maintenance' into devel 
# Conflicts:
#	CHANGELOG.md
#	src/octoprint/filemanager/storage.py
#	src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2
 2016-09-09 12:31:29 +02:00
Gina Häußge
c6d9575127 Added link to "Using Release Channels" to the SWU settings dialog 2016-09-09 11:34:25 +02:00
Gina Häußge
64d484bd09 Merge branch 'maintenance' into devel 
# Conflicts:
#	src/octoprint/server/__init__.py
#	src/octoprint/util/jinja.py
 2016-09-07 17:22:37 +02:00
Gina Häußge
9a9502b281 "prerelease" might not be in check (chances for that are actually high), don't hiccup on that 2016-09-05 12:09:13 +02:00
Gina Häußge
6f48ca68e2 Fixed a merge error, _execute returns three values in 1.3.0, not two 2016-09-01 10:29:29 +02:00
Gina Häußge
bccc706329 First throw at caching of API methods 
Most caching is left to the client, by utilizing ETag and Last-Modified headers.

Where it was easily achievable, an additional server side miniature cache of intermediary
results was introduced (e.g. for the files). The regular cached decorator was not used
since it targets caching full responses, and the responses in question already contained
client request specific data. Caching "one step earlier" allows better usage of the cache here.

Also introduced a dependency on the scandir module, to get a bit of a performance boost
on os.walk and os.listdir (which have been replaced with scandir.walk and scandir.listdir
respectively). See https://github.com/benhoyt/scandir#background on why that made
sense.
 2016-08-30 19:02:30 +02:00
Gina Häußge
efca776102 Merge branch 'maintenance' into devel 
Conflicts:
	src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2
	src/octoprint/plugins/softwareupdate/updaters/update_script.py
 2016-08-26 14:24:13 +02:00
Gina Häußge
21b7339187 SWU: Move branch config to update check & fix release version detection again 2016-08-26 14:18:17 +02:00
Gina Häußge
df1a97b0e1 SWU: Only enforce unequality comparison on release channel switch 2016-08-26 10:40:01 +02:00
Gina Häußge
66da377b64 SWU: Minor fixes in the octoprint check population 2016-08-26 10:19:20 +02:00
Gina Häußge
34e5b5d50f SWU: Sort github releases by version, not publication date 
We can't rely on the publication date anymore with the introduction of prerelease
channels, since e.g. a current devel prerelease might have been published
earlier than the latest stable but should still be considered the latest release for
this release channel
 2016-08-26 10:18:35 +02:00
Gina Häußge
882cf3a142 SWU: git reset => git reset --hard for forced version 2016-08-25 16:49:18 +02:00
Gina Häußge
d9a4ff47b6 Make sure to switch back to master for stable release channel 2016-08-25 16:30:35 +02:00
Gina Häußge
d538b3fd38 Adjust swu plugin settings to selected update method 2016-08-25 15:45:25 +02:00
Gina Häußge
f8386649bf Fix release channel selector 2016-08-25 13:32:18 +02:00
Gina Häußge
b5bc03e711 First throw at release channels 
We start out with master (Stable), rc/maintenance (Maintenance) and rc/devel (Devel)
 2016-08-25 09:41:12 +02:00
Gina Häußge
76a04cbe9d Merge branch 'dev/python3B' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3B 2016-07-15 11:28:55 +02:00
MirceaDan
c33a9f9aa2 from __future__ import absolute_import, division, print_function 
changed the behavior to import division and print to be consistent
across all app and similar with python 3.x
 2016-07-15 00:16:58 -07:00
Gina Häußge
a33338684e Merge branch 'fix/slicingDocs' into devel 2016-07-12 11:52:59 +02:00
Gina Häußge
d96a91ecc3 Fix modal background of update confirmation not vanishing 2016-07-06 15:30:36 +02:00
Gina Häußge
76b4a45495 Merge branch 'maintenance' into devel 
Conflicts:
	THIRDPARTYLICENSES.md
	setup.py
	src/octoprint/server/__init__.py
	src/octoprint/server/views.py
	src/octoprint/settings.py
	src/octoprint/static/css/octoprint.css
 2016-05-03 10:48:26 +02:00
Gina Häußge
62aee50701 rel="noopener noreferrer" for external links 2016-05-02 11:48:08 +02:00
Gina Häußge
45a79b1939 Fixed a bunch of issues with the software update wizard 2016-03-30 15:45:13 +02:00
Gina Häußge
aecedfa57f Wizard for software update plugin 2016-03-30 11:28:41 +02:00
Gina Häußge
621d991788 Better error reporting in update script & CLI 2016-03-23 13:07:04 +01:00
Gina Häußge
ca0fd2397e Fix a bunch of issues with the update script 
* was still only reading one line per 500ms, now reads
     all available lines from stdout and stderr
  * patch was written with too many newlines
  * git reset was missing --hard parameter for forced versions
  * proper unicode handling
  * added git clean for code base reset
  * make sure path to python executable doesn't have left-over
    quotes on windows
 2016-03-23 10:39:20 +01:00
geoporalis
ed82488c5b typo fixed 
(cherry picked from commit 4e91284)
 2016-02-10 10:15:41 +01:00
geoporalis
4e9128454a typo fixed 2016-02-09 09:47:49 +00:00
Gina Häußge
c53c263805 Merge branch 'fix/includeReleasenotesInUpdateNotifications' into maintenance 
Conflicts:
	src/octoprint/plugins/softwareupdate/__init__.py
	src/octoprint/static/css/octoprint.css
 2016-02-02 20:23:02 +01:00
Gina Häußge
1e5cc9b086 Merge branch 'fix/knockout3.4' into devel 
Conflicts:
	src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
	src/octoprint/static/js/app/viewmodels/files.js
	src/octoprint/static/js/app/viewmodels/firstrun.js
	src/octoprint/static/js/app/viewmodels/loginstate.js
 2016-01-27 17:37:31 +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
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
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
46e54b9d35 [SWU] First version of working CLI 2015-11-16 16:07:29 +01:00
Gina Häußge
169aff4f8f CLI for the software update plugin 2015-11-05 17:09:37 +01:00