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

Debug 2.8.1.1 simprints fork 3 #3

Open
wants to merge 1,002 commits into
base: development
Choose a base branch
from

Conversation

ifoche
Copy link

@ifoche ifoche commented Jan 16, 2024

Description

This PR contains the code that implements the following issues:

A compiled version of the APK containing it has been uploaded to the clickup tasks

mvmmacamo2 and others added 30 commits February 10, 2023 11:33
[ANDROAPP-5204] Add EDITING_REVIEWING step
[ANDROAPP-5156] Add review text at the bottom of the table
build: remove paperwork and update sonarqube
fix: [ANDROAPP-4853] show enrolling org unit in all program screen
…ng_last_changes_2_7_1_psi

# Conflicts:
#	app/build.gradle
#	app/src/main/assets/paperwork.json
#	app/src/main/java/org/dhis2/usescases/login/LoginPresenter.kt
#	app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailActivity.java
#	app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailRepository.java
#	app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailRepositoryImpl.java
#	app/src/main/java/org/dhis2/usescases/programEventDetail/eventList/EventListFragment.kt
#	app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardMobileActivity.java
#	app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TeiDataRepositoryImpl.kt
#	app/src/test/java/org/dhis2/usescases/login/LoginPresenterTest.kt
#	app/src/test/java/org/dhis2/usescases/main/program/ProgramRepositoryImplTest.kt
#	buildsystem/dependencies.gradle
#	commons/build.gradle
#	commons/src/main/java/org/dhis2/commons/filters/data/FilterRepository.kt
#	commons/src/main/res/layout/custom_dialog.xml
#	dhis2-android-sdk
#	dhis_android_analytics/build.gradle
#	form/build.gradle
[ANDROAPP-5205] Remove discard dialog on back
* fixing ANDROAPP-5206

* [ANDROAPP-5206] Check button status every time table is populated

---------

Co-authored-by: andresmr <andres@dhis2.org>
fix: [ANDROAPP-5134] support pin with multiaccount
…ring_last_changes_2_7_1_psi

# Conflicts:
#	buildsystem/dependencies.gradle
ifoche and others added 29 commits October 6, 2023 21:21
…_to_simprints

Send TrackedEntityInstance as extras to intent
New features:
- TEI ID sent in SID callouts
- Merge Simprints team PR on enabling custom versions of Simprints ID

Bugfixing:
- Non-biometric programs work without crashing

Merge remote-tracking branch 'upstream/develop-simprints' into development
- I create this one because PreferenceProviderImpl use SecurePreferences to store credentials and there is problems to store BiometricsConfig list in json
- Biometrics guid is not save in data value in the data base, only it's assigned in memory
…to_programs' into feature-simprints/enable_register_biometrics_from_events
…s_to_programs

[SIMPRINTS] Link projects to programs
…ter_biometrics_from_events

[Simprints] Enable register biometrics from events
New features:
- Add project-based configuration
- Launch biometrics from program stage

Merge remote-tracking branch 'upstream/develop-simprints' into development
@ifoche ifoche changed the title Development 2.8.1.1 simprints fork 3 Debug 2.8.1.1 simprints fork 3 Jan 16, 2024
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.