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: rebase 3.0.1 onto main #3652

Closed
wants to merge 7 commits into from
Closed

Conversation

xavimolloy
Copy link
Contributor

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

mmmateos and others added 2 commits May 21, 2024 10:35
…3641)

* fix: [ANDROAPP-6146] modify start padding for download share button container, change dp paddings to mobile ui Spacings, change Drawable resource Icon to Material Icon

* fix: [ANDROAPP-6146] sonar code smell fixes, change material theme for mobile ui theme
Balcan and others added 5 commits May 23, 2024 09:37
placeholder workflow
)

* [ANDROAPP-6175] TeiDataFragment keeps reloading in landscape

Signed-off-by: Pablo <[email protected]>

* [ANDROAPP-6175] Check if grouped events option is visible

Signed-off-by: Pablo <[email protected]>

* [ANDROAPP-6175] Ignore flaky test

Signed-off-by: Pablo <[email protected]>

---------

Signed-off-by: Pablo <[email protected]>
@xavimolloy xavimolloy force-pushed the update-3.0.1-with-main branch from 3ce2bfe to 702e78b Compare May 23, 2024 07:37
Copy link
Collaborator

@andresmr andresmr left a comment

Choose a reason for hiding this comment

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

This branch can not be merged until 3.0 is done and main updated

@Balcan Balcan closed this May 24, 2024
@Balcan Balcan deleted the update-3.0.1-with-main branch May 24, 2024 10:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants