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

ReportEdit #527

Open
wants to merge 18 commits into
base: dev-mvvm-primary
Choose a base branch
from
Open

ReportEdit #527

wants to merge 18 commits into from

Commits on Dec 28, 2022

  1. complete ReportEdit screen with jetpack compose and react

    @ParimSsme
    ParimSsme committed Dec 28, 2022
    Configuration menu
    Copy the full SHA
    6c375df View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2022

  1. work in progress on ReportEdit screen with jetpack compose and react

    @ParimSsme
    ParimSsme committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    6d6801b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev-mvvm-primary' of https://github.com/UstadMobile/Ust… 

    …adMobile into dev-mvvm-reportEdit1

� Conflicts:
�	app-react/src/main/kotlin/com/ustadmobile/hooks/useUstadScreens.kt
    @ParimSsme
    ParimSsme committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    9af2695 View commit details
    Browse the repository at this point in the history

  3. work in progress on ReportEdit screen with jetpack compose and react

    @ParimSsme
    ParimSsme committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    33c6cc2 View commit details
    Browse the repository at this point in the history

Commits on Jan 1, 2023

  1. make changes from pull request comments

    @ParimSsme
    ParimSsme committed Jan 1, 2023
    Configuration menu
    Copy the full SHA
    d70ed30 View commit details
    Browse the repository at this point in the history

  2. fix(ReportEditFragment.kt): fix design problems

    @ParimSsme
    ParimSsme committed Jan 1, 2023
    Configuration menu
    Copy the full SHA
    95b7284 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2023

  1. Merge branch 'dev-mvvm-primary' into dev-mvvm-reportEdit1 

    # Conflicts:
#	app-react/src/main/kotlin/com/ustadmobile/hooks/useUstadScreens.kt
    @mikedawson
    mikedawson committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    73fdb7c View commit details
    Browse the repository at this point in the history

  2. Minor updates for handling ReportEdit padding on Android.

    @mikedawson
    mikedawson committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    6b8e84f View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2023

  1. make changes from pull request comments

    @ParimSsme
    ParimSsme committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    ff43e32 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev-mvvm-primary' of https://github.com/UstadMobile/Ust… 

    …adMobile into dev-mvvm-reportEdit1

� Conflicts:
�	app-react/src/main/kotlin/com/ustadmobile/hooks/useUstadScreens.kt
    @ParimSsme
    ParimSsme committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    d8d110e View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2023

  1. Merge branch 'dev-mvvm-primary' of https://github.com/UstadMobile/Ust… 

    …adMobile into dev-mvvm-reportEdit1

� Conflicts:
�	app-react/src/main/kotlin/com/ustadmobile/hooks/useUstadScreens.kt
    @ParimSsme
    ParimSsme committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    e76bdb6 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2023

  1. UstadListFilterChipsHeader.kt: remove duplicate modifier

    @ParimSsme
    ParimSsme committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    fb4a579 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2023

  1. ReportEditFragment.kt: use builtin textField instead UstadTextEditField

    @ParimSsme
    ParimSsme committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    72228e2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev-mvvm-primary' of https://github.com/UstadMobile/Ust… 

    …adMobile into dev-mvvm-reportEdit1

� Conflicts:
�	app-react/src/main/kotlin/com/ustadmobile/hooks/useUstadScreens.kt
    @ParimSsme
    ParimSsme committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    3485395 View commit details
    Browse the repository at this point in the history

  3. merge dev-mvvm-primary

    @ParimSsme
    ParimSsme committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    49155a4 View commit details
    Browse the repository at this point in the history

  4. ReportEditFragment.kt: use builtin textField instead UstadTextEditField

    @ParimSsme
    ParimSsme committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    0386042 View commit details
    Browse the repository at this point in the history

  5. ReportEditFragment.kt: use builtin textField instead UstadTextEditField

    @ParimSsme
    ParimSsme committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    c51a0f5 View commit details
    Browse the repository at this point in the history

  6. ClazzAssignmentEditFragment.kt: use courseTerminology

    @ParimSsme
    ParimSsme committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    222e57b View commit details
    Browse the repository at this point in the history