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/0.14.0 into develop branch #1524

Merged
merged 11 commits into from
Aug 8, 2019
Merged

Merge release/0.14.0 into develop branch #1524

merged 11 commits into from
Aug 8, 2019

Conversation

nikolaglumac
Copy link
Contributor

This PR merges release/0.14.0 code into the develop branch.

disassembler and others added 11 commits July 30, 2019 14:37
@disassembler
bump cardano-sl to include CHANGELOG fix (#1497)
560d812
@cleverca22 @disassembler
disable signing with the test keys (#1501)
1671de0
@disassembler
bump cardano-sl to latest 3.0.3 (#1505)
daaf42a
@disassembler
bump cardano-sl to latest 3.0.3 (#1506)
0c18896
@nikolaglumac
[DDW-815] Remove "Realtime statistics monitor" link in Testnet builds (…
fa6f2b2 
…#1516)

* [DDW-815] Removed 'Realtime statistics monitor' link from Testnet builds

* [DDW-815] Trigger rebuild
@thedanheller @nikolaglumac
[DDW-812] Fix application dialog close button colour (#1517)
484fe64 
* DDW-812 Fix application dialog close button colour

* [DDW-812] CHANGELOG

* [DDW-813] Remove unused code

* [DDW-812] Run translation manager
@nikolaglumac
[DDW-813] Adds a link to the 'Safety Tips' Support portal article (#1518
15edbe7 
)

* [DDW-813] Adds a link to the 'Safety Tips' Support portal article

* [DDW-815] Trigger rebuild

* [DDW-813] Adds missing Japanese translation

* [DDW-813] Fix failing acceptance test
@nikolaglumac
[DDW-812] Fix notification z-index issue on Daedalus Diagnostics scre…
6303a49 
…en (#1521)

* [DDW-812] Fix notification z-index issue on Daedalus Diagnostics screen

* [DDW-812] Prevent display of main UI under the Block consolidation screen
@disassembler @nikolaglumac
cardano-sl bump for RC3 (#1519)
f1d928a
@thedanheller @nikolaglumac
[DDW-810] Replace '[GPU Safe Mode]' window titlebar text (#1523)
ac5f7dc
@nikolaglumac
Merge latest develop and fix conflicts
812be91
@nikolaglumac nikolaglumac self-assigned this Aug 8, 2019
thedanheller
thedanheller approved these changes Aug 8, 2019
View reviewed changes
Copy link
Member

@thedanheller thedanheller left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚙️⚙️⚙️⚙️⚙️

@thedanheller thedanheller merged commit afa9e32 into develop Aug 8, 2019
@iohk-bors iohk-bors bot deleted the release-with-develop branch August 8, 2019 18:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thedanheller thedanheller thedanheller approved these changes

Assignees

@nikolaglumac nikolaglumac

Labels
chore release-0.14.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@nikolaglumac @thedanheller @disassembler @cleverca22