Code

Merge prs for releases#6

Code

Open

dubdabasoduba wants to merge 154 commits intomasteropensrp/android-fhir:masterfrom merge_prs_for_releasesopensrp/android-fhir:merge_prs_for_releasesCopy head branch name to clipboard

+2,121-573

Commits

Commits on Oct 1, 2021

• Add itemImage extension support on text and group questions

  Show description for 2e57f26
  ekigamba

  committed
  2e57f26

  Copy full SHA for 2e57f26

Commits on Oct 4, 2021

• Add itemImage extension support on display questions

  ekigamba

  committed
  badcbe8

  Copy full SHA for badcbe8

• Add sample implementation of itemImage extension

  ekigamba

  committed
  a2575d5

  Copy full SHA for a2575d5

Commits on Oct 5, 2021

• Add tests for Attachment#fetchBitmap extension

  ekigamba

  committed
  81a2941

  Copy full SHA for 81a2941

Commits on Oct 6, 2021

• Fix itemImage not displayed centered on group question

  ekigamba

  committed
  585914b

  Copy full SHA for 585914b

Commits on Oct 7, 2021

• Fix repeating images of itemImage and cleanup code

  Show description for 4500c05
  ekigamba

  committed
  4500c05

  Copy full SHA for 4500c05

Commits on Oct 8, 2021

• Fix build

  ekigamba

  committed
  4a818db

  Copy full SHA for 4a818db

Commits on Oct 22, 2021

• Merge branch 'master' into ek/item-image-support

  ekigamba

  committed
  ad89571

  Copy full SHA for ad89571

• Remove Timber dependency

  ekigamba

  committed
  0c84423

  Copy full SHA for 0c84423

Commits on Oct 26, 2021

• Merge branch 'master' into ek/item-image-support

  ekigamba

  authored
  da1c25d

  Copy full SHA for da1c25d

• Add tests for Binary & Attachment extension funcs

  ekigamba

  committed
  4a820ec

  Copy full SHA for 4a820ec

Commits on Nov 1, 2021

• Merge branch 'master' into ek/item-image-support

  ekigamba

  committed
  741107d

  Copy full SHA for 741107d

Commits on Nov 12, 2021

• Merge branch 'master' into ek/item-image-support

  ekigamba

  committed
  02675e3

  Copy full SHA for 02675e3

Commits on Nov 17, 2021

• Merge branch 'master' into ek/item-image-support

  ekigamba

  authored
  30a18dc

  Copy full SHA for 30a18dc

Commits on Nov 22, 2021

• Publicise Binary#isImage & #getBitamp

  Show description for d8ba75f
  ekigamba

  committed
  d8ba75f

  Copy full SHA for d8ba75f

• Add itemImage extension tests

  Show description for 1336898
  ekigamba

  committed
  1336898

  Copy full SHA for 1336898

• Merge branch 'master' into ek/item-image-support

  ekigamba

  committed
  270fe5b

  Copy full SHA for 270fe5b

Commits on Jan 6, 2022

• Merge branch 'master' into ek/item-image-support

  ekigamba

  committed
  a7f3a46

  Copy full SHA for a7f3a46

• Fix datacapture module instrumented tests

  ekigamba

  committed
  8f4d122

  Copy full SHA for 8f4d122

Commits on Jan 9, 2022

• Fix datacapture module instrumented tests

  ekigamba

  committed
  b08a3a2

  Copy full SHA for b08a3a2

• Merge branch 'master' into ek/item-image-support

  ekigamba

  committed
  b2dba45

  Copy full SHA for b2dba45

Commits on Apr 1, 2022

• Merge branch 'master' into ek/item-image-support

  ekigamba

  committed
  9c2fcd3

  Copy full SHA for 9c2fcd3

• Fix demo app build

  ekigamba

  committed
  442fe46

  Copy full SHA for 442fe46

• Merge branch 'master' into ek/item-image-support

  ekigamba

  committed
  2e31b5e

  Copy full SHA for 2e31b5e

Commits on May 10, 2022

• Merge branch 'master' into ek/item-image-support

  ekigamba

  committed
  5227b4d

  Copy full SHA for 5227b4d

• Code reformatting with spotlessApply

  ekigamba

  committed
  24e3aa9

  Copy full SHA for 24e3aa9

Commits on May 11, 2022

• Implement calculated-expression extension

  maimoonak

  committed
  7bf05ce

  Copy full SHA for 7bf05ce

Commits on May 12, 2022

• Fix form value update bug

  maimoonak

  committed
  b569b81

  Copy full SHA for b569b81

• Merge branch 'master' into 971_calc_exp

  maimoonak

  authored
  27aef40

  Copy full SHA for 27aef40

• Detect cyclic dependency | fix on init value loading

  maimoonak

  committed
  d472190

  Copy full SHA for d472190

• Merge branch '971_calc_exp' of https://github.com/opensrp/android-fhir into 971_calc_exp

  maimoonak

  committed
  c44e595

  Copy full SHA for c44e595

• Fix merge conflict

  maimoonak

  committed
  5536e96

  Copy full SHA for 5536e96

• Make birthdate age dependent | Handle and fix quantity values

  maimoonak

  committed
  bce9fd9

  Copy full SHA for bce9fd9

• Fix failing test

  maimoonak

  committed
  777489b

  Copy full SHA for 777489b

• Merge branch 'master' into 971_calc_exp

  maimoonak

  authored
  1eafc31

  Copy full SHA for 1eafc31

• quantity viewholder delegate test covergae

  maimoonak

  committed
  0ee4c27

  Copy full SHA for 0ee4c27

• Merge branch '971_calc_exp' of https://github.com/opensrp/android-fhir into 971_calc_exp

  maimoonak

  committed
  1f43305

  Copy full SHA for 1f43305

Commits on May 13, 2022

• Test coverage for update flow

  maimoonak

  committed
  3fe03fe

  Copy full SHA for 3fe03fe

• spotless fix

  maimoonak

  committed
  8ae3161

  Copy full SHA for 8ae3161

• spotless fix | re-run ci

  maimoonak

  committed
  e56bd98

  Copy full SHA for e56bd98

• Merge branch '971_calc_exp' of https://github.com/opensrp/android-fhir into 971_calc_exp

  maimoonak

  committed
  d4d8e1f

  Copy full SHA for d4d8e1f

Commits on May 16, 2022

• Merge branch 'master' into 971_calc_exp

  maimoonak

  authored
  1acf759

  Copy full SHA for 1acf759

Commits on May 19, 2022

• Test covergae for questionnaire fragment

  maimoonak

  committed
  219dd9e

  Copy full SHA for 219dd9e

• Merge branch '971_calc_exp' of https://github.com/opensrp/android-fhir into 971_calc_exp

  maimoonak

  committed
  0fdb56b

  Copy full SHA for 0fdb56b

• Merge branch 'master' into 971_calc_exp

  maimoonak

  authored
  b613865

  Copy full SHA for b613865

Commits on May 20, 2022

• test coverage for quantity types

  maimoonak

  committed
  5fff50d

  Copy full SHA for 5fff50d

• questionnaire fragment test with launchInFragmentContainer

  maimoonak

  committed
  23ed2e3

  Copy full SHA for 23ed2e3

Commits on May 21, 2022

• Move tryUnwrapContext() to utilities

  FikriMilano

  committed
  a52078c

  Copy full SHA for a52078c

• Use lifeCycleScope

  FikriMilano

  committed
  f7958ff

  Copy full SHA for f7958ff

• Merge branch 'master' of github.com:google/android-fhir into ek/item-image-support

  FikriMilano

  committed
  492b657

  Copy full SHA for 492b657

Commits on May 25, 2022

• Fix failing test

  FikriMilano

  committed
  fef0052

  Copy full SHA for fef0052

• Merge main to ek/item-image-support

  FikriMilano

  committed
  47d903f

  Copy full SHA for 47d903f

• Fix failing test

  FikriMilano

  committed
  fde21ab

  Copy full SHA for fde21ab

• Fix failing test

  FikriMilano

  committed
  b26b103

  Copy full SHA for b26b103

Commits on May 26, 2022

• Fix failing test

  FikriMilano

  committed
  35e7541

  Copy full SHA for 35e7541

Commits on May 30, 2022

• Merge branch 'master' into 971_calc_exp

  maimoonak

  authored
  5e41ae4

  Copy full SHA for 5e41ae4

• Update datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt

  Show description for 1f97b8d
  

  maimoonak

  and

  aditya-07

  authored
  1f97b8d

  Copy full SHA for 1f97b8d

Commits on May 31, 2022

• Move widget to LayoutList | Run Calculation after state-change

  maimoonak

  committed
  9e31819

  Copy full SHA for 9e31819

• Revert the run-expression after state-flow

  maimoonak

  committed
  501f4ef

  Copy full SHA for 501f4ef

Commits on Jun 1, 2022

• Merge branch 'master' into ek/item-image-support

  FikriMilano

  authored
  0c6b334

  Copy full SHA for 0c6b334

• Fix testing typo

  FikriMilano

  committed
  b580a85

  Copy full SHA for b580a85

• Merge branch 'master' into 971_calc_exp

  maimoonak

  authored
  a7b8709

  Copy full SHA for a7b8709

• Merge branch 'master' into 971_calc_exp

  maimoonak

  authored
  39cebfa

  Copy full SHA for 39cebfa

Commits on Jun 2, 2022

• Merge branch 'master' of github.com:google/android-fhir into ek/item-image-support

  FikriMilano

  committed
  20c83d5

  Copy full SHA for 20c83d5

• Trigger CI checks

  FikriMilano

  committed
  f9c036d

  Copy full SHA for f9c036d

• Merge branch 'master' of github.com:google/android-fhir into ek/item-image-support

  FikriMilano

  committed
  d7c5d9d

  Copy full SHA for d7c5d9d

• Merge branch 'master' into 971_calc_exp

  maimoonak

  authored
  8ed91d7

  Copy full SHA for 8ed91d7

Commits on Jun 3, 2022

• Trigger CI checks

  FikriMilano

  committed
  3107d7e

  Copy full SHA for 3107d7e

• Merge branch 'master' into 971_calc_exp

  maimoonak

  authored
  37fd56d

  Copy full SHA for 37fd56d

Commits on Jun 6, 2022

• Merge branch 'master' into ek/item-image-support

  dubdabasoduba

  authored
  2694edb

  Copy full SHA for 2694edb

• Merge branch 'master' into 971_calc_exp

  maimoonak

  authored
  dddfd20

  Copy full SHA for dddfd20

• Merge branch 'master' into 971_calc_exp

  maimoonak

  authored
  cda1f03

  Copy full SHA for cda1f03

Commits on Jun 7, 2022

• Merge branch 'master' into ek/item-image-support

  FikriMilano

  authored
  168303c

  Copy full SHA for 168303c

• Merge branch 'master' into 971_calc_exp

  dubdabasoduba

  authored
  a5993ff

  Copy full SHA for a5993ff

Commits on Jun 8, 2022

• Merge branch 'master' into 971_calc_exp

  maimoonak

  authored
  b5e8352

  Copy full SHA for b5e8352

Commits on Jun 9, 2022

• Add test

  FikriMilano

  committed
  aee9dd2

  Copy full SHA for aee9dd2

Commits on Jun 10, 2022

• Update test

  FikriMilano

  committed
  4287727

  Copy full SHA for 4287727

