Custom fields for users - re-targeted against v8#16100
Draft
uberbrady wants to merge 2506 commits intogrokability:v8from
Draft
Custom fields for users - re-targeted against v8#16100uberbrady wants to merge 2506 commits intogrokability:v8from
uberbrady wants to merge 2506 commits intogrokability:v8from
Conversation
PR Summary
|
Signed-off-by: snipe <snipe@snipe.net>
…-asset-model-images-not-loading Fixed grokability#17547: asset model images not loading
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
…-use-numeric-for-purchase-cost Fixed grokability#17490: use numeric for purchase cost
…-add-ldap-sync-via-api Adds grokability#13997 - API endpoint to sync users via LDAP
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
…ds-paths-to-base-controller Move the object type mapping and such to the base controller to de-dupe
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
…vements Mail log for grokability#17491 and some improvements on log errors
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
…-#17565-standard-layout Show all icons on location table, even if no results
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
…-add-withtrashed-to-files Fixed grokability#17780 - Added `withTrashed()` to allow viewing files on deleted objects
…-remember-checkout-to-type Fixed grokability#10107 - remember checkout to type
Signed-off-by: snipe <snipe@snipe.net>
…n-location-print Fixed company name reference in location print
…string-in-notifications Fixes grokability#17759 translation used in asset check in/out notifications
…instead-of-soft-deleting-the-log-itself Fixed grokability#17777 - Log upload deletion
Signed-off-by: snipe <snipe@snipe.net>
…al-to-models Adds require serial as Asset Model option
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
…-larger-currency-field Fixed grokability#17791 - increase size of purchase cost field
Signed-off-by: snipe <snipe@snipe.net>
…-adds-require-serial-to-importer Fixed grokability#17798 - added `require_serial` to model importer
Member
|
@uberbrady I know you have a lot on your plate right now, but can you look into those failing tests and the conflict? I'd still love to ship this at some point. |
# Conflicts: # app/Models/License.php # resources/views/licenses/view.blade.php # tests/Feature/Checkins/Api/LicenseCheckInTest.php
…on-logs Upload log file in GitHub Action tests
…signable_license Allows check-ins of unreassignable licenses
This file contains hidden or 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
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.
This is similar to #13715 - just re-based against the new v8 branch.
This PR has been rebased many, many, many times - so I would expect that it might have acquired some bit-rot during the process.