Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
f4c1050
Update version to 3.3.1-Dev (#4438)
github-actions[bot] Oct 21, 2025
b9ac199
ANDROAPP-7288-usecase-interface [skip size] (#4435)
andresmr Oct 23, 2025
3e29b76
build(deps): bump actions/upload-artifact from 4.6.2 to 5.0.0 (#4453)
dependabot[bot] Oct 30, 2025
46b8776
build: update dhis2sdk version to 1.13.1-SNAPSHOT (#4461)
andresmr Oct 30, 2025
0bc9b4c
fix: update output setting in GitHub Actions workflows (#4455)
andresmr Oct 30, 2025
5fd7ace
refactor: rename copilot instructions to AGENTS.md and update UI test…
andresmr Oct 31, 2025
3e67a08
Merge remote-tracking branch 'origin/develop' into update-develop-wit…
andresmr Nov 4, 2025
1f11453
Merge pull request #4474 from dhis2/update-develop-with-release-3.3.0
andresmr Nov 4, 2025
64f8e16
chore: [ANDROAPP-7288] D2Error to DomainError [AI-generated] (#4436)
andresmr Nov 5, 2025
082eaea
ANDROAPP-7373-LogoutUser-use-case-improvements (#4480)
andresmr Nov 7, 2025
c66ab34
fix: update flag handling in SyncActivity to use drawable resource id…
andresmr Nov 10, 2025
b87dd44
ANDROAPP-7384 [skip size] (#4483)
andresmr Nov 10, 2025
8b113b7
fix(translations): sync translations from transifex (develop) (#4485)
dhis2-bot Nov 11, 2025
5783347
feat(translations): add new localized strings for various languages (…
andresmr Nov 11, 2025
365f1b6
fix(translations): escape quotes in string resources for proper rende…
andresmr Nov 11, 2025
c5ce0cd
fix(translations): sync translations from transifex (develop) [skip s…
dhis2-bot Nov 13, 2025
a689f14
fix(translations): sync translations from transifex (develop) (#4496)
dhis2-bot Nov 19, 2025
9ca97a2
Merge branch 'develop' into update-develop-with-3.3.0
andresmr Nov 19, 2025
a3bc251
fix(translations): remove duplicate string resources in Dutch transla…
andresmr Nov 19, 2025
9e395e0
Merge pull request #4501 from dhis2/update-develop-with-3.3.0
andresmr Nov 20, 2025
55549ef
refactor: Update InfoBar component parameters (#4511)
ferdyrod Nov 26, 2025
b8355a5
Merge branch 'develop' into release/3.3.0-RC
andresmr Nov 27, 2025
94f1926
fix: correct indentation in HomeRepository implementation
andresmr Nov 27, 2025
9ff36c2
Merge pull request #4524 from dhis2/release/3.3.0-RC
andresmr Nov 28, 2025
c983e8b
build: [ANDROAPP-7337] [1/3] Home repository new architecture (#4464)
Balcan Dec 1, 2025
c7a3a69
fix: [ANDROAPP-7261] use keyboard inset padding (#4521)
mmmateos Dec 2, 2025
da71531
build(deps): bump actions/checkout from 5 to 6 (#4512)
dependabot[bot] Dec 3, 2025
4a0a964
chore: [ANDROAPP-7393] login user unit tests (#4508)
xavimolloy Dec 3, 2025
bdc9333
update usage of Program's and DataElement's `categoryComboUid` method…
ferdyrod Dec 5, 2025
ab76cb3
chore: [ANDROAPP-7388] Create sync module (#4532)
xavimolloy Dec 9, 2025
023e801
deps: bump the gradle-updates group across 1 directory with 7 updates…
dependabot[bot] Dec 10, 2025
0dd9fe1
test: [ANDROAPP-7220] Automate Manage accounts screen test case (#4516)
andresmr Dec 10, 2025
6653513
fix(form): include enrollment fields in StoreResult context check (#4…
andresmr Dec 11, 2025
84f9f04
fix: [ANDROAPP-7293] Pin bottomsheet landscape behaviour (#4499)
Balcan Dec 11, 2025
09e2375
fix: [ANDROAPP-6870] remove useCodeForOptionSet logic [skip size] (#4…
Balcan Dec 12, 2025
c274b96
fix: Create event in timeline view (#4537)
andresmr Dec 15, 2025
7c23363
fix: [ANDROAPP-7211] Collection contains no element matching the pred…
Balcan Dec 15, 2025
2268ead
ANDROAPP-7424: Remove RxBinding and ZXing legacy dependencies (#4545)
andresmr Dec 15, 2025
8b2218b
ci: remove super on setup in SchedulingDialogUiTest.kt (#4558)
andresmr Dec 16, 2025
b6aceb4
fix: [ANDROAPP-7419] Use correct color for server action description …
xavimolloy Dec 16, 2025
6ca4d0c
fix: [ANDROPP-7395] Wait for worker to be cancelled (#4541)
Balcan Dec 16, 2025
123e53e
deps: [ANDROAPP-7349] add commit SHA hash for github actions (#4542)
mmmateos Dec 17, 2025
4f3e271
build(deps): bump actions/upload-artifact from 5.0.0 to 6.0.0 (#4550)
dependabot[bot] Dec 17, 2025
e583f93
deps: bump com.android.tools.build:gradle in the gradle-updates group…
dependabot[bot] Dec 17, 2025
0360cf7
build: [ANDROAPP-7386] Remove classes from ui components [skip size] …
Balcan Dec 18, 2025
fda25ba
fix: [ANDROAPP-7425] NullPointerException when casting current fragme…
Balcan Dec 18, 2025
08fef04
feat: Hide reset button for org unit fields when Event or Enrollment …
ferdyrod Dec 18, 2025
1a0041f
Merge branch 'develop' into release/3.3.0.1
andresmr Dec 19, 2025
a12ec5c
Merge pull request #4568 from dhis2/release/3.3.0.1
andresmr Dec 19, 2025
e9031b9
fix: [ANDROAPP-7428] Filter by events only linked to active enrollmen…
xavimolloy Dec 29, 2025
7735180
fix: [ANDROAPP-7269] Adds 'Owned By' to online tei cards. (#4572)
ferdyrod Dec 29, 2025
b1807bc
fix: [ANDROAPP-7235] Text base inputs not saving when clicking on oth…
Balcan Jan 2, 2026
10a10ac
chore: update version name (#4575)
xavimolloy Jan 7, 2026
d7fff3c
ANDROAPP-7426-Upload-proguard-mapping-on-Sentry (#4569)
andresmr Jan 8, 2026
43cbbf3
chore: [ANDROAPP-7440] Update expression parser (#4580)
xavimolloy Jan 9, 2026
f5a6990
fix(reporting): remove user tracking from crash reports (#4577)
andresmr Jan 9, 2026
613b608
fix: [ANDROAPP-7442] Don't filter by completed enrollments for prog… …
xavimolloy Jan 13, 2026
a4a5c0d
Merge branch 'main' into release/3.3.1
xavimolloy Jan 14, 2026
6ee2e72
chore: Update release notes and what's new file (#4595)
xavimolloy Jan 15, 2026
c4f9cb0
build: release 3.3.1
github-actions[bot] Jan 15, 2026
604d771
fix: remove incorrectly added escape characters (#4598)
xavimolloy Jan 16, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
256 changes: 0 additions & 256 deletions .github/copilot-instructions.md

This file was deleted.

16 changes: 9 additions & 7 deletions .github/workflows/build-release-candidate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Runs a single command using the runners shell
- uses: actions/checkout@v5
- uses: actions/checkout@v6

# Set Repository Name As Env Variable
- name: Set repository name as env variable
Expand All @@ -39,7 +39,7 @@ jobs:

- name: Decode Keystore
id: decode_keystore
uses: timheuer/base64-to-file@v1
uses: timheuer/base64-to-file@784a1a4a994315802b7d8e2084e116e783d157be
with:
fileName: 'dhis_keystore.jks'
encodedString: ${{ secrets.KEYSTORE }}
Expand All @@ -48,21 +48,23 @@ jobs:
run: ./gradlew app:assembleDhis2Release app:assembleDhis2PlayServicesRelease
env:
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
SIGNING_KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
SIGNING_KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
SIGNING_STORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
SIGNING_KEYSTORE_PATH: ${{ steps.decode_keystore.outputs.filePath }}

- name: Decode Training Keystore
id: decode_training_keystore
uses: timheuer/base64-to-file@v1
uses: timheuer/base64-to-file@784a1a4a994315802b7d8e2084e116e783d157be
with:
fileName: 'dhis_training_keystore.jks'
encodedString: ${{ secrets.TRAINING_KEYSTORE_BASE64 }}

- name: Build Training APK
env:
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
TRAINING_KEY_ALIAS: ${{ secrets.TRAINING_KEY_ALIAS }}
TRAINING_KEY_PASSWORD: ${{ secrets.TRAINING_KEY_PASSWORD }}
TRAINING_STORE_PASSWORD: ${{ secrets.TRAINING_STORE_PASSWORD }}
Expand All @@ -72,25 +74,25 @@ jobs:
- name: Read version name from file
working-directory: ./gradle
id: read-version
run: echo "::set-output name=vName::$(grep 'vName' libs.versions.toml | awk -F' = ' '{print $2}' | tr -d '"')"
run: echo "vName=$(grep 'vName' libs.versions.toml | awk -F' = ' '{print $2}' | tr -d '"')" >> $GITHUB_OUTPUT

# Upload DhisRelease APK
- name: Upload DhisRelease APK
uses: actions/upload-artifact@v4.6.2
uses: actions/upload-artifact@v6.0.0
with:
name: ${{ env.repository_name }} - DhisRelease APK
path: ${{ env.main_project_module }}/build/outputs/apk/dhis2/release/dhis2-v${{ steps.read-version.outputs.vName }}.apk

# Upload DhisPlayServicesRelease APK
- name: Upload DhisPlayServicesRelease APK
uses: actions/upload-artifact@v4.6.2
uses: actions/upload-artifact@v6.0.0
with:
name: ${{ env.repository_name }} - DhisPlayServicesRelease APK
path: ${{ env.main_project_module }}/build/outputs/apk/dhis2PlayServices/release/dhis2-v${{ steps.read-version.outputs.vName }}-googlePlay.apk

# Upload Training Release APK
- name: Upload Training Release APK
uses: actions/upload-artifact@v4.6.2
uses: actions/upload-artifact@v6.0.0
with:
name: ${{ env.repository_name }} - Training Release APK
path: ${{ env.main_project_module }}/build/outputs/apk/dhis2Training/release/dhis2-v${{ steps.read-version.outputs.vName }}-training.apk
4 changes: 2 additions & 2 deletions .github/workflows/continuous-delivery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
deployment_job:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6

# Set Current Date
- name: Set current date
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:

# Upload Artifact Build
- name: Upload Android artifacts
uses: actions/upload-artifact@v4.6.2
uses: actions/upload-artifact@v6.0.0
with:
name: ${{ env.repository_name }} - Android APK - ${{ steps.date.outputs.date }}
path: ${{ env.main_project_module }}/build/outputs/apk/dhis2/debug/dhis2-v${{ steps.read-version.outputs.vName }}.apk
Loading
Loading