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

40 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
12403444c4 Merge branch 'fix/swuReloadDialog' into devel 2015-10-08 17:09:18 +02:00
Gina Häußge
c932e496fa SWU: Show reload dialog after update 
The notification and the (forced) dialog afterwards were way too
redundant.
 2015-10-08 17:08:36 +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
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
628a9f43e9 Let's up the restart-detection-timeout a bit 
Just for experimental purposes.
 2015-09-02 11:34:32 +02:00
Gina Häußge
a79e38a350 Settings saving now supports callbacks, SWU plugin utilizes those 2015-09-01 17:18:08 +02:00
Gina Häußge
098c169ca5 SWU: Do not show "settings refreshed" dialog when saving plugin settings 2015-09-01 10:43:52 +02:00
Gina Häußge
42e11acb44 Fixed a merge error 2015-09-01 09:42:44 +02:00
Gina Häußge
4f3e2d7f49 Merge branch 'maintenance' into devel 
Conflicts:
	.versioneer-lookup
	CHANGELOG.md
	src/octoprint/plugins/softwareupdate/__init__.py
	src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js
	src/octoprint/plugins/softwareupdate/updaters/pip.py
	src/octoprint/plugins/softwareupdate/updaters/update_script.py
	src/octoprint/plugins/virtual_printer/virtual.py
	src/octoprint/server/util/sockjs.py
	src/octoprint/server/views.py
	src/octoprint/static/css/octoprint.css
	src/octoprint/static/js/app/helpers.js
	src/octoprint/static/js/app/viewmodels/settings.js
	src/octoprint/templates/dialogs/settings.jinja2
	src/octoprint/templates/dialogs/settings/features.jinja2
	src/octoprint/templates/dialogs/settings/server.jinja2
	src/octoprint/translations/de/LC_MESSAGES/messages.mo
	src/octoprint/translations/de/LC_MESSAGES/messages.po
	src/octoprint/util/comm.py
	translations/de/LC_MESSAGES/messages.mo
	translations/de/LC_MESSAGES/messages.po
	translations/messages.pot
 2015-09-01 08:34:24 +02:00
Gina Häußge
13d7d5f2f6 SWU: Various improvements for better usability 
* Allow configuration of checkout folder and version tracking type
    via Plugin Configuration
  * Display message to use if checkout folder is not configured or a
    non-release version is running and version tracking against releases
    is enabled
  * Clear version cache when a change in the check configuration is
    detected
  * Mark check configurations for which an update is not possible with
    a little exclamation mark
(cherry picked from commit 8666a28)
 2015-08-26 16:03:11 +02:00
Gina Häußge
93763a5563 Remove left over observables that are no longer needed 
(cherry picked from commit 7986a2f)
 2015-08-26 15:56:09 +02:00
Nicanor Romero Venier
57161dd9c3 Added migration step for new settings. 
(cherry picked from commit 1cdd61f)
 2015-08-26 15:54:17 +02:00
Gina Häußge
8666a28f64 SWU: Various improvements for better usability 
* Allow configuration of checkout folder and version tracking type
    via Plugin Configuration
  * Display message to use if checkout folder is not configured or a
    non-release version is running and version tracking against releases
    is enabled
  * Clear version cache when a change in the check configuration is
    detected
  * Mark check configurations for which an update is not possible with
    a little exclamation mark
 2015-08-26 15:50:57 +02:00
Gina Häußge
ea662849bc Construct message/confirmation dialogs programmatically 
No need to have templates here, we do it directly from the helper methods.
That also leaves us more options regarding callbacks, classes etc.

Helper methods now take an options dictionary (but still can fallback to the
old signature) containing messages, titles, callbacks etc instead of using
positional arguments for that. Switched code over to utilize that new
calling approach.
 2015-08-17 16:41:12 +02:00
Gina Häußge
7986a2ff56 Remove left over observables that are no longer needed 2015-07-21 18:02:03 +02:00
Nicanor Romero Venier
1cdd61fcbf Added migration step for new settings. 2015-07-20 19:21:45 +02:00
Gina Häußge
19a5613e59 Made "Software Update" and "CuraEngine" translateable 
Also fixed a typo in a notification.
(cherry picked from commit 430e47d)
 2015-07-07 18:39:47 +02:00
Gina Häußge
430e47d20f Made "Software Update" and "CuraEngine" translateable 
Also fixed a typo in a notification.
 2015-07-07 18:26:06 +02:00
Gina Häußge
f0530eff8f SWU: always send displayName to frontend 
Spares us having to map on the client side which might not work
in all cases.
 2015-07-03 15:25:36 +02:00
Gina Häußge
be8827b67c SWU: plugin now logs stdout/stderr during updating 
Only if logged in as Admin though. Working dialog is as verbose as
Plugin install dialog.
 2015-07-03 13:59:22 +02:00
Gina Häußge
5674de9c2f Fix: Do not auto-close SWU plugin notifications 2015-07-03 13:53:59 +02:00
Gina Häußge
a26b203205 Enforce update of updateable software after plugin changes 
When any plugins are enabled/disabled, the client now gets a trigger to fetch a fresh list of update information from the server. This should take care of any old popups still hinting at now uninstalled plugins.
 2015-06-18 17:08:56 +02:00
Gina Häußge
0d886ab6f1 Revert cbd3b1424b 
That was a bit too early and an accident caused by a too fast "OK" in IntelliJ (as quite visible from the completely unrelated commit message)
 2015-06-18 12:11:54 +02:00
Gina Häußge
cbd3b1424b Default to full platform compatibility 2015-06-18 12:05:11 +02:00
Gina Häußge
2e6240a910 Bundled Software Update Plugin 2015-06-09 13:35:03 +02:00