Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge release/1.4.1-STN3 into develop #2080

Merged
merged 22 commits into from
Jul 23, 2020
Merged

Merge release/1.4.1-STN3 into develop #2080

merged 22 commits into from
Jul 23, 2020

Conversation

nikolaglumac
Copy link
Contributor

This PR merges release/1.4.1-STN3 into develop branch.

disassembler and others added 19 commits July 21, 2020 12:51
@disassembler
shelley_testnet_v4: switch to mainnet_candidate
9188040
@disassembler
launcherConfig: add isStaging boolean
a23e697
@nikolaglumac
Fix launcher config
2e842b0
@nikolaglumac
Update cardano-launcher
88cdbb4
@nikolaglumac
Update hardfork timestamp
f890030
@disassembler
cardano-wallet: bump to latest working build
9a9a881
@nikolaglumac
Enable send screen
8b71dea
@nikolaglumac
Merge branch 'release/1.4.0-STN3' of github.com:input-output-hk/daeda…
84b511e 
…lus into release/1.4.0-STN3
@cleverca22 @disassembler
bump cardano-launcher and use isStaging boolean
60dcc84 
(cherry picked from commit d74689c61f71fb4f2f7d5c02421c5132dd946cf3)
@nikolaglumac
Fix wallet restoration text copy, Improve types and fix lint/flow errors
4edb73d
@nikolaglumac
Prevent polling network parameters if the node is not responding
a4e047c
@nikolaglumac
Bump cardano-wallet
7a45ff8
@disassembler
launcher-config: set kind based on config Protocol
626595d 
(cherry picked from commit f382797)
@nikolaglumac
Use correct cardano-launcher
33b4631
@nikolaglumac
Merge branch 'release/1.4.1-STN3' of github.com:input-output-hk/daeda…
8c01472 
…lus into release/1.4.1-STN3
Enable Transfer Funds wizard - init
4d43859
Enable Transfer Funds wizard - flow issues fix
f620e3a
Update Splash screen copy
ffcb529
@darko-mijic
Fix missing dot at the end of sentence in the ui copy
6ad2e0e
@nikolaglumac nikolaglumac self-assigned this Jul 23, 2020
@nikolaglumac nikolaglumac merged commit dab4779 into develop Jul 23, 2020
@iohk-bors iohk-bors bot deleted the release-with-develop branch July 23, 2020 09:56
@nikolaglumac nikolaglumac mentioned this pull request Aug 12, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@darko-mijic darko-mijic darko-mijic approved these changes

@alan-mcnicholas alan-mcnicholas Awaiting requested review from alan-mcnicholas

Assignees

@nikolaglumac nikolaglumac

Labels
chore release-1.4.1-STN3 Daedalus Shelley Testnet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@nikolaglumac @darko-mijic @disassembler @cleverca22