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.

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

Merge master into develop branch #1538

Merged
merged 16 commits into from
Aug 14, 2019
Merged

Merge master into develop branch #1538

merged 16 commits into from
Aug 14, 2019

Conversation

nikolaglumac
Copy link
Contributor

This PR merges master code into develop branch.

disassembler and others added 16 commits July 30, 2019 14:37
…#1516)

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

* [DDW-815] Trigger rebuild
* DDW-812 Fix application dialog close button colour

* [DDW-812] CHANGELOG

* [DDW-813] Remove unused code

* [DDW-812] Run translation manager
)

* [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
…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
1529: fixes size of linux installer r=disassembler a=disassembler

This PR CHANGES.

## Todos

- [ ] Todo

## Screenshots

- Screenshot

---

## Testing Checklist

- [Slack QA thread](https://input-output-rnd.slack.com/messages/GGKFXSKC6)
- [ ] Test

---

## Review Checklist

### Basics

- [ ] PR has been assigned and has appropriate labels (`feature`/`bug`/`chore`, `release-x.x.x`)
- [ ] PR is updated to the most recent version of the target branch (and there are no conflicts)
- [ ] PR has a good description that summarizes all changes and shows some screenshots or animated GIFs of important UI changes
- [ ] CHANGELOG entry has been added to the top of the appropriate section (*Features*, *Fixes*, *Chores*) and is linked to the correct PR on GitHub
- [ ] Automated tests: All acceptance and unit tests are passing (`yarn test`)
- [ ] Manual tests (minimum tests should cover newly added feature/fix): App works correctly in *development* build (`yarn dev`)
- [ ] Manual tests (minimum tests should cover newly added feature/fix): App works correctly in *production* build (`yarn package` / CI builds)
- [ ] There are no *flow* errors or warnings (`yarn flow:test`)
- [ ] There are no *lint* errors or warnings (`yarn lint`)
- [ ] There are no *prettier* errors or warnings (`yarn prettier:check`)
- [ ] There are no missing translations (running `yarn manage:translations` produces no changes)
- [ ] Text changes are proofread and approved (Jane Wild / Amy Reeve)
- [ ] Japanese text changes are proofread and approved (Junko Oda)
- [ ] UI changes look good in all themes (Alexander Rukin)
- [ ] Storybook works and no stories are broken (`yarn storybook`)
- [ ] In case of dependency changes `yarn.lock` file is updated

### Code Quality
- [ ] Important parts of the code are properly commented and documented
- [ ] Code is properly typed with flow
- [ ] React components are split-up enough to avoid unnecessary re-renderings
- [ ] Any code that only works in main process is neatly separated from components

### Testing
- [ ] New feature/change is covered by acceptance tests
- [ ] New feature/change is manually tested and approved by QA team
- [ ] All existing acceptance tests are still up-to-date
- [ ] New feature/change is covered by Daedalus Testing scenario
- [ ] All existing Daedalus Testing scenarios are still up-to-date

### After Review
- [ ] Merge the PR
- [ ] Delete the source branch
- [ ] Move the ticket to `done` column on the YouTrack board
- [ ] Update Slack QA thread by marking it with a green checkmark


Co-authored-by: Samuel Leathers <samuel.leathers@iohk.io>
@nikolaglumac nikolaglumac merged commit 0b12589 into develop Aug 14, 2019
@iohk-bors iohk-bors bot deleted the master-with-develop branch August 14, 2019 08:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants