3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 07:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fix merge conflict

Browse source
This commit is contained in:
ChrisTerBeke 2018-12-13 11:48:35 +01:00
commit 36f5150d94
73 changed files with 1758 additions and 474 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cura/API/Account.py
View file

@ -6,6 +6,7 @@ from PyQt5.QtCore import QObject, pyqtSignal, pyqtSlot, pyqtProperty
from UM.i18n import i18nCatalog
from UM.Message import Message
from cura import CuraConstants
from cura.OAuth2.AuthorizationService import AuthorizationService
from cura.OAuth2.Models import OAuth2Settings
@ -37,7 +38,7 @@ class Account(QObject):
self._logged_in = False
self._callback_port = 32118
self._oauth_root = "https://account-staging.ultimaker.com"
self._oauth_root = CuraConstants.CuraCloudAccountAPIRoot
self._oauth_settings = OAuth2Settings(
OAUTH_SERVER_URL= self._oauth_root,