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

chore: merges the change of the data-test naming into v36 #1598

Merged
merged 12 commits into from
Apr 8, 2021

Conversation

paschalidi
Copy link
Contributor

This merges the change in naming of the data-test in v36. I found it super confusing these are different in those two versions.

No functional changes are added.

JoakimSM and others added 11 commits March 1, 2021 13:39
* chore: only the fail true is on

* chore: fixes existing tests

* chore: reduces time

* chore: drops time more

* chore: adds 1000 ms

* chore: bring time to 20000

* chore: fixes new page

* chore: bring time down to 7000

* chore: time is 12000

* chore: timer is 14000

* chore: time equals 12000

* feat: extracts the functions

* chore: drops time to 6000

* chore: up to 12000

* chore: 15000

* chore: rebase and splits the shared steps

* chore: addmission date and missing steps

* chore: random and

* chore: fixes the tests

* chore: typo

* fix: program error bug (#1532)

* chore: solves the bug

* chore: covers with tests

* chore: adds missing test cases
## [1.15.1](v1.15.0...v1.15.1) (2021-03-04)

### Bug Fixes

* the bug ([#1536](#1536)) ([fd2616f](fd2616f))
* fix: DHIS2-10738 pressing the back button after a fallback crashes app (#1581)

* chore: sets to false

* chore: covers bug case

* fix: the bug (#1580)
Copy link
Member

@JoakimSM JoakimSM left a comment

Choose a reason for hiding this comment

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

Looks good to me 👍 Great if you squash merge this to keep the history a bit cleaner.

@paschalidi paschalidi merged commit 0b6f8c3 into v36 Apr 8, 2021
@paschalidi paschalidi deleted the cp/merge/master-onto-v36 branch April 8, 2021 10:25
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 1.16.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants