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

Release 3.0 -> Main #3616

Merged
merged 12 commits into from May 20, 2024
Merged

Release 3.0 -> Main #3616

merged 12 commits into from May 20, 2024

Conversation

Balcan
Copy link
Collaborator

@Balcan Balcan commented Apr 29, 2024

Description

Please include a summary of the change and include the related jira issue if it exists.

[ jira issue ](https://dhis2.atlassian.net/browse/ANDROAPP-

Solution description

If this PR is a fix include a brief description on how the issue is solved.

Covered unit test cases

Describe the tests that you ran to verify your changes.

Where did you test this issue?

  • Smartphone Emulator
  • Tablet Emulator
  • Smartphone
  • Tablet

Which Android versions did you test this issue?

  • 4.4
  • 5.X - 6.X
  • 7.X
  • 8.X
  • 9.X - 10.X
  • 11.X - 13.X
  • Other

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code

Balcan and others added 6 commits April 29, 2024 13:47
Signed-off-by: Pablo <pablo@dhis2.org>
Signed-off-by: Pablo <pablo@dhis2.org>
* Perform sync in local network

Signed-off-by: Pablo <pablo@dhis2.org>

* Perform sync in local network

Signed-off-by: Pablo <pablo@dhis2.org>

---------

Signed-off-by: Pablo <pablo@dhis2.org>
Co-authored-by: Pablo <pablo@dhis2.org>
@andresmr andresmr changed the title version name 3.0 Update main with release 3.0 May 2, 2024
xavimolloy and others added 4 commits May 6, 2024 16:49
* chore: [ANDROAPP-6139] ignoreflaky test

* fix: [ANDROAPP-6135] add ignore to shouldSuccessfullySyncSavedEvent
#3623)

* chore: [ANDROAPP-6135] Update rule engine and expression parser to release version for 3.0

* chore: update rule-engine version 3.0.0

* fix: [ANDROAPP-6135] fix tests

---------

Co-authored-by: Victor Garcia <victor.garcia@dhis2.org>
Signed-off-by: andresmr <andres@dhis2.org>
@andresmr andresmr changed the title Update main with release 3.0 Release 3.0 May 14, 2024
@andresmr andresmr changed the title Release 3.0 Release 3.0 -> Main May 14, 2024
Signed-off-by: andresmr <andres@dhis2.org>
* [ANDROAPP-6162] Remove COMPOSE_FORM option

Signed-off-by: andresmr <andres@dhis2.org>

* [ANDROAPP-6162] Ignore flaky test

Signed-off-by: andresmr <andres@dhis2.org>

* [ANDROAPP-6162] Ignore flaky test

Signed-off-by: andresmr <andres@dhis2.org>

---------

Signed-off-by: andresmr <andres@dhis2.org>
Copy link

sonarcloud bot commented May 16, 2024

@Balcan Balcan merged commit cdc73a6 into main May 20, 2024
6 checks passed
@Balcan Balcan deleted the release/3.0 branch May 20, 2024 13:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants