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.

Sign up for GitHub

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

Jump to bottom

Merge prs for releases #6

Open
wants to merge 154 commits into
base: master
Choose a base branch
from
Open

Merge prs for releases #6

wants to merge 154 commits into from

Commits on Oct 1, 2021

  1. Add itemImage extension support on text and group questions 

    - Add example usage in reference app
- Add AttachmentResolver in DatacaptureConfig
    @ekigamba
    ekigamba committed Oct 1, 2021
    Configuration menu
    Copy the full SHA
    2e57f26 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2021

  1. Add itemImage extension support on display questions

    @ekigamba
    ekigamba committed Oct 4, 2021
    Configuration menu
    Copy the full SHA
    badcbe8 View commit details
    Browse the repository at this point in the history

  2. Add sample implementation of itemImage extension

    @ekigamba
    ekigamba committed Oct 4, 2021
    Configuration menu
    Copy the full SHA
    a2575d5 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2021

  1. Add tests for Attachment#fetchBitmap extension

    @ekigamba
    ekigamba committed Oct 5, 2021
    Configuration menu
    Copy the full SHA
    81a2941 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2021

  1. Fix itemImage not displayed centered on group question

    @ekigamba
    ekigamba committed Oct 6, 2021
    Configuration menu
    Copy the full SHA
    585914b View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2021

  1. Fix repeating images of itemImage and cleanup code 

    - Add extension properties and method documentation in MoreQuestionnaireItemComponents.kt
- Log errors trying to fetch Bitmap from Attachment and Binary Resource
- Remove test images in reference app
- Add thermometer instruction image in reference-app screener questionnaire
- Sync thermometer Binary resource
    @ekigamba
    ekigamba committed Oct 7, 2021
    Configuration menu
    Copy the full SHA
    4500c05 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2021

  1. Fix build

    @ekigamba
    ekigamba committed Oct 8, 2021
    Configuration menu
    Copy the full SHA
    4a818db View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2021

  1. Merge branch 'master' into ek/item-image-support

    @ekigamba
    ekigamba committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    ad89571 View commit details
    Browse the repository at this point in the history

  2. Remove Timber dependency

    @ekigamba
    ekigamba committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    0c84423 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2021

  1. Merge branch 'master' into ek/item-image-support

    @ekigamba
    ekigamba authored Oct 26, 2021
    Configuration menu
    Copy the full SHA
    da1c25d View commit details
    Browse the repository at this point in the history

  2. Add tests for Binary & Attachment extension funcs

    @ekigamba
    ekigamba committed Oct 26, 2021
    Configuration menu
    Copy the full SHA
    4a820ec View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2021

  1. Merge branch 'master' into ek/item-image-support

    @ekigamba
    ekigamba committed Nov 1, 2021
    Configuration menu
    Copy the full SHA
    741107d View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2021

  1. Merge branch 'master' into ek/item-image-support

    @ekigamba
    ekigamba committed Nov 12, 2021
    Configuration menu
    Copy the full SHA
    02675e3 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2021

  1. Merge branch 'master' into ek/item-image-support

    @ekigamba
    ekigamba authored Nov 17, 2021
    Configuration menu
    Copy the full SHA
    30a18dc View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2021

  1. Publicise Binary#isImage & #getBitamp 

    - Add tests for Binary#isImage & getBitmap
    @ekigamba
    ekigamba committed Nov 22, 2021
    Configuration menu
    Copy the full SHA
    d8ba75f View commit details
    Browse the repository at this point in the history

  2. Add itemImage extension tests 

    - Add tests for Binary#getBitmap and Binary#isImage
- Add tests for image display in QuestionnaireItemEditTextSingleLineViewHolderFactory, QuestionnaireItemGroupViewHolderFactory and QuestionnaireItemDisplayViewHolderFactory
- Add instrumented tests for Attachment#fetchBitmap
    @ekigamba
    ekigamba committed Nov 22, 2021
    Configuration menu
    Copy the full SHA
    1336898 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into ek/item-image-support

    @ekigamba
    ekigamba committed Nov 22, 2021
    Configuration menu
    Copy the full SHA
    270fe5b View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2022

  1. Merge branch 'master' into ek/item-image-support

    @ekigamba
    ekigamba committed Jan 6, 2022
    Configuration menu
    Copy the full SHA
    a7f3a46 View commit details
    Browse the repository at this point in the history

  2. Fix datacapture module instrumented tests

    @ekigamba
    ekigamba committed Jan 6, 2022
    Configuration menu
    Copy the full SHA
    8f4d122 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2022

  1. Fix datacapture module instrumented tests

    @ekigamba
    ekigamba committed Jan 9, 2022
    Configuration menu
    Copy the full SHA
    b08a3a2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into ek/item-image-support

    @ekigamba
    ekigamba committed Jan 9, 2022
    Configuration menu
    Copy the full SHA
    b2dba45 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2022

  1. Merge branch 'master' into ek/item-image-support

    @ekigamba
    ekigamba committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    9c2fcd3 View commit details
    Browse the repository at this point in the history

  2. Fix demo app build

    @ekigamba
    ekigamba committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    442fe46 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into ek/item-image-support

    @ekigamba
    ekigamba committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    2e31b5e View commit details
    Browse the repository at this point in the history

Commits on May 10, 2022

  1. Merge branch 'master' into ek/item-image-support

    @ekigamba
    ekigamba committed May 10, 2022
    Configuration menu
    Copy the full SHA
    5227b4d View commit details
    Browse the repository at this point in the history

  2. Code reformatting with spotlessApply

    @ekigamba
    ekigamba committed May 10, 2022
    Configuration menu
    Copy the full SHA
    24e3aa9 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2022

  1. Implement calculated-expression extension

    @maimoonak
    maimoonak committed May 11, 2022
    Configuration menu
    Copy the full SHA
    7bf05ce View commit details
    Browse the repository at this point in the history

Commits on May 12, 2022

  1. Fix form value update bug

    @maimoonak
    maimoonak committed May 12, 2022
    Configuration menu
    Copy the full SHA
    b569b81 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored May 12, 2022
    Configuration menu
    Copy the full SHA
    27aef40 View commit details
    Browse the repository at this point in the history

  3. Detect cyclic dependency | fix on init value loading

    @maimoonak
    maimoonak committed May 12, 2022
    Configuration menu
    Copy the full SHA
    d472190 View commit details
    Browse the repository at this point in the history

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

    …into 971_calc_exp
    @maimoonak
    maimoonak committed May 12, 2022
    Configuration menu
    Copy the full SHA
    c44e595 View commit details
    Browse the repository at this point in the history

  5. Fix merge conflict

    @maimoonak
    maimoonak committed May 12, 2022
    Configuration menu
    Copy the full SHA
    5536e96 View commit details
    Browse the repository at this point in the history

  6. Make birthdate age dependent | Handle and fix quantity values

    @maimoonak
    maimoonak committed May 12, 2022
    Configuration menu
    Copy the full SHA
    bce9fd9 View commit details
    Browse the repository at this point in the history

  7. Fix failing test

    @maimoonak
    maimoonak committed May 12, 2022
    Configuration menu
    Copy the full SHA
    777489b View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored May 12, 2022
    Configuration menu
    Copy the full SHA
    1eafc31 View commit details
    Browse the repository at this point in the history

  9. quantity viewholder delegate test covergae

    @maimoonak
    maimoonak committed May 12, 2022
    Configuration menu
    Copy the full SHA
    0ee4c27 View commit details
    Browse the repository at this point in the history

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

    …into 971_calc_exp
    @maimoonak
    maimoonak committed May 12, 2022
    Configuration menu
    Copy the full SHA
    1f43305 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2022

  1. Test coverage for update flow

    @maimoonak
    maimoonak committed May 13, 2022
    Configuration menu
    Copy the full SHA
    3fe03fe View commit details
    Browse the repository at this point in the history

  2. spotless fix

    @maimoonak
    maimoonak committed May 13, 2022
    Configuration menu
    Copy the full SHA
    8ae3161 View commit details
    Browse the repository at this point in the history

  3. spotless fix | re-run ci

    @maimoonak
    maimoonak committed May 13, 2022
    Configuration menu
    Copy the full SHA
    e56bd98 View commit details
    Browse the repository at this point in the history

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

    …into 971_calc_exp
    @maimoonak
    maimoonak committed May 13, 2022
    Configuration menu
    Copy the full SHA
    d4d8e1f View commit details
    Browse the repository at this point in the history

Commits on May 16, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored May 16, 2022
    Configuration menu
    Copy the full SHA
    1acf759 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2022

  1. Test covergae for questionnaire fragment

    @maimoonak
    maimoonak committed May 19, 2022
    Configuration menu
    Copy the full SHA
    219dd9e View commit details
    Browse the repository at this point in the history

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

    …into 971_calc_exp
    @maimoonak
    maimoonak committed May 19, 2022
    Configuration menu
    Copy the full SHA
    0fdb56b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored May 19, 2022
    Configuration menu
    Copy the full SHA
    b613865 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2022

  1. test coverage for quantity types

    @maimoonak
    maimoonak committed May 20, 2022
    Configuration menu
    Copy the full SHA
    5fff50d View commit details
    Browse the repository at this point in the history

  2. questionnaire fragment test with launchInFragmentContainer

    @maimoonak
    maimoonak committed May 20, 2022
    Configuration menu
    Copy the full SHA
    23ed2e3 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2022

  1. Move tryUnwrapContext() to utilities

    @FikriMilano
    FikriMilano committed May 21, 2022
    Configuration menu
    Copy the full SHA
    a52078c View commit details
    Browse the repository at this point in the history

  2. Use lifeCycleScope

    @FikriMilano
    FikriMilano committed May 21, 2022
    Configuration menu
    Copy the full SHA
    f7958ff View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:google/android-fhir into ek/item-… 

    …image-support
    @FikriMilano
    FikriMilano committed May 21, 2022
    Configuration menu
    Copy the full SHA
    492b657 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2022

  1. Fix failing test

    @FikriMilano
    FikriMilano committed May 25, 2022
    Configuration menu
    Copy the full SHA
    fef0052 View commit details
    Browse the repository at this point in the history

  2. Merge main to ek/item-image-support

    @FikriMilano
    FikriMilano committed May 25, 2022
    Configuration menu
    Copy the full SHA
    47d903f View commit details
    Browse the repository at this point in the history

  3. Fix failing test

    @FikriMilano
    FikriMilano committed May 25, 2022
    Configuration menu
    Copy the full SHA
    fde21ab View commit details
    Browse the repository at this point in the history

  4. Fix failing test

    @FikriMilano
    FikriMilano committed May 25, 2022
    Configuration menu
    Copy the full SHA
    b26b103 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2022

  1. Fix failing test

    @FikriMilano
    FikriMilano committed May 26, 2022
    Configuration menu
    Copy the full SHA
    35e7541 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored May 30, 2022
    Configuration menu
    Copy the full SHA
    5e41ae4 View commit details
    Browse the repository at this point in the history

  2. Update datacapture/src/main/java/com/google/android/fhir/datacapture/… 

    …QuestionnaireViewModel.kt

Co-authored-by: aditya-07 <[email protected]>
    @maimoonak @aditya-07
    maimoonak and aditya-07 authored May 30, 2022
    Configuration menu
    Copy the full SHA
    1f97b8d View commit details
    Browse the repository at this point in the history

Commits on May 31, 2022

  1. Move widget to LayoutList | Run Calculation after state-change

    @maimoonak
    maimoonak committed May 31, 2022
    Configuration menu
    Copy the full SHA
    9e31819 View commit details
    Browse the repository at this point in the history

  2. Revert the run-expression after state-flow

    @maimoonak
    maimoonak committed May 31, 2022
    Configuration menu
    Copy the full SHA
    501f4ef View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2022

  1. Merge branch 'master' into ek/item-image-support

    @FikriMilano
    FikriMilano authored Jun 1, 2022
    Configuration menu
    Copy the full SHA
    0c6b334 View commit details
    Browse the repository at this point in the history

  2. Fix testing typo

    @FikriMilano
    FikriMilano committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    b580a85 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jun 1, 2022
    Configuration menu
    Copy the full SHA
    a7b8709 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jun 1, 2022
    Configuration menu
    Copy the full SHA
    39cebfa View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2022

  1. Merge branch 'master' of github.com:google/android-fhir into ek/item-… 

    …image-support
    @FikriMilano
    FikriMilano committed Jun 2, 2022
    Configuration menu
    Copy the full SHA
    20c83d5 View commit details
    Browse the repository at this point in the history

  2. Trigger CI checks

    @FikriMilano
    FikriMilano committed Jun 2, 2022
    Configuration menu
    Copy the full SHA
    f9c036d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:google/android-fhir into ek/item-… 

    …image-support
    @FikriMilano
    FikriMilano committed Jun 2, 2022
    Configuration menu
    Copy the full SHA
    d7c5d9d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jun 2, 2022
    Configuration menu
    Copy the full SHA
    8ed91d7 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2022

  1. Trigger CI checks

    @FikriMilano
    FikriMilano committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    3107d7e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jun 3, 2022
    Configuration menu
    Copy the full SHA
    37fd56d View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2022

  1. Merge branch 'master' into ek/item-image-support

    @dubdabasoduba
    dubdabasoduba authored Jun 6, 2022
    Configuration menu
    Copy the full SHA
    2694edb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jun 6, 2022
    Configuration menu
    Copy the full SHA
    dddfd20 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jun 6, 2022
    Configuration menu
    Copy the full SHA
    cda1f03 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2022

  1. Merge branch 'master' into ek/item-image-support

    @FikriMilano
    FikriMilano authored Jun 7, 2022
    Configuration menu
    Copy the full SHA
    168303c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 971_calc_exp

    @dubdabasoduba
    dubdabasoduba authored Jun 7, 2022
    Configuration menu
    Copy the full SHA
    a5993ff View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jun 8, 2022
    Configuration menu
    Copy the full SHA
    b5e8352 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2022

  1. Add test

    @FikriMilano
    FikriMilano committed Jun 9, 2022
    Configuration menu
    Copy the full SHA
    aee9dd2 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2022

  1. Update test

    @FikriMilano
    FikriMilano committed Jun 10, 2022
    Configuration menu
    Copy the full SHA
    4287727 View commit details
    Browse the repository at this point in the history

  2. Add test

    @FikriMilano
    FikriMilano committed Jun 10, 2022
    Configuration menu
    Copy the full SHA
    b2eab51 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into ek/item-image-support

    @FikriMilano
    FikriMilano authored Jun 10, 2022
    Configuration menu
    Copy the full SHA
    a2d3f55 View commit details
    Browse the repository at this point in the history

  4. Trigger CI checks

    @FikriMilano
    FikriMilano committed Jun 10, 2022
    Configuration menu
    Copy the full SHA
    c48d220 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into 971_calc_exp

    @dubdabasoduba
    dubdabasoduba authored Jun 10, 2022
    Configuration menu
    Copy the full SHA
    58fb48e View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2022

  1. Merge branch 'master' into 971_calc_exp

    @dubdabasoduba
    dubdabasoduba authored Jun 15, 2022
    Configuration menu
    Copy the full SHA
    b566b28 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2022

  1. Merge branch 'master' into 971_calc_exp

    @dubdabasoduba
    dubdabasoduba authored Jun 16, 2022
    Configuration menu
    Copy the full SHA
    28f0c65 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jun 20, 2022
    Configuration menu
    Copy the full SHA
    284524b View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jun 30, 2022
    Configuration menu
    Copy the full SHA
    2ce0055 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2022

  1. Remove commented code

    @FikriMilano
    FikriMilano committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    c8ded57 View commit details
    Browse the repository at this point in the history

  2. Revert orientation to horizontal

    @FikriMilano
    FikriMilano committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    bc45196 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:google/android-fhir into ek/item-… 

    …image-support
    @FikriMilano
    FikriMilano committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    34ef1d3 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jul 4, 2022
    Configuration menu
    Copy the full SHA
    bf956c5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into ek/item-image-support

    @FikriMilano
    FikriMilano authored Jul 4, 2022
    Configuration menu
    Copy the full SHA
    9b967b8 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jul 4, 2022
    Configuration menu
    Copy the full SHA
    3c227f2 View commit details
    Browse the repository at this point in the history

  4. remove empty line changes

    @maimoonak
    maimoonak committed Jul 4, 2022
    Configuration menu
    Copy the full SHA
    0414961 View commit details
    Browse the repository at this point in the history

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

    …into 971_calc_exp
    @maimoonak
    maimoonak committed Jul 4, 2022
    Configuration menu
    Copy the full SHA
    2406e26 View commit details
    Browse the repository at this point in the history

  6. spotless fix

    @maimoonak
    maimoonak committed Jul 4, 2022
    Configuration menu
    Copy the full SHA
    bbda724 View commit details
    Browse the repository at this point in the history

  7. Esperesso test | Fix failing test

    @maimoonak
    maimoonak committed Jul 4, 2022
    Configuration menu
    Copy the full SHA
    1fd726c View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jul 5, 2022
    Configuration menu
    Copy the full SHA
    4c4f1ef View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2022

  1. Use IO Dispatcher to fetch Bitmap

    @FikriMilano
    FikriMilano committed Jul 6, 2022
    Configuration menu
    Copy the full SHA
    6748dfe View commit details
    Browse the repository at this point in the history

  2. Remove unused comment

    @FikriMilano
    FikriMilano committed Jul 6, 2022
    Configuration menu
    Copy the full SHA
    15d0808 View commit details
    Browse the repository at this point in the history

  3. spotlessApply

    @FikriMilano
    FikriMilano committed Jul 6, 2022
    Configuration menu
    Copy the full SHA
    f1d6ec3 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of github.com:google/android-fhir into ek/item-… 

    …image-support
    @FikriMilano
    FikriMilano committed Jul 6, 2022
    Configuration menu
    Copy the full SHA
    6ce8463 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2022

  1. Merge main and resolve conflicts

    @maimoonak
    maimoonak committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    4793baf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jul 20, 2022
    Configuration menu
    Copy the full SHA
    d402a3f View commit details
    Browse the repository at this point in the history

  3. Remove unnessary changes

    @maimoonak
    maimoonak authored Jul 20, 2022
    Configuration menu
    Copy the full SHA
    e738864 View commit details
    Browse the repository at this point in the history

  4. Fix espresso tests

    @maimoonak
    maimoonak committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    4b4aaaf View commit details
    Browse the repository at this point in the history

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

    …into 971_calc_exp
    @maimoonak
    maimoonak committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    f1cb2bf View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jul 20, 2022
    Configuration menu
    Copy the full SHA
    be654e1 View commit details
    Browse the repository at this point in the history

  7. Ignore Failing tests

    @maimoonak
    maimoonak committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    c6032aa View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jul 21, 2022
    Configuration menu
    Copy the full SHA
    7b2b4bd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jul 21, 2022
    Configuration menu
    Copy the full SHA
    2c6a86f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jul 21, 2022
    Configuration menu
    Copy the full SHA
    26fb54a View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jul 25, 2022
    Configuration menu
    Copy the full SHA
    cefbb96 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jul 26, 2022
    Configuration menu
    Copy the full SHA
    f51eb9e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jul 26, 2022
    Configuration menu
    Copy the full SHA
    1d2ae03 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jul 27, 2022
    Configuration menu
    Copy the full SHA
    e12f3bc View commit details
    Browse the repository at this point in the history

  2. Use internal tryUnwrapContext for barcode

    @FikriMilano
    FikriMilano committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    7fc8ba1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:google/android-fhir into ek/item-… 

    …image-support

� Conflicts:
�	datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextViewHolderFactory.kt
    @FikriMilano
    FikriMilano committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    2e719fe View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jul 29, 2022
    Configuration menu
    Copy the full SHA
    2f868ce View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Aug 5, 2022
    Configuration menu
    Copy the full SHA
    f2a1aec View commit details
    Browse the repository at this point in the history

  2. Revert ignore test | merge main | refactor

    @maimoonak
    maimoonak committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    9302aa0 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Aug 12, 2022
    Configuration menu
    Copy the full SHA
    01bc73d View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2022

  1. Fix failing build checks

    @FikriMilano
    FikriMilano committed Aug 21, 2022
    Configuration menu
    Copy the full SHA
    6ba5378 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:google/android-fhir into ek/item-… 

    …image-support
    @FikriMilano
    FikriMilano committed Aug 21, 2022
    Configuration menu
    Copy the full SHA
    3181d5e View commit details
    Browse the repository at this point in the history

  3. Use NotValidated in test

    @FikriMilano
    FikriMilano committed Aug 21, 2022
    Configuration menu
    Copy the full SHA
    5ec6ce6 View commit details
    Browse the repository at this point in the history

  4. spotlessApply

    @FikriMilano
    FikriMilano committed Aug 21, 2022
    Configuration menu
    Copy the full SHA
    1a68298 View commit details
    Browse the repository at this point in the history

  5. Add item image to multi line edit text

    @FikriMilano
    FikriMilano committed Aug 21, 2022
    Configuration menu
    Copy the full SHA
    d136220 View commit details
    Browse the repository at this point in the history

  6. Trigger checks

    @FikriMilano
    FikriMilano committed Aug 21, 2022
    Configuration menu
    Copy the full SHA
    14c076e View commit details
    Browse the repository at this point in the history

  7. Use itemMedia instead itemImage

    @FikriMilano
    FikriMilano committed Aug 21, 2022
    Configuration menu
    Copy the full SHA
    f711a35 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' of github.com:google/android-fhir into ek/item-… 

    …image-support
    @FikriMilano
    FikriMilano committed Aug 21, 2022
    Configuration menu
    Copy the full SHA
    a8484a0 View commit details
    Browse the repository at this point in the history

  9. Trigger checks

    @FikriMilano
    FikriMilano committed Aug 21, 2022
    Configuration menu
    Copy the full SHA
    03d52d1 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2022

  1. Merge branch 'master' into ek/item-image-support

    @f-odhiambo
    f-odhiambo authored Aug 22, 2022
    Configuration menu
    Copy the full SHA
    8f6547c View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2022

  1. Revert unused dependency

    @FikriMilano
    FikriMilano committed Aug 23, 2022
    Configuration menu
    Copy the full SHA
    bb2efdd View commit details
    Browse the repository at this point in the history

  2. Revert contentType of video to document

    @FikriMilano
    FikriMilano committed Aug 23, 2022
    Configuration menu
    Copy the full SHA
    caf5e05 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2022

  1. Rename ID from itemImage to item_image

    @FikriMilano
    FikriMilano committed Sep 5, 2022
    Configuration menu
    Copy the full SHA
    c63c449 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2022

  1. Create QuestionnaireItemMediaView

    @FikriMilano
    FikriMilano committed Sep 6, 2022
    Configuration menu
    Copy the full SHA
    e1df233 View commit details
    Browse the repository at this point in the history

  2. Migrate ImageView to QuestionnaireItemMediaView

    @FikriMilano
    FikriMilano committed Sep 6, 2022
    Configuration menu
    Copy the full SHA
    b072dfe View commit details
    Browse the repository at this point in the history

  3. Add test for QuestionnaireItemEditTextMultiLineViewHolderFactory

    @FikriMilano
    FikriMilano committed Sep 6, 2022
    Configuration menu
    Copy the full SHA
    e8efc30 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'ek/item-image-support' of github.com:opensrp/android-fh… 

    …ir into ek/item-image-support
    @FikriMilano
    FikriMilano committed Sep 6, 2022
    Configuration menu
    Copy the full SHA
    251df9b View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of github.com:google/android-fhir into ek/item-… 

    …image-support
    @FikriMilano
    FikriMilano committed Sep 6, 2022
    Configuration menu
    Copy the full SHA
    0349b42 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2022

  1. Merge branch 'master' into ek/item-image-support

    @f-odhiambo
    f-odhiambo authored Sep 14, 2022
    Configuration menu
    Copy the full SHA
    b579c1d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:google/android-fhir into 971_calc… 

    …_exp
    @dubdabasoduba
    dubdabasoduba committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    648847d View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2022

  1. Set display and group type questionnaire as vertical

    @FikriMilano
    FikriMilano committed Sep 21, 2022
    Configuration menu
    Copy the full SHA
    21ebb11 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'ek/item-image-support' of github.com:opensrp/android-fh… 

    …ir into ek/item-image-support
    @FikriMilano
    FikriMilano committed Sep 21, 2022
    Configuration menu
    Copy the full SHA
    ac69d77 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:google/android-fhir into ek/item-… 

    …image-support
    @FikriMilano
    FikriMilano committed Sep 21, 2022
    Configuration menu
    Copy the full SHA
    58c7f39 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2022

  1. Merge branch 'master' into ek/item-image-support

    @ndegwamartin
    ndegwamartin authored Sep 26, 2022
    Configuration menu
    Copy the full SHA
    5265207 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2022

  1. Remove duplicate test

    @FikriMilano
    FikriMilano committed Sep 29, 2022
    Configuration menu
    Copy the full SHA
    a86ffae View commit details
    Browse the repository at this point in the history

  2. Rename test class

    @FikriMilano
    FikriMilano committed Sep 29, 2022
    Configuration menu
    Copy the full SHA
    2f8814e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:google/android-fhir into ek/item-… 

    …image-support
    @FikriMilano
    FikriMilano committed Sep 29, 2022
    Configuration menu
    Copy the full SHA
    67f5412 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2022

  1. Merge branch 'master' of github.com:google/android-fhir into ek/item-… 

    …image-support
    @FikriMilano
    FikriMilano committed Sep 30, 2022
    Configuration menu
    Copy the full SHA
    84f34f4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'ek/item-image-support' of github.com:opensrp/android-fh… 

    …ir into ek/item-image-support
    @FikriMilano
    FikriMilano committed Sep 30, 2022
    Configuration menu
    Copy the full SHA
    b62aabe View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2022

  1. Catch exception in flow 

    Signed-off-by: Elly Kitoto <[email protected]>
    @ellykits
    ellykits committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    2e9c0de View commit details
    Browse the repository at this point in the history

  2. Fix flow exception violation issue 

    Signed-off-by: Elly Kitoto <[email protected]>
    @ellykits
    ellykits committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    f9545f7 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2022

  1. Merge branch '971_calc_exp' into merge_prs_for_releases

    @dubdabasoduba
    dubdabasoduba committed Oct 9, 2022
    Configuration menu
    Copy the full SHA
    42fd2fc View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/fix-sync-state-exception-handlin… 

    …g' into merge_prs_for_releases
    @dubdabasoduba
    dubdabasoduba committed Oct 9, 2022
    Configuration menu
    Copy the full SHA
    3e8bf1d View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/ek/item-image-support' into merg… 

    …e_prs_for_releases
    @dubdabasoduba
    dubdabasoduba committed Oct 9, 2022
    Configuration menu
    Copy the full SHA
    2c621d3 View commit details
    Browse the repository at this point in the history