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

Replace Material UI components in src/Components/Shifting/ListFilter.tsx. Fixes #4996 #5572

Merged
merged 25 commits into from
Jun 21, 2023
Merged

Replace Material UI components in src/Components/Shifting/ListFilter.tsx. Fixes #4996 #5572

merged 25 commits into from
Jun 21, 2023

Commits on May 26, 2023

  1. Merge pull request #1 from coronasafe/develop 

    Update README.md (ohcnetwork#5532)
    @JahnabDutta
    JahnabDutta committed May 26, 2023
    Configuration menu
    Copy the full SHA
    96fcc41 View commit details
    Browse the repository at this point in the history

  2. Change MUI components to CARE components in ResultList.tsx

    @JahnabDutta
    JahnabDutta committed May 26, 2023
    Configuration menu
    Copy the full SHA
    c348b50 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2 from coronasafe/develop 

    fix consultation redirect (ohcnetwork#5535)
    @JahnabDutta
    JahnabDutta committed May 26, 2023
    Configuration menu
    Copy the full SHA
    b1fea78 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3 from coronasafe/develop 

    updation from main repo
    @JahnabDutta
    JahnabDutta committed May 26, 2023
    Configuration menu
    Copy the full SHA
    393e374 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2023

  1. Merge branch 'develop' into develop

    @khavinshankar
    khavinshankar committed May 30, 2023
    Configuration menu
    Copy the full SHA
    0657d09 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2023

  1. Merge branch 'coronasafe:develop' into develop

    @JahnabDutta
    JahnabDutta committed May 31, 2023
    Configuration menu
    Copy the full SHA
    5296973 View commit details
    Browse the repository at this point in the history

  2. replace MUI components in src/Components/Shifting/ListFilter.tsx

    @JahnabDutta
    JahnabDutta committed May 31, 2023
    Configuration menu
    Copy the full SHA
    a8eec96 View commit details
    Browse the repository at this point in the history

  3. change LegacySelectField to SelectFormField

    @JahnabDutta
    JahnabDutta committed May 31, 2023
    Configuration menu
    Copy the full SHA
    a4c0702 View commit details
    Browse the repository at this point in the history

  4. fix handChange issue

    @JahnabDutta
    JahnabDutta committed May 31, 2023
    Configuration menu
    Copy the full SHA
    8ab013c View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2023

  1. Merge branch 'develop' into develop

    @khavinshankar
    khavinshankar committed Jun 1, 2023
    Configuration menu
    Copy the full SHA
    b7c14e0 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2023

  1. Merge branch 'coronasafe:develop' into develop

    @JahnabDutta
    JahnabDutta committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    2cd2d15 View commit details
    Browse the repository at this point in the history

  2. fix shiftFilter issues

    @JahnabDutta
    JahnabDutta committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    2be8dc5 View commit details
    Browse the repository at this point in the history

  3. add cypress tests

    @JahnabDutta
    JahnabDutta committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    ecf8294 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2023

  1. Merge branch 'develop' into develop

    @nihal467
    nihal467 committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    f4016fd View commit details
    Browse the repository at this point in the history

  2. change DateRangePicker to DateRangeFormField and add cpyress tests

    @JahnabDutta
    JahnabDutta committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    7b53f44 View commit details
    Browse the repository at this point in the history

  3. Merge original repository to develop repository

    @JahnabDutta
    JahnabDutta committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    ffff958 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2023

  1. CareUI: Adds UserAutocompleteFormField and used it in Assigned To f… 

    …ield of Shifting Filter
    @rithviknishad
    rithviknishad committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    2e4a9c0 View commit details
    Browse the repository at this point in the history

  2. delete unused UserSelect2

    @rithviknishad
    rithviknishad committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    142f5ca View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2023

  1. Merge branch 'develop' into tailwind/userautocompleteformfield

    @nihal467
    nihal467 committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    eb3baaf View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2023

  1. Merge branch 'develop' into tailwind/userautocompleteformfield

    @nihal467
    nihal467 committed Jun 10, 2023
    Configuration menu
    Copy the full SHA
    b405d68 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2023

  1. Merge branch 'coronasafe:develop' into develop

    @JahnabDutta
    JahnabDutta committed Jun 11, 2023
    Configuration menu
    Copy the full SHA
    aa9b9df View commit details
    Browse the repository at this point in the history

  2. change UserSelect to UserAutoCompleteFormField in ListFilter.tsx and … 

    …write cypress tests
    @JahnabDutta
    JahnabDutta committed Jun 11, 2023
    Configuration menu
    Copy the full SHA
    2161dbf View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2023

  1. remove unnecessary grid around DateRangeFormField

    @JahnabDutta
    JahnabDutta committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    dc602d3 View commit details
    Browse the repository at this point in the history

  2. replace FieldLabel with SelectFormField label

    @JahnabDutta
    JahnabDutta committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    cc5342f View commit details
    Browse the repository at this point in the history

  3. resolve merge confilcts with ListFilter and cypress test

    @JahnabDutta
    JahnabDutta committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    65761b2 View commit details
    Browse the repository at this point in the history