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 main to develop #3412

Closed
wants to merge 57 commits into from
Closed

Merge main to develop #3412

wants to merge 57 commits into from

Conversation

ferdyrod
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

dependabot bot and others added 30 commits October 10, 2023 08:26
Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.25.10 to 1.26.17.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](urllib3/urllib3@1.25.10...1.26.17)

---
updated-dependencies:
- dependency-name: urllib3
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.17 to 1.26.18.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](urllib3/urllib3@1.26.17...1.26.18)

---
updated-dependencies:
- dependency-name: urllib3
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Initial commit

* [ANDROAPP-5626] Add DataMatrix support to new component logic

* [ANDROAPP-5626]  update design system
* build: change development name (#3354)

* fix(translations): sync translations from transifex (develop)

---------

Co-authored-by: Ferdy Rodriguez <[email protected]>
Co-authored-by: Andrés Miguel Rubio <[email protected]>
* [ANDROAPP-5652] Add Date, OrgUnit and Category combo inputs in EventInitial

* [ANDROAPP-5652] Add coordinates input

* [ANDROAPP-5652] Add event temp component

* [ANDROAPP-5652] Implement category options dropdown

* [ANDROAPP-5652] Update functional tests for new components

* [ANDROAPP-5652] Add Polygon component

* [ANDROAPP-5652] jenkins disable concurrent builds

* [ANDROAPP-5652] Sonar checks review

* [ANDROAPP-5652] Switch lat long

* [ANDROAPP-5652] Add labels
* [ANDROAPP-5603] Change Accept button

* [ANDROAPP-5603] Update map location permission request and user location

* [ANDROAPP-5652] Remove lat long for point
* [ANDROAPP-5587]  manage back navigation correctly and add OnImage click implementation

* [ANDROAPP-5587] hide loading on cancel request form pick picture and take picture

* [ANDROAPP-5587] refactor method

---------

Co-authored-by: Andrés Miguel Rubio <[email protected]>
* [ANDROAPP-5582] store empty values

* [ANDROAPP-5582] Update design system
* feat: [ANDROAPP-5670] not supported field

* feat: [ANDROAPP-5596] remove AndroidView
* various design fixes

* fix infobar paddings and header attribute is now shown

* [ANDROAPP-4019] Add onImageclick to Test

---------

Co-authored-by: andresmr <[email protected]>
* [ANDROAPP-5652] Remove cat combo selected

* [ANDROAPP-5652] Add title to referral type

* [ANDROAPP-5652] set compose forms enabled by default

* [ANDROAPP-5652] update design library
* Improve performance in displayMap evaluation

* Improve performance in displayAnalytics evaluation

* Ktlint
… gallery (#3373)

* [ANDROAPP-5659] manage events through event handler rather than fieldUiModel

* [ANDROAPP-5659] remove setfocus

* [ANDROAPP-5659] remove setfocus

* [ANDROAPP-5656] remove unnecessary onClear()
* [ANDROAPP-5584] fix display file size add loading animation

* [ANDROAPP-5584] fix value not saving, remove unnecessary call to onAddImageFinished removed

* [ANDROAPP-5584] rollback changes

* [ANDROAPP-5584] rollback changes

* [ANDROAPP-5584] fix back navigation

* [ANDROAPP-5584] use file.name and display name for file download
* [ANDROAPP-5582] Check allowed future dates

* [ANDROAPP-5582] set age future dates by params

* [ANDROAPP-5582] ktlint format
…ity. (#3377)

* [ANDROAPP-5709] Implement new Components in ScheduledEventActivity.

* [ANDROAPP-5709] ktlint fix

* [ANDROAPP-5709] Update design system

* [ANDROAPP-5709] adapt tests to new compose components
vgarciabnz and others added 25 commits November 14, 2023 11:03
* Defer matomo event tracking to IO thread

* Fix ktlint
* fix: [ANDROAPP-5729] move to next section from last field focus

* sonarcloud issue
* update: [ANDROAPP-5708] field error message modified

* update: [ANDROAPP-5708] string modified
* [ANDROAPP-5734] add remote to feature config

* [ANDROAPP-5734] persist local configuration
* workinglist chip persist selection

* Fix worklinglist's chip single selection and persist on scroll

* ktlint
* [ANDROAPP-5744] update numeric fields when value change

* [ANDROAPP-5744] Add unit interval update value
* [ANDROAPP-5685] Show view only for non editable data sets

* [ANDROAPP-5685] update SDK

* [ANDROAPP-5685] update SDK
* fix: [ANDROAPP-5750] remove filters on dashboard event loading

* events by timeline order
* [ANDROAPP-5652] Set event detail mandatory fields

* [ANDROAPP-5652] update selections with already selected

* [ANDROAPP-5652] Fix test

* [ANDROAPP-5652] Fix test
* fix: [ANDROAPP-5627] open single program once

* [ANDROAPP-5627] sonar fix

* [ANDROAPP-5627] manage saved instance state for single program navigation

---------

Co-authored-by: Xavier Molloy <[email protected]>
@ferdyrod ferdyrod closed this Nov 22, 2023
Copy link

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 5 Code Smells

11.2% 11.2% Coverage
0.7% 0.7% Duplication

idea Catch issues before they fail your Quality Gate with our IDE extension sonarlint SonarLint

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.

7 participants