Merge snipeit 2023 09 26 #24
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
Signed-off-by: snipe <[email protected]>
Signed-off-by: snipe <[email protected]>
Signed-off-by: snipe <[email protected]>
Signed-off-by: snipe <[email protected]>
Signed-off-by: snipe <[email protected]>
Signed-off-by: snipe <[email protected]>
Signed-off-by: snipe <[email protected]>
Signed-off-by: snipe <[email protected]>
Signed-off-by: snipe <[email protected]>
Signed-off-by: snipe <[email protected]>
…ng-on-74 Fixed passing invalid argument to `strpos()`
# Conflicts: # composer.lock
Bumped dependencies
Added better handling of information of asset history
…elds Bulk Editing Custom Fields
…d_issue Fixed snipe#13317 Accessories declined by user remain assigned
Signed-off-by: snipe <[email protected]>
…rder Fixed snipe#13495 added setting for name order
Signed-off-by: snipe <[email protected]>
…ttings Small fixes to checkbox layout in general settings blade
…er_error Fixed Asset acceptance error when user company and asset company don't match
…o-autolabeler Added factories to autolabeler action
Adds tag for docker builds
Signed-off-by: snipe <[email protected]>
Signed-off-by: snipe <[email protected]>
Signed-off-by: snipe <[email protected]>
Localization/new translations
Signed-off-by: snipe <[email protected]>
Signed-off-by: snipe <[email protected]> # Conflicts: # config/version.php
Signed-off-by: snipe <[email protected]>
Signed-off-by: snipe <[email protected]>
Features/more info in settings
Signed-off-by: snipe <[email protected]>
Signed-off-by: snipe <[email protected]>
Fixed bug where checkout to location would throw an error if FMCS was enabled
Fixed exception being thrown when selected import was deleted
Signed-off-by: snipe <[email protected]>
…_temp Commented out sortable columns
…_Snipeit_2023-09-26 Signed-off-by: Darth Killian <[email protected]>
Signed-off-by: Darth Killian <[email protected]>
Signed-off-by: Darth Killian <[email protected]>
Signed-off-by: Darth Killian <[email protected]>
Reset checkout controller to what I know works until I can find a nice way to merge changes from snipe it Signed-off-by: Darth Killian <[email protected]>
Signed-off-by: Darth Killian <[email protected]>
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.
Merge snipeit to ETI-Assets