• Add test

  FikriMilano

  committed
  b2eab51

  Copy full SHA for b2eab51

• Merge branch 'master' into ek/item-image-support

  FikriMilano

  authored
  a2d3f55

  Copy full SHA for a2d3f55

• Trigger CI checks

  FikriMilano

  committed
  c48d220

  Copy full SHA for c48d220

• Merge branch 'master' into 971_calc_exp

  dubdabasoduba

  authored
  58fb48e

  Copy full SHA for 58fb48e

Commits on Jun 15, 2022

• Merge branch 'master' into 971_calc_exp

  dubdabasoduba

  authored
  b566b28

  Copy full SHA for b566b28

Commits on Jun 16, 2022

• Merge branch 'master' into 971_calc_exp

  dubdabasoduba

  authored
  28f0c65

  Copy full SHA for 28f0c65

Commits on Jun 20, 2022

• Merge branch 'master' into 971_calc_exp

  maimoonak

  authored
  284524b

  Copy full SHA for 284524b

Commits on Jun 30, 2022

• Merge branch 'master' into 971_calc_exp

  maimoonak

  authored
  2ce0055

  Copy full SHA for 2ce0055

Commits on Jul 1, 2022

• Remove commented code

  FikriMilano

  committed
  c8ded57

  Copy full SHA for c8ded57

• Revert orientation to horizontal

  FikriMilano

  committed
  bc45196

  Copy full SHA for bc45196

• Merge branch 'master' of github.com:google/android-fhir into ek/item-image-support

  FikriMilano

  committed
  34ef1d3

  Copy full SHA for 34ef1d3

Commits on Jul 4, 2022

• Merge branch 'master' into 971_calc_exp

  maimoonak

  authored
  bf956c5

  Copy full SHA for bf956c5

• Merge branch 'master' into ek/item-image-support

  FikriMilano

  authored
  9b967b8

  Copy full SHA for 9b967b8

• Merge branch 'master' into 971_calc_exp

  maimoonak

  authored
  3c227f2

  Copy full SHA for 3c227f2

• remove empty line changes

  maimoonak

  committed
  0414961

  Copy full SHA for 0414961

• Merge branch '971_calc_exp' of https://github.com/opensrp/android-fhir into 971_calc_exp

  maimoonak

  committed
  2406e26

  Copy full SHA for 2406e26

• spotless fix

  maimoonak

  committed
  bbda724

  Copy full SHA for bbda724

• Esperesso test | Fix failing test

  maimoonak

  committed
  1fd726c

  Copy full SHA for 1fd726c

Commits on Jul 5, 2022

• Merge branch 'master' into 971_calc_exp

  maimoonak

  authored
  4c4f1ef

  Copy full SHA for 4c4f1ef

Commits on Jul 6, 2022

• Use IO Dispatcher to fetch Bitmap

  FikriMilano

  committed
  6748dfe

  Copy full SHA for 6748dfe

• Remove unused comment

  FikriMilano

  committed
  15d0808

  Copy full SHA for 15d0808

• spotlessApply

  FikriMilano

  committed
  f1d6ec3

  Copy full SHA for f1d6ec3

• Merge branch 'master' of github.com:google/android-fhir into ek/item-image-support

  FikriMilano

  committed
  6ce8463

  Copy full SHA for 6ce8463

Commits on Jul 20, 2022

• Merge main and resolve conflicts

  maimoonak

  committed
  4793baf

  Copy full SHA for 4793baf

• Merge branch 'master' into 971_calc_exp

  maimoonak

  authored
  d402a3f

  Copy full SHA for d402a3f

• Remove unnessary changes

  maimoonak

  authored
  e738864

  Copy full SHA for e738864

• Fix espresso tests

  maimoonak

  committed
  4b4aaaf

  Copy full SHA for 4b4aaaf

• Merge branch '971_calc_exp' of https://github.com/opensrp/android-fhir into 971_calc_exp

  maimoonak

  committed
  f1cb2bf

  Copy full SHA for f1cb2bf

• Merge branch 'master' into 971_calc_exp

  maimoonak

  authored
  be654e1

  Copy full SHA for be654e1

• Ignore Failing tests

  maimoonak

  committed
  c6032aa

  Copy full SHA for c6032aa

Commits on Jul 21, 2022

• Merge branch 'master' into 971_calc_exp

  maimoonak

  authored
  7b2b4bd

  Copy full SHA for 7b2b4bd

• Merge branch 'master' into 971_calc_exp

  maimoonak

  authored
  2c6a86f

  Copy full SHA for 2c6a86f

• Merge branch 'master' into 971_calc_exp

  maimoonak

  authored
  26fb54a

  Copy full SHA for 26fb54a

Commits on Jul 25, 2022

• Merge branch 'master' into 971_calc_exp

  maimoonak

  authored
  cefbb96

  Copy full SHA for cefbb96

Commits on Jul 26, 2022

• Merge branch 'master' into 971_calc_exp

  maimoonak

  authored
  f51eb9e

  Copy full SHA for f51eb9e

• Merge branch 'master' into 971_calc_exp

  maimoonak

  authored
  1d2ae03

  Copy full SHA for 1d2ae03

Commits on Jul 27, 2022

• Merge branch 'master' into 971_calc_exp

  maimoonak

  authored
  e12f3bc

  Copy full SHA for e12f3bc

• Use internal tryUnwrapContext for barcode

  FikriMilano

  committed
  7fc8ba1

  Copy full SHA for 7fc8ba1

• Merge branch 'master' of github.com:google/android-fhir into ek/item-image-support

  Show description for 2e719fe
  FikriMilano

  committed
  2e719fe

  Copy full SHA for 2e719fe

Commits on Jul 29, 2022

• Merge branch 'master' into 971_calc_exp

  maimoonak

  authored
  2f868ce

  Copy full SHA for 2f868ce

Commits on Aug 5, 2022

• Merge branch 'master' into 971_calc_exp

  maimoonak

  authored
  f2a1aec

  Copy full SHA for f2a1aec

• Revert ignore test | merge main | refactor

  maimoonak

  committed
  9302aa0

  Copy full SHA for 9302aa0

Commits on Aug 12, 2022

• Merge branch 'master' into 971_calc_exp

  maimoonak

  authored
  01bc73d

  Copy full SHA for 01bc73d

Commits on Aug 21, 2022

• Fix failing build checks

  FikriMilano

  committed
  6ba5378

  Copy full SHA for 6ba5378

• Merge branch 'master' of github.com:google/android-fhir into ek/item-image-support

  FikriMilano

  committed
  3181d5e

  Copy full SHA for 3181d5e

• Use NotValidated in test

  FikriMilano

  committed
  5ec6ce6

  Copy full SHA for 5ec6ce6

• spotlessApply

  FikriMilano

  committed
  1a68298

  Copy full SHA for 1a68298

• Add item image to multi line edit text

  FikriMilano

  committed
  d136220

  Copy full SHA for d136220

• Trigger checks

  FikriMilano

  committed
  14c076e

  Copy full SHA for 14c076e

• Use itemMedia instead itemImage

  FikriMilano

  committed
  f711a35

  Copy full SHA for f711a35

• Merge branch 'master' of github.com:google/android-fhir into ek/item-image-support

  FikriMilano

  committed
  a8484a0

  Copy full SHA for a8484a0

• Trigger checks

  FikriMilano

  committed
  03d52d1

  Copy full SHA for 03d52d1

Commits on Aug 22, 2022

• Merge branch 'master' into ek/item-image-support

  f-odhiambo

  authored
  8f6547c

  Copy full SHA for 8f6547c

Commits on Aug 23, 2022

• Revert unused dependency

  FikriMilano

  committed
  bb2efdd

  Copy full SHA for bb2efdd

