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: forward-ports the last two PRs #1588

Merged
merged 2 commits into from
Mar 26, 2021
Merged

Conversation

paschalidi
Copy link
Contributor

Forwardports the last two PRs

@paschalidi paschalidi requested a review from JoakimSM March 25, 2021 16:05
@paschalidi paschalidi changed the title chore: merges the last two PRs on master chore: forward-ports the last two PRs Mar 25, 2021
@paschalidi paschalidi merged commit 513ba28 into master Mar 26, 2021
@paschalidi paschalidi deleted the cp/merge/v36-on-master branch March 26, 2021 08:47
paschalidi added a commit that referenced this pull request Apr 8, 2021
* docs: Update README

* refactor: exports shared steps & fixes all tests (#1483)

* 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

* chore: removes the dhis2-capture- prefix (#1410)

* fix: the bug (#1536)

* chore(release): cut 1.15.1 [skip ci]

## [1.15.1](v1.15.0...v1.15.1) (2021-03-04)

### Bug Fixes

* the bug ([#1536](#1536)) ([fd2616f](fd2616f))

* chore: forward-ports the last two PRs  (#1588)

* 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)

* chore: fix the rerun (#1589)

* chore: fixes

Co-authored-by: Joakim Storløkken Melseth <joakim@dhis2.org>
Co-authored-by: @dhis2-bot <apps@dhis2.org>
Co-authored-by: Joakim Storløkken Melseth <joakim.melseth@gmail.com>
paschalidi added a commit that referenced this pull request Apr 9, 2021
…orgUnits (#1600)

* docs: Update README

* refactor: exports shared steps & fixes all tests (#1483)

* 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

* chore: removes the dhis2-capture- prefix (#1410)

* fix: the bug (#1536)

* chore(release): cut 1.15.1 [skip ci]

## [1.15.1](v1.15.0...v1.15.1) (2021-03-04)

### Bug Fixes

* the bug ([#1536](#1536)) ([fd2616f](fd2616f))

* chore: forward-ports the last two PRs  (#1588)

* 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)

* chore: fix the rerun (#1589)

* chore: fixes

* fix: the bug

* chore: adds the test

* fix: avoid empty for org.unit in Program

Co-authored-by: Joakim Storløkken Melseth <joakim@dhis2.org>
Co-authored-by: @dhis2-bot <apps@dhis2.org>
Co-authored-by: Joakim Storløkken Melseth <joakim.melseth@gmail.com>
paschalidi added a commit that referenced this pull request Apr 20, 2021
…iting the page (#1592)

* docs: Update README

* refactor: exports shared steps & fixes all tests (#1483)

* 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

* chore: removes the dhis2-capture- prefix (#1410)

* fix: the bug (#1536)

* chore(release): cut 1.15.1 [skip ci]

## [1.15.1](v1.15.0...v1.15.1) (2021-03-04)

### Bug Fixes

* the bug ([#1536](#1536)) ([fd2616f](fd2616f))

* chore: forward-ports the last two PRs  (#1588)

* 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)

* chore: fix the rerun (#1589)

* chore: reverts

* chore: saves

* chore: fixes the bug

* chore: removes unused onCleanup

* chore: improves

* chore: cleans up and lints

* chore: fixes

* chore: imports from correct action

* chore: cleans up also on unmount

* chore: adds curr state

* chore: cleans up

* fix: the crash by removing only the correct entries on cleanUp

* chore: fixes the problem with the window

Co-authored-by: Joakim Storløkken Melseth <joakim@dhis2.org>
Co-authored-by: @dhis2-bot <apps@dhis2.org>
Co-authored-by: Joakim Storløkken Melseth <joakim.melseth@gmail.com>
paschalidi added a commit that referenced this pull request Apr 20, 2021
…iting the page (#1592)

* docs: Update README

* refactor: exports shared steps & fixes all tests (#1483)

* 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

* chore: removes the dhis2-capture- prefix (#1410)

* fix: the bug (#1536)

* chore(release): cut 1.15.1 [skip ci]

* the bug ([#1536](#1536)) ([fd2616f](fd2616f))

* chore: forward-ports the last two PRs  (#1588)

* 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)

* chore: fix the rerun (#1589)

* chore: reverts

* chore: saves

* chore: fixes the bug

* chore: removes unused onCleanup

* chore: improves

* chore: cleans up and lints

* chore: fixes

* chore: imports from correct action

* chore: cleans up also on unmount

* chore: adds curr state

* chore: cleans up

* fix: the crash by removing only the correct entries on cleanUp

* chore: fixes the problem with the window

Co-authored-by: Joakim Storløkken Melseth <joakim@dhis2.org>
Co-authored-by: @dhis2-bot <apps@dhis2.org>
Co-authored-by: Joakim Storløkken Melseth <joakim.melseth@gmail.com>
paschalidi added a commit that referenced this pull request Apr 20, 2021
…iting the page (#1621)

* docs: Update README

* refactor: exports shared steps & fixes all tests (#1483)

* 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

* chore: removes the dhis2-capture- prefix (#1410)

* fix: the bug (#1536)

* chore(release): cut 1.15.1 [skip ci]

* the bug ([#1536](#1536)) ([fd2616f](fd2616f))

* chore: forward-ports the last two PRs  (#1588)

* 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)

* chore: fix the rerun (#1589)

* chore: reverts

* chore: saves

* chore: fixes the bug

* chore: removes unused onCleanup

* chore: improves

* chore: cleans up and lints

* chore: fixes

* chore: imports from correct action

* chore: cleans up also on unmount

* chore: adds curr state

* chore: cleans up

* fix: the crash by removing only the correct entries on cleanUp

* chore: fixes the problem with the window

Co-authored-by: Joakim Storløkken Melseth <joakim@dhis2.org>
Co-authored-by: @dhis2-bot <apps@dhis2.org>
Co-authored-by: Joakim Storløkken Melseth <joakim.melseth@gmail.com>

Co-authored-by: Joakim Storløkken Melseth <joakim@dhis2.org>
Co-authored-by: @dhis2-bot <apps@dhis2.org>
Co-authored-by: Joakim Storløkken Melseth <joakim.melseth@gmail.com>
paschalidi added a commit that referenced this pull request Apr 20, 2021
…iting the page (#1592)

* docs: Update README

* refactor: exports shared steps & fixes all tests (#1483)

* 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

* chore: removes the dhis2-capture- prefix (#1410)

* fix: the bug (#1536)

* chore(release): cut 1.15.1 [skip ci]

* the bug ([#1536](#1536)) ([fd2616f](fd2616f))

* chore: forward-ports the last two PRs  (#1588)

* 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)

* chore: fix the rerun (#1589)

* chore: reverts

* chore: saves

* chore: fixes the bug

* chore: removes unused onCleanup

* chore: improves

* chore: cleans up and lints

* chore: fixes

* chore: imports from correct action

* chore: cleans up also on unmount

* chore: adds curr state

* chore: cleans up

* fix: the crash by removing only the correct entries on cleanUp

* chore: fixes the problem with the window

Co-authored-by: Joakim Storløkken Melseth <joakim@dhis2.org>
Co-authored-by: @dhis2-bot <apps@dhis2.org>
Co-authored-by: Joakim Storløkken Melseth <joakim.melseth@gmail.com>
paschalidi added a commit that referenced this pull request Apr 20, 2021
* docs: Update README

* refactor: exports shared steps & fixes all tests (#1483)

* 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

* chore: removes the dhis2-capture- prefix (#1410)

* fix: the bug (#1536)

* chore(release): cut 1.15.1 [skip ci]

* the bug ([#1536](#1536)) ([fd2616f](fd2616f))

* chore: forward-ports the last two PRs  (#1588)

* 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)

* chore: fix the rerun (#1589)

* chore: reverts

* chore: saves

* chore: fixes the bug

* chore: removes unused onCleanup

* chore: improves

* chore: cleans up and lints

* chore: fixes

* chore: imports from correct action

* chore: cleans up also on unmount

* chore: adds curr state

* chore: cleans up

* fix: the crash by removing only the correct entries on cleanUp

* chore: fixes the problem with the window

Co-authored-by: Joakim Storløkken Melseth <joakim@dhis2.org>
Co-authored-by: @dhis2-bot <apps@dhis2.org>
Co-authored-by: Joakim Storløkken Melseth <joakim.melseth@gmail.com>
dhis2-bot added a commit that referenced this pull request Apr 23, 2021
# [1.16.0](v1.15.1...v1.16.0) (2021-04-23)

### Bug Fixes

* **translations:** [DHIS2-8998] translate strings ([b92350c](b92350c))
* correct app name and title specified in d2.config.js ([#1599](#1599)) ([f14cf01](f14cf01))
* DHIS2-10711 duplicated calls on search page ([#1572](#1572)) ([1360124](1360124))
* DHIS2-10712 duplicate checking on save only ([3665b76](3665b76))
* DHIS2-10713 when optionSet use EQ to filter ([#1624](#1624)) ([60b3764](60b3764)), closes [#1618](#1618)
* DHIS2-10715 working lists default sorting ([e8280c3](e8280c3))
* DHIS2-10716 use code if option not found ([b80effd](b80effd))
* DHIS2-10723 ([#1622](#1622)) ([#1631](#1631)) ([fce7307](fce7307))
* DHIS2-10723 port on 2.36.0 ([#1630](#1630)) ([#1633](#1633)) ([b47524f](b47524f)), closes [#1622](#1622)
* **translations:** [DHIS2-8998] missing translation ([#1617](#1617)) ([70b103e](70b103e))
* DHIS2-10738 pressing the back button after a fallback crashes app ([#1581](#1581)) ([6a75e9c](6a75e9c))
* DHIS2-10765 use form names ([8578891](8578891))
* DHIS2-10765 use form names ([ab74dc3](ab74dc3))
* DHIS2-10830 capture app will crash when program is missing some orgUnits ([#1600](#1600)) ([dc1a351](dc1a351)), closes [#1483](#1483) [#1532](#1532) [#1410](#1410) [#1536](#1536) [#1536](#1536) [#1588](#1588) [#1581](#1581) [#1580](#1580) [#1589](#1589)
* DHIS2-9931 wording from Find to Search ([#1540](#1540)) ([0893bad](0893bad))
* TECH-542 Switch to new endpoint for org units ([dba014e](dba014e))
* the bug ([#1536](#1536)) ([043f4fd](043f4fd))
* the bug ([#1580](#1580)) ([c491a00](c491a00))
* **translations:** sync translations from transifex (v36) ([c017642](c017642))

### Features

* adds new icon for capture app ([#1534](#1534)) ([c700edd](c700edd))
* adds smaller icon ([#1544](#1544)) ([181a94c](181a94c))
* DHIS2-10218 stages and events widget - user can see a list of the different stages ([524dd92](524dd92))
@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