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

feat: Loris configuration(M2-6644) #1927

Open
wants to merge 83 commits into
base: develop
Choose a base branch
from
Open

feat: Loris configuration(M2-6644) #1927

wants to merge 83 commits into from
+2,402 −1,331

Commits on Dec 5, 2023

  1. M2-4320: Loris integration

    @IhorNesterenko99
    IhorNesterenko99 committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    34c55a1 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2023

  1. Merge branch 'develop' into feature/M2-4320-loris-integration

    @IhorNesterenko99
    IhorNesterenko99 committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    12bc9ad View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2023

  1. M2-4320: Add LORIS integration

    @IhorNesterenko99
    IhorNesterenko99 committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    5ebf2d5 View commit details
    Browse the repository at this point in the history

  2. M2-4320: Add LORIS integration

    @IhorNesterenko99
    IhorNesterenko99 committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    192a6a1 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. M2-4320: Add LORIS integration

    @IhorNesterenko99
    IhorNesterenko99 committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    2672c19 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2023

  1. M2-4320: Add LORIS integration

    @IhorNesterenko99
    IhorNesterenko99 committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    f6ed0b3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into feature/M2-4320-loris-integration

    @IhorNesterenko99
    IhorNesterenko99 committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    ced6cb2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into feature/M2-4320-loris-integration

    @IhorNesterenko99
    IhorNesterenko99 committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    41fb9dd View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2023

  1. Merge branch 'develop' into feature/M2-4320-loris-integration

    @IhorNesterenko99
    IhorNesterenko99 committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    1853bc8 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2023

  1. M2-4320: LORIS integration

    @IhorNesterenko99
    IhorNesterenko99 committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    1845d62 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2024

  1. Merge branch 'develop' into feature/M2-4320-loris-integration 

    # Conflicts:
#	src/svgSprite.ts
    @IhorNesterenko99
    IhorNesterenko99 committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    d58498d View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2024

  1. Merge branch 'develop' into feature/M2-4320-loris-integration

    @IhorNesterenko99
    IhorNesterenko99 committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    110a97d View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2024

  1. Merge branch 'release/1.16.0' into feature/M2-4320-loris-integration 

    # Conflicts:
