This repository has been archived by the owner on Jun 7, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 120
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into desktop-0.6.0
* develop: Shared: Node Settings Update (#1509) Bump dart-sass from 1.20.3 to 1.21.0 in /src/desktop (#1725) Bump electron from 3.1.10 to 3.1.11 in /src/desktop (#1720) Bump url-loader from 1.1.2 to 2.0.0 in /src/desktop (#1714) Bump file-loader from 3.0.1 to 4.0.0 in /src/desktop (#1715) Bump i18next from 17.0.1 to 17.0.2 in /src/desktop (#1722) Bump @jest-runner/electron from 2.0.0 to 2.0.1 in /src/desktop (#1713) New Crowdin translations (#1680) Bump husky from 2.3.0 to 2.4.0 (#1717) Bump snyk from 1.171.1 to 1.173.1 (#1716) Update action logic on full account info fetch error (#1688) Bump electron-builder from 20.41.0 to 20.43.0 in /src/desktop (#1708) Bump react-router-dom from 5.0.0 to 5.0.1 in /src/desktop (#1710) Bump webpack from 4.32.2 to 4.33.0 in /src/desktop (#1709) Bump i18next from 16.0.0 to 17.0.1 in /src/desktop (#1711) Desktop: Update wallet language on initial load (#1704) Desktop: Auto update functionality updates (#1705) Fix location reload on wallet reset (#1687) # Conflicts: # src/desktop/src/ui/Index.js # src/desktop/src/ui/views/onboarding/SeedIntro.js # src/desktop/src/ui/views/onboarding/seedStore/Ledger.js # src/desktop/src/ui/views/settings/NodeCustom.js # src/desktop/src/ui/views/settings/index.scss # src/mobile/android/app/build.gradle # src/mobile/ios/iotaWallet-tvOS/Info.plist # src/mobile/ios/iotaWallet-tvOSTests/Info.plist # src/mobile/ios/iotaWallet.xcodeproj/project.pbxproj # src/mobile/ios/iotaWallet/Info.plist # src/mobile/ios/iotaWalletTests/Info.plist # src/mobile/ios/iotaWalletUITests/Info.plist # src/shared/libs/iota/NodesManager.js # src/shared/libs/iota/utils.js
- Loading branch information
Showing
105 changed files
with
858 additions
and
687 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.