3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-08 23:46:22 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into cura4.0_header

Browse source
This commit is contained in:
Jaime van Kessel 2018-11-02 13:39:05 +01:00
commit ac9cfd8873
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/OAuth2/AuthorizationService.py
View file

@ -120,7 +120,7 @@ class AuthorizationService:
"redirect_uri": self._settings.CALLBACK_URL, "redirect_uri": self._settings.CALLBACK_URL,
"scope": self._settings.CLIENT_SCOPES, "scope": self._settings.CLIENT_SCOPES,
"response_type": "code", "response_type": "code",
"state": "CuraDriveIsAwesome", "state": "(.Y.)",
"code_challenge": challenge_code, "code_challenge": challenge_code,
"code_challenge_method": "S512" "code_challenge_method": "S512"
}) })

2
resources/qml/Actions.qml
View file

@ -412,7 +412,7 @@ Item
Action Action
{ {
id: browsePackagesAction id: browsePackagesAction
text: catalog.i18nc("@action:menu", "Open Marketplace...") text: catalog.i18nc("@action:menu", "&Marketplace")
iconName: "plugins_browse" iconName: "plugins_browse"
} }
} }