#	src/modules/Builder/features/BuilderAppletSettings/BuilderAppletSettings.utils.tsx
#	src/resources/app-en.json
#	src/resources/app-fr.json
#	src/shared/consts.tsx
#	src/shared/state/Applet/Applet.schema.ts
    @IhorNesterenko99
    IhorNesterenko99 committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    301663f View commit details
    Browse the repository at this point in the history

  2. M2-5690: LORIS integration: unit tests fixes (#1549)

    @IhorNesterenko99
    IhorNesterenko99 authored Mar 6, 2024
    Configuration menu
    Copy the full SHA
    b16c426 View commit details
    Browse the repository at this point in the history

  3. M2-4320: LORIS integration: unit tests fixes

    @IhorNesterenko99
    IhorNesterenko99 committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    04ee456 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2024

  1. Merge branch 'release/1.17.0' into feature/M2-4320-loris-integration 

    # Conflicts:
#	src/shared/features/AppletSettings/LiveResponseStreamingSetting/LiveResponseStreamingSetting.test.tsx
    @IhorNesterenko99
    IhorNesterenko99 committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    faee163 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2024

  1. Merge branch 'release/1.18.0' into feature/M2-4320-loris-integration

    @IhorNesterenko99
    IhorNesterenko99 committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    8bccd08 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. Merge branch 'release/1.19.0' into feature/M2-4320-loris-integration

    @IhorNesterenko99
    IhorNesterenko99 committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    2259f38 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2024

  1. Merge branch 'release/1.20.0' into feature/M2-4320-loris-integration

    @IhorNesterenko99
    IhorNesterenko99 committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    fda084b View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. Merge branch 'release/1.21.0' into feature/M2-4320-loris-integration

    @IhorNesterenko99
    IhorNesterenko99 committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    2825775 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. Merge branch 'release/1.23.0' into feature/M2-4320-loris-integration 

    # Conflicts:
#	src/modules/Builder/api/api.ts
    @IhorNesterenko99
    IhorNesterenko99 committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    f825218 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. Merge branch 'release/1.25.0' into feature/M2-4320-loris-integration 

    # Conflicts:
#	src/shared/consts.tsx
    @IhorNesterenko99
    IhorNesterenko99 committed May 9, 2024
    Configuration menu
    Copy the full SHA
    7417930 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2024

  1. Merge branch 'release/1.26.0' into feature/M2-4320-loris-integration

    @IhorNesterenko99
    IhorNesterenko99 committed May 17, 2024
    Configuration menu
    Copy the full SHA
    b629d47 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2024

  1. Merge branch 'develop' into feature/M2-4320-loris-integration 

    # Conflicts:
#	src/modules/Builder/features/BuilderAppletSettings/BuilderAppletSettings.tsx
#	src/modules/Builder/features/BuilderAppletSettings/BuilderAppletSettings.types.ts
#	src/modules/Builder/features/BuilderAppletSettings/BuilderAppletSettings.utils.tsx
#	src/modules/Builder/pages/BuilderApplet/BuilderApplet.utils.tsx
    @IhorNesterenko99
    IhorNesterenko99 committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    2810dbc View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. feat: Loris - Visits assignment (M2-6868) (#1794)

    @nmialik
    nmialik authored Jun 21, 2024
    Configuration menu
    Copy the full SHA
    1f3966d View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2024

  1. feat: comment loris visits (M2-4320)

    @nmialik
    nmialik committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    c2e78b3 View commit details
    Browse the repository at this point in the history

  2. feat: comment loris visits (M2-4320)

    @nmialik
    nmialik committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    45b7669 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. feat: Visits assignment in ML (M2-6868)

    @nmialik
    nmialik committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    426c9bb View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2024

  1. feat: Visits assignment in ML (M2-6868)

    @nmialik
    nmialik committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    59a4ba3 View commit details
    Browse the repository at this point in the history

  2. feat: Visits assignment in ML, fix api call (M2-6868)

    @nmialik
    nmialik committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    2842ec6 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. fix: The 'Loris integration' configuration is available in the Applet… 

    … settings when feature flag is ON and integration:null (M2-7212)
    @nmialik
    nmialik committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    d3c372f View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2024

  1. feat: Error handling - when clicking 'upload data to loris' button. (M… 

    …2-7194)
    @nmialik
    nmialik committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    7925625 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/develop' into feature/M2-4320-lo… 

    …ris-integration
    @nmialik
    nmialik committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    2adec9c View commit details
    Browse the repository at this point in the history

  3. feat: Error handling - when clicking 'upload data to loris' button. (M… 

    …2-7194)
    @nmialik
    nmialik committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    51b61b1 View commit details
    Browse the repository at this point in the history

  4. fix: unit test (M2-7194)

    @nmialik
    nmialik committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    cd656d4 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2024

  1. fix: alert message color (M2-7194)

    @nmialik
    nmialik committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    c207f2c View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2024

  1. feat: Admin - Select the data to upload (M2-6929)

    @nmialik
    nmialik committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    3b91f9c View commit details
    Browse the repository at this point in the history

  2. fix: unit tests (M2-6929)

    @nmialik
    nmialik committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    86a52f2 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/develop' into feature/M2-4320-lo… 

    …ris-integration
    @nmialik
    nmialik committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    1392ad5 View commit details
    Browse the repository at this point in the history

  4. fix: styles (M2-6929)

    @nmialik
    nmialik committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    e54a680 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. fix: select disable styles (M2-6929)

    @nmialik
    nmialik committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    4ce7bfa View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. fix: The uploaded response is displayed in the 'Upload public data in… 

    …to LORIS' pop-up (M2-7249)
    @nmialik
    nmialik committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    ee4620a View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. fix: launch darkly integration (M2-4320)

    @nmialik
    nmialik committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    0d83b9e View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2024

  1. feat: Upload public data into LORIS: no new data (M2-7309)

    @nmialik
    nmialik committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    0398ec3 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/develop' into feature/M2-4320-lo… 

    …ris-integration
    @nmialik
    nmialik committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    f38c69f View commit details
    Browse the repository at this point in the history

  3. fix: SelectController - customChange fixes (M2-4320)

    @nmialik
    nmialik committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    1fca636 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2024

  1. tests: Loris Integration - Unit tests (M2-7293)

    @nmialik
    nmialik committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    2dfb719 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. feat: Loris Configuration (M2-6644)

    @nmialik
    nmialik committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    ae13d15 View commit details
    Browse the repository at this point in the history

  2. feat: Select All (M2-6644)

    @nmialik
    nmialik committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    b9bb674 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. tests: unit tests (M2-6644)

    @nmialik
    nmialik committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    0b2ceb3 View commit details
    Browse the repository at this point in the history

  2. fix: response data structure (M2-7316)

    @nmialik
    nmialik committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    cfb8f56 View commit details
    Browse the repository at this point in the history

  3. fix: response data structure (M2-7316)

    @nmialik
    nmialik committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    f64f9f4 View commit details
    Browse the repository at this point in the history

  4. fix: error message (M2-7316)

    @nmialik
    nmialik committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    f4af6ed View commit details
    Browse the repository at this point in the history

  5. fix: types, refactor filteredData (M2-7316)

    @nmialik
    nmialik committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    d4573d7 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2024

  1. fix: types, refactor filteredData (M2-7316)

    @nmialik
    nmialik committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    8989060 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2024

  1. Merge remote-tracking branch 'origin/feature/M2-4320-loris-integration'… 

    … into feature/M2-6644--loris-configuration
    @nmialik
    nmialik committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    825f3b6 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2024

  1. feat: Loris Configuration (M2-6644)

    @nmialik
    nmialik committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    5cb1617 View commit details
    Browse the repository at this point in the history

  2. tests: fix unit tests (M2-6644)

    @nmialik
    nmialik committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    d82b7c1 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2024

  1. tests: Unit tests (M2-6644)

    @nmialik
    nmialik committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    ff7a394 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2024

  1. Merge remote-tracking branch 'origin/develop' into feature/M2-4320-lo… 

    …ris-integration
    @nmialik
    nmialik committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    ad5ba74 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/feature/M2-4320-loris-integration'… 

    … into feature/M2-6644--loris-configuration
    @nmialik
    nmialik committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    48e3c97 View commit details
    Browse the repository at this point in the history

  3. tests: UploadPopup.utils (M2-6644)

    @nmialik
    nmialik committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    f7f64f5 View commit details
    Browse the repository at this point in the history

  4. tests: UploadPopup component (M2-6644)

    @nmialik
    nmialik committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    86491b0 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2024

  1. Merge branch 'develop' into feature/M2-4320-loris-integration 

    # Conflicts:
#	src/modules/Dashboard/api/api.ts
#	src/modules/Dashboard/api/api.types.ts
#	src/shared/components/FormComponents/SelectController/SelectController.tsx
#	src/shared/components/FormComponents/SelectController/SelectController.types.ts
#	src/shared/components/Table/Table.tsx
#	src/shared/state/Applet/Applet.schema.ts
#	src/shared/state/Workspaces/Workspaces.schema.ts
#	src/shared/types/featureFlags.ts
    @IhorNesterenko99
    IhorNesterenko99 committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    890577a View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2024

  1. Merge branch 'develop' into feature/M2-4320-loris-integration 

    # Conflicts:
#	src/modules/Auth/state/Auth.thunk.ts
#	src/modules/Builder/features/BuilderAppletSettings/BuilderAppletSettings.tsx
#	src/shared/layouts/BaseLayout/components/LeftBar/LeftBar.tsx
#	src/shared/layouts/BaseLayout/components/LeftBar/LeftBar.utils.ts
#	src/shared/utils/featureFlags.ts
    @IhorNesterenko99
    IhorNesterenko99 committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    f75e959 View commit details
    Browse the repository at this point in the history

  2. chore: update Loris branch with the latest dev (M2-430)

    @IhorNesterenko99
    IhorNesterenko99 committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    9c58040 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2024

  1. Merge pull request #1919 from ChildMindInstitute/release/1.38.0 

    Release/1.38.0
    @mbanting
    mbanting authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    9f9a573 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. Merge pull request #1923 from ChildMindInstitute/release/1.39.0 

    Release/1.39.0
    @ChaconC
    ChaconC authored Sep 18, 2024
    Configuration menu
    Copy the full SHA
    9ab855b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/M2-4320-loris-integration' into feature/M2-6644… 

    …--loris-configuration
    @ramirlm
    ramirlm authored Sep 18, 2024
    Configuration menu
    Copy the full SHA
    09d9b88 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. fix: svgsprite error fix

    Ramir Mesquita committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    6d205ee View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2024

  1. merge branch develop into feature/M2-6644--loris-configuration

    Ramir Mesquita committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    4a06096 View commit details
    Browse the repository at this point in the history

  2. fixing loris integration settings import

    Ramir Mesquita committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    ecbebee View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. Merge pull request #1929 from ChildMindInstitute/release/1.40.0 

    Release/1.40.0
    @mbanting
    mbanting authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    668abf5 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. Merge pull request #1931 from ChildMindInstitute/release/1.41.0 

    Release/1.41.0
    @ChaconC
    ChaconC authored Oct 2, 2024
    Configuration menu
    Copy the full SHA
    a1f920f View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. [M2-6644] Loris connect endpoint on backend, adjustments and banners

    Ramir Mesquita committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    6a5da95 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin' into feature/M2-6644--loris-con… 

    …figuration
    Ramir Mesquita committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    2cc1acb View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into feature/M2-6644--loris-configuration

    Ramir Mesquita committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    2fc0a6f View commit details
    Browse the repository at this point in the history

  4. fix: loris upload endpoint update

    Ramir Mesquita committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    ca2d0e7 View commit details
    Browse the repository at this point in the history

  5. fix: fixing parameter for upload

    Ramir Mesquita committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    422f4ec View commit details
    Browse the repository at this point in the history

  6. fix: fixing upload endpoint typo

    Ramir Mesquita committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    467a394 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2024

  1. chore: [loris] improves api method signatures and functions to keep s… 

    …tandards, method naming refactoring, types, bug fixes and other minor tweaks
    Ramir Mesquita committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    96dc166 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2024

  1. fix: removing legacy logic from loris

    Ramir Mesquita committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    7c5ea43 View commit details
    Browse the repository at this point in the history

  2. fix: better reflecting be endpoints for loris and other tweaks and re… 

    …factoring for addressing pr comments
    Ramir Mesquita committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    dd37588 View commit details
    Browse the repository at this point in the history