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

PSP-6948 : Create a disposition file #3631

Merged
merged 11 commits into from
Dec 8, 2023
Merged

PSP-6948 : Create a disposition file #3631

merged 11 commits into from
Dec 8, 2023

Commits on Dec 1, 2023

  1. PSP-6948 : Create a disposition file

    Eduardo Herrera authored and Eduardo Herrera committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    b8694e2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'disposition' into psp-6948 

    # Conflicts:
#	source/backend/entities/Partials/DispositionStatusTypeCode.cs
#	source/backend/tests/core/Entities/DispositionFileHelper.cs
    Eduardo Herrera authored and Eduardo Herrera committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    7032924 View commit details
    Browse the repository at this point in the history

  3. - merge fixes

    Eduardo Herrera authored and Eduardo Herrera committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    7cf21af View commit details
    Browse the repository at this point in the history

  4. - save properties to disposition

    Eduardo Herrera authored and Eduardo Herrera committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    f86a401 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. - Updates

    Eduardo Herrera authored and Eduardo Herrera committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    992c81e View commit details
    Browse the repository at this point in the history

  2. - udates

    Eduardo Herrera authored and Eduardo Herrera committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    6152fd4 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'disposition' into psp-6948 

    # Conflicts:
#	source/backend/api/Areas/Disposition/Controllers/DispositionFileController.cs
#	source/backend/api/Services/IDispositionFileService.cs
#	source/backend/dal/Repositories/DispositionFileRepository.cs
#	source/frontend/src/constants/API.ts
#	source/frontend/src/hooks/pims-api/useApiDispositionFile.ts
#	source/frontend/src/hooks/repositories/useDispositionProvider.ts
    Eduardo Herrera authored and Eduardo Herrera committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    681ed70 View commit details
    Browse the repository at this point in the history

  4. - test updates

    Eduardo Herrera authored and Eduardo Herrera committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    a2b3551 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. - property update fix

    Eduardo Herrera authored and Eduardo Herrera committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    bb06105 View commit details
    Browse the repository at this point in the history

  2. - UI review

    Eduardo Herrera authored and Eduardo Herrera committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    17b16e7 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2023

  1. Merge branch 'disposition' into psp-6948 

    # Conflicts:
#	source/backend/api/Areas/Disposition/Controllers/DispositionFileController.cs
#	source/backend/apimodels/Models/Concepts/DispositionFile/DispositionFileMap.cs
#	source/backend/dal/Exceptions/OverrideExceptions.cs
    Eduardo Herrera authored and Eduardo Herrera committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    ebb8561 View commit details
    Browse the repository at this point in the history