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.

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

feat: [DHIS2-17655] Two event workspace #3726

Merged
merged 22 commits into from
Aug 14, 2024

Commits on Jun 17, 2024

  1. Configuration menu
    Copy the full SHA
    e03ea54 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2024

  1. Merge remote-tracking branch 'origin/master' into eh/feat/DHIS2-17591…

    …-plugins-in-event-programs
    
    # Conflicts:
    #	src/core_modules/capture-core/components/Pages/ViewEvent/EventDetailsSection/EventDetailsSection.component.js
    eirikhaugstulen committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    1b23658 View commit details
    Browse the repository at this point in the history
  2. chore: flow

    eirikhaugstulen committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    5b5497b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2504789 View commit details
    Browse the repository at this point in the history
  4. chore: flow

    eirikhaugstulen committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    e599d05 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2024

  1. fix: option set logic

    eirikhaugstulen committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    5e96878 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2024

  1. fix: review

    eirikhaugstulen committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    1cb4612 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2024

  1. Configuration menu
    Copy the full SHA
    c9aab55 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'refs/remotes/origin/master' into eh/fea…

    …t/DHIS2-17591-plugins-in-event-programs
    
    # Conflicts:
    #	i18n/en.pot
    eirikhaugstulen committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    5dd3ac6 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2024

  1. chore: temp

    eirikhaugstulen committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    0c446d1 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'refs/remotes/origin/master' into eh/fea…

    …t/DHIS2-17655-two-event-workspace
    eirikhaugstulen committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    ff6e800 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. Merge remote-tracking branch 'refs/remotes/origin/master' into eh/fea…

    …t/DHIS2-17655-two-event-workspace
    eirikhaugstulen committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    0ed89ce View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. fix: temp

    eirikhaugstulen committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    b44e501 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2024

  1. Merge remote-tracking branch 'refs/remotes/origin/master' into eh/fea…

    …t/DHIS2-17655-two-event-workspace
    eirikhaugstulen committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    4e41c05 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. Configuration menu
    Copy the full SHA
    a0e58b8 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'refs/remotes/origin/master' into eh/fea…

    …t/DHIS2-17655-two-event-workspace
    
    # Conflicts:
    #	i18n/en.pot
    #	src/core_modules/capture-core/components/Pages/EnrollmentEditEvent/PageLayout/DefaultPageLayout.constants.js
    #	src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/EnrollmentPageLayout/DefaultEnrollmentLayout.types.js
    eirikhaugstulen committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    6a8e097 View commit details
    Browse the repository at this point in the history
  3. feat: lint

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

Commits on Jul 31, 2024

  1. Merge remote-tracking branch 'refs/remotes/origin/master' into eh/fea…

    …t/DHIS2-17655-two-event-workspace
    eirikhaugstulen committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    5561bd5 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2024

  1. feat: add subvalues

    eirikhaugstulen committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    aea077f View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'refs/remotes/origin/master' into eh/fea…

    …t/DHIS2-17655-two-event-workspace
    
    # Conflicts:
    #	i18n/en.pot
    #	src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/index.js
    #	src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm/index.js
    #	src/core_modules/capture-core/components/Pages/common/WidgetEventEditWrapper/WidgetEventEditWrapper.js
    eirikhaugstulen committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    ffcf09d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    97d11ba View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2024

  1. Configuration menu
    Copy the full SHA
    656b471 View commit details
    Browse the repository at this point in the history