Update main from develop #742
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…-back-to-centre Change back to just centre
* 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>
* feat: added first draft of arc:mvl:cat - untested. * chore: added some comments * chore: added some comments
* 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')
* feat: added ui for log downloads by f-year * feat: Encrypts and Decrypts MVL files. * chore: removed and improved some comments
* 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>
* docs: added diags for erd and server layout * docs: added server descriptions * docs: updated docs on server set up
Updated to include more of the images.
* feat: adds voucher state history to voucher deep exports * fix: don't override base model function you muppet * fix: removed unneeded (and mispelled) function
* feat: added commit lint * fix: added postinstall
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>
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>
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>
lauragurney
approved these changes
Feb 26, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.