Skip to content
This repository has been archived by the owner on Jun 7, 2023. It is now read-only.

Shared: Fix milestone fall behind check #1436

Merged
merged 1 commit into from
May 2, 2019
Merged

Shared: Fix milestone fall behind check #1436

merged 1 commit into from
May 2, 2019

Conversation

cvarley100
Copy link
Contributor

Description

Type of change

Please delete options that are not relevant.

  • Bug fix (a non-breaking change which fixes an issue)

How Has This Been Tested?

Tested on iOS

Checklist:

  • My code follows the style guidelines for this project
  • I have performed a self-review of my own code
  • New and existing unit tests pass locally with my changes
  • For changes to mobile that include native code (including React Native modules): I have verified that both iOS and Android successfully build in both Debug and Release modes
  • For changes to shared: If applicable, I have verified that my changes are implemented correctly in desktop and mobile

@laumair laumair merged commit 13b692b into develop May 2, 2019
@laumair laumair deleted the hotfix/sync-check branch May 2, 2019 10:35
@cvarley100 cvarley100 mentioned this pull request May 2, 2019
Merged
@rajivshah3 rajivshah3 mentioned this pull request May 2, 2019
Closed
rihardsgravis pushed a commit that referenced this pull request May 3, 2019
Merge branch 'develop' into desktop-test-coverage
99a2241 
* develop: (125 commits)
  Bump snyk from 1.161.0 to 1.161.1 (#1455)
  Bump nyc from 13.1.0 to 14.1.0 in /src/shared (#1451)
  Bump snyk from 1.158.0 to 1.161.0 (#1448)
  Bump husky from 2.1.0 to 2.2.0 (#1447)
  Fix Electron API usage for Windows deep link functionality (#1438)
  Mobile: Bump build no to 61 (#1443)
  Mobile: Fix crash on empty password fields (#1441)
  Mobile: Bump build to 60 (#1437)
  New Crowdin translations (#1428)
  Convert all nested properties of address data from RealmObject to plain object (#1431)
  Shared: Add SeedVault export validation check (#1432)
  Mobile: Fix Android splash screen hang when returning from bg (#1429)
  Shared: Fix milestone fall behind check (#1436)
  Bump @babel/plugin-proposal-class-properties in /src/desktop (#1425)
  Bump @babel/preset-env from 7.4.3 to 7.4.4 in /src/desktop (#1415)
  [Security] Bump tar from 2.2.1 to 4.4.8 in /src/desktop (#1434)
  Bump snyk from 1.156.0 to 1.158.0 (#1435)
  Bump snyk from 1.154.0 to 1.156.0 (#1433)
  Bump @babel/register from 7.4.0 to 7.4.4 in /src/desktop (#1426)
  Bump snyk from 1.153.0 to 1.154.0 (#1424)
  ...

# Conflicts:
#	src/desktop/npm-shrinkwrap.json
#	src/desktop/package.json
#	src/desktop/src/libs/crypto.js
#	src/desktop/src/ui/components/List.js
#	src/desktop/src/ui/global/SeedExport.js
#	src/shared/libs/iota/utils.js
rihardsgravis pushed a commit that referenced this pull request May 3, 2019
Merge branch 'develop' into window-7
f61a559 
* develop: (127 commits)
  Mobile: Fix deep link behaviour (#1444)
  Bump snyk from 1.161.0 to 1.161.1 (#1455)
  Bump nyc from 13.1.0 to 14.1.0 in /src/shared (#1451)
  Bump snyk from 1.158.0 to 1.161.0 (#1448)
  Bump husky from 2.1.0 to 2.2.0 (#1447)
  Fix Electron API usage for Windows deep link functionality (#1438)
  Mobile: Bump build no to 61 (#1443)
  Mobile: Fix crash on empty password fields (#1441)
  Mobile: Bump build to 60 (#1437)
  New Crowdin translations (#1428)
  Convert all nested properties of address data from RealmObject to plain object (#1431)
  Shared: Add SeedVault export validation check (#1432)
  Mobile: Fix Android splash screen hang when returning from bg (#1429)
  Shared: Fix milestone fall behind check (#1436)
  Bump @babel/plugin-proposal-class-properties in /src/desktop (#1425)
  Bump @babel/preset-env from 7.4.3 to 7.4.4 in /src/desktop (#1415)
  [Security] Bump tar from 2.2.1 to 4.4.8 in /src/desktop (#1434)
  Bump snyk from 1.156.0 to 1.158.0 (#1435)
  Bump snyk from 1.154.0 to 1.156.0 (#1433)
  Bump @babel/register from 7.4.0 to 7.4.4 in /src/desktop (#1426)
  ...

# Conflicts:
#	package.json
#	src/desktop/main.js
#	src/desktop/npm-shrinkwrap.json
#	src/desktop/package.json
#	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/mobile/package.json
#	src/mobile/src/ui/components/PasswordFields.js
#	src/mobile/src/ui/views/wallet/Login.js
#	src/mobile/yarn.lock
#	src/shared/locales/ar/translation.json
#	src/shared/locales/bg/translation.json
#	src/shared/locales/cs/translation.json
#	src/shared/locales/da/translation.json
#	src/shared/locales/de-CH/translation.json
#	src/shared/locales/de/translation.json
#	src/shared/locales/el/translation.json
#	src/shared/locales/en/translation.json
#	src/shared/locales/es-ES/translation.json
#	src/shared/locales/es-LA/translation.json
#	src/shared/locales/et/translation.json
#	src/shared/locales/fa/translation.json
#	src/shared/locales/fi/translation.json
#	src/shared/locales/fr/translation.json
#	src/shared/locales/he/translation.json
#	src/shared/locales/hi/translation.json
#	src/shared/locales/hr/translation.json
#	src/shared/locales/hu/translation.json
#	src/shared/locales/id/translation.json
#	src/shared/locales/it/translation.json
#	src/shared/locales/ja/translation.json
#	src/shared/locales/ka/translation.json
#	src/shared/locales/kn/translation.json
#	src/shared/locales/ko/translation.json
#	src/shared/locales/lt/translation.json
#	src/shared/locales/lv/translation.json
#	src/shared/locales/nl/translation.json
#	src/shared/locales/no/translation.json
#	src/shared/locales/pl/translation.json
#	src/shared/locales/pt-BR/translation.json
#	src/shared/locales/pt-PT/translation.json
#	src/shared/locales/ro/translation.json
#	src/shared/locales/ru/translation.json
#	src/shared/locales/sk/translation.json
#	src/shared/locales/sl/translation.json
#	src/shared/locales/sr/translation.json
#	src/shared/locales/sv-SE/translation.json
#	src/shared/locales/ta/translation.json
#	src/shared/locales/th/translation.json
#	src/shared/locales/tr/translation.json
#	src/shared/locales/ur/translation.json
#	src/shared/locales/vi/translation.json
#	src/shared/locales/zh-CN/translation.json
#	src/shared/locales/zh-TW/translation.json
#	yarn.lock
@cvarley100 cvarley100 mentioned this pull request May 7, 2019
Merged
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@laumair laumair laumair approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@cvarley100 @laumair