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

Update main from develop #742

Merged
merged 42 commits into from
Feb 27, 2024
Merged

Update main from develop #742

merged 42 commits into from
Feb 27, 2024

Commits on Oct 20, 2023

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

Commits on Oct 26, 2023

  1. Merge pull request #715 from neontribe/bug-change-distributing-centre…

    …-back-to-centre
    
    Change back to just centre
    lauragurney authored Oct 26, 2023
    Configuration menu
    Copy the full SHA
    ab51d18 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2023

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

Commits on Oct 30, 2023

  1. Configuration menu
    Copy the full SHA
    6fb3fca View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    67cb796 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7e390ef View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    988a1a7 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    637f8f6 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    f79ef38 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    7122480 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    5d21583 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2023

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

Commits on Nov 20, 2023

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

Commits on Nov 21, 2023

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

Commits on Nov 24, 2023

  1. Dev/large file encryption (#725)

    * feat: added ui for log downloads by f-year
    
    * feat: Encrypts and Decrypts MVL files.
    
    * chore: removed and improved some comments
    
    * chore: added amnual trigger for workflow
    
    ---------
    
    Co-authored-by: Tobias Batch <tobias@neontribe.co.uk>
    gxnda and tobybatch authored Nov 24, 2023
    Configuration menu
    Copy the full SHA
    3086408 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ebcecf4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0f30402 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    1126a49 View commit details
    Browse the repository at this point in the history
  5. Added command line file decryption and echo (#726)

    * feat: added first draft of arc:mvl:cat - untested.
    
    * chore: added some comments
    
    * chore: added some comments
    gxnda authored Nov 24, 2023
    Configuration menu
    Copy the full SHA
    1606003 View commit details
    Browse the repository at this point in the history
  6. Write encrypted logs to file rather than database (#727)

    * feat: added ui for log downloads by f-year
    
    * feat: Encrypts and Decrypts MVL files.
    
    * chore: removed and improved some comments
    
    * feat: Logs now export as encrypted CSV files, instead of to a database.
    
    * chore: Added more comments.
    
    * chore: Removed unused imports.
    
    * BREAKING CHANGE: Encrypted market logs are now saved as '.arcx.csv' (was '.csv')
    gxnda authored Nov 24, 2023
    Configuration menu
    Copy the full SHA
    7bcedc7 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2023

  1. chore: disabled workflow

    tobybatch committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    38e7ab9 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. fix: labels in the docker

    tobybatch committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    31c3a77 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

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

Commits on Dec 7, 2023

  1. Dev/large file encryption (#729)

    * feat: added ui for log downloads by f-year
    
    * feat: Encrypts and Decrypts MVL files.
    
    * chore: removed and improved some comments
    gxnda authored Dec 7, 2023
    Configuration menu
    Copy the full SHA
    71f66d6 View commit details
    Browse the repository at this point in the history
  2. feat: added ui for log downloads by f-year (#728)

    * feat: added ui for log downloads by f-year
    
    * fix: resolved conflicts on VoucherController.php
    
    * fix: linting
    
    ---------
    
    Co-authored-by: Tobias Batch <tobias@neontribe.co.uk>
    gxnda and tobybatch authored Dec 7, 2023
    Configuration menu
    Copy the full SHA
    731e789 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2023

  1. docs: added diags for erd and server layout (#731)

    * docs: added diags for erd and server layout
    
    * docs: added server descriptions
    
    * docs: updated docs on server set up
    tobybatch authored Dec 22, 2023
    Configuration menu
    Copy the full SHA
    b15f1d7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7ab2805 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #735 from neontribe/EXP-documentation

    Updated to include more of the images.
    charlesstrange2 authored Dec 22, 2023
    Configuration menu
    Copy the full SHA
    4109ff7 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2024

  1. feat: adds voucher state history to voucher deep exports (#736)

    * feat: adds voucher state history to voucher deep exports
    
    * fix: don't override base model function you muppet
    
    * fix: removed unneeded (and mispelled) function
    tobybatch authored Jan 4, 2024
    Configuration menu
    Copy the full SHA
    e17e99f View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2024

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

Commits on Jan 29, 2024

  1. Configuration menu
    Copy the full SHA
    9dcfcc3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e653d5c View commit details
    Browse the repository at this point in the history
  3. chore: post merge cleanup!

    tobybatch committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    716781d View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2024

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

Commits on Feb 13, 2024

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

Commits on Feb 14, 2024

  1. Configuration menu
    Copy the full SHA
    308a1c4 View commit details
    Browse the repository at this point in the history
  2. chore: docker instructions

    tobybatch committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    e853876 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    18c06fa View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2024

  1. Dev/add commitlint (#741)

    * feat: added commit lint
    
    * fix: added postinstall
    tobybatch authored Feb 26, 2024
    Configuration menu
    Copy the full SHA
    0291ae9 View commit details
    Browse the repository at this point in the history
  2. chore(deps): bump phpseclib/phpseclib from 3.0.20 to 3.0.36 (#744)

    Bumps [phpseclib/phpseclib](https://github.com/phpseclib/phpseclib) from 3.0.20 to 3.0.36.
    - [Release notes](https://github.com/phpseclib/phpseclib/releases)
    - [Changelog](https://github.com/phpseclib/phpseclib/blob/master/CHANGELOG.md)
    - [Commits](phpseclib/phpseclib@3.0.20...3.0.36)
    
    ---
    updated-dependencies:
    - dependency-name: phpseclib/phpseclib
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Feb 26, 2024
    Configuration menu
    Copy the full SHA
    0c21c80 View commit details
    Browse the repository at this point in the history
  3. chore(deps): bump follow-redirects from 1.15.2 to 1.15.5 (#745)

    Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.2 to 1.15.5.
    - [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
    - [Commits](follow-redirects/follow-redirects@v1.15.2...v1.15.5)
    
    ---
    updated-dependencies:
    - dependency-name: follow-redirects
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Feb 26, 2024
    Configuration menu
    Copy the full SHA
    d9702df View commit details
    Browse the repository at this point in the history
  4. chore(deps): bump phenx/php-svg-lib from 0.5.0 to 0.5.2 (#743)

    Bumps [phenx/php-svg-lib](https://github.com/PhenX/php-svg-lib) from 0.5.0 to 0.5.2.
    - [Release notes](https://github.com/PhenX/php-svg-lib/releases)
    - [Commits](dompdf/php-svg-lib@0.5.0...0.5.2)
    
    ---
    updated-dependencies:
    - dependency-name: phenx/php-svg-lib
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Feb 26, 2024
    Configuration menu
    Copy the full SHA
    0f0e8de View commit details
    Browse the repository at this point in the history