• Revert contentType of video to document

  FikriMilano

  committed
  caf5e05

  Copy full SHA for caf5e05

Commits on Sep 5, 2022

• Rename ID from itemImage to item_image

  FikriMilano

  committed
  c63c449

  Copy full SHA for c63c449

Commits on Sep 6, 2022

• Create QuestionnaireItemMediaView

  FikriMilano

  committed
  e1df233

  Copy full SHA for e1df233

• Migrate ImageView to QuestionnaireItemMediaView

  FikriMilano

  committed
  b072dfe

  Copy full SHA for b072dfe

• Add test for QuestionnaireItemEditTextMultiLineViewHolderFactory

  FikriMilano

  committed
  e8efc30

  Copy full SHA for e8efc30

• Merge branch 'ek/item-image-support' of github.com:opensrp/android-fhir into ek/item-image-support

  FikriMilano

  committed
  251df9b

  Copy full SHA for 251df9b

• Merge branch 'master' of github.com:google/android-fhir into ek/item-image-support

  FikriMilano

  committed
  0349b42

  Copy full SHA for 0349b42

Commits on Sep 14, 2022

• Merge branch 'master' into ek/item-image-support

  f-odhiambo

  authored
  b579c1d

  Copy full SHA for b579c1d

• Merge branch 'master' of github.com:google/android-fhir into 971_calc_exp

  dubdabasoduba

  committed
  648847d

  Copy full SHA for 648847d

Commits on Sep 21, 2022

• Set display and group type questionnaire as vertical

  FikriMilano

  committed
  21ebb11

  Copy full SHA for 21ebb11

• Merge branch 'ek/item-image-support' of github.com:opensrp/android-fhir into ek/item-image-support

  FikriMilano

  committed
  ac69d77

  Copy full SHA for ac69d77

• Merge branch 'master' of github.com:google/android-fhir into ek/item-image-support

  FikriMilano

  committed
  58c7f39

  Copy full SHA for 58c7f39

Commits on Sep 26, 2022

• Merge branch 'master' into ek/item-image-support

  ndegwamartin

  authored
  5265207

  Copy full SHA for 5265207

Commits on Sep 29, 2022

• Remove duplicate test

  FikriMilano

  committed
  a86ffae

  Copy full SHA for a86ffae

• Rename test class

  FikriMilano

  committed
  2f8814e

  Copy full SHA for 2f8814e

• Merge branch 'master' of github.com:google/android-fhir into ek/item-image-support

  FikriMilano

  committed
  67f5412

  Copy full SHA for 67f5412

Commits on Sep 30, 2022

• Merge branch 'master' of github.com:google/android-fhir into ek/item-image-support

  FikriMilano

  committed
  84f34f4

  Copy full SHA for 84f34f4

• Merge branch 'ek/item-image-support' of github.com:opensrp/android-fhir into ek/item-image-support

  FikriMilano

  committed
  b62aabe

  Copy full SHA for b62aabe

Commits on Oct 7, 2022

• Catch exception in flow

  Show description for 2e9c0de
  ellykits

  committed
  2e9c0de

  Copy full SHA for 2e9c0de

• Fix flow exception violation issue

  Show description for f9545f7
  ellykits

  committed
  f9545f7

  Copy full SHA for f9545f7

Commits on Oct 9, 2022

• Merge branch '971_calc_exp' into merge_prs_for_releases

  dubdabasoduba

  committed
  42fd2fc

  Copy full SHA for 42fd2fc

• Merge remote-tracking branch 'origin/fix-sync-state-exception-handling' into merge_prs_for_releases

  dubdabasoduba

  committed
  3e8bf1d

  Copy full SHA for 3e8bf1d

• Merge remote-tracking branch 'origin/ek/item-image-support' into merge_prs_for_releases

  dubdabasoduba

  committed
  2c621d3

  Copy full SHA for 2c621d3