DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-16 18:44:10 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
15693 commits 96 branches 267 tags 296 MiB
Commit graph

1316 commits

Author SHA1 Message Date
Marcus Moore d10fe77ee7
Merge branch 'develop' into fixes/get-id-for-current-user 2024-10-22 09:38:31 -07:00
Marcus Moore 979e4502ff
Have getIdForCurrentUser method return null if FMCS enabled, user is not super admin, and does not have company 2024-10-17 15:14:39 -07:00
Tobias Regnery f50ccbcc49 Fix outdated comment in CompanyableTrait 
As of commit 5800e8d the user model uses CompanyableTrait so remove this clearly outdated comment
 2024-10-17 11:07:28 +02:00
snipe d0d4159088 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-15 12:42:09 +01:00
snipe de62359c67
Merge pull request #15533 from marcusmoore/testing/fmcs-accessories 
Added tests for accessory api controller
 2024-10-11 11:29:34 +01:00
snipe b054017c9f Fixed #15651 - admin user now displaying on maintenances page 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-11 11:16:24 +01:00
snipe aa55fa6ff4 Switch to form requests for settings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 18:16:34 +01:00
Marcus Moore e213053775
Swap factory syntax 2024-10-03 13:59:58 -07:00
Marcus Moore 32551d55d7
Merge pull request #15579 from bryanlopezinc/ImportTests 
Add Import data tests
 2024-10-03 11:39:21 -07:00
snipe cae8aa7840 Added maxlengths to additional fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-01 14:02:54 +01:00
Marcus Moore fdfea390fb
Merge branch 'develop' into testing/fmcs-accessories 2024-09-30 12:59:27 -07:00
bryanlopezinc e807cfab86 Merge branch 'develop' into importTests 2024-09-30 12:47:52 +01:00
bryanlopezinc 0b3f458561 Added tests for Import feature 2024-09-30 12:42:41 +01:00
snipe ba69259f2d Fixed #13396 - do not allow checkout to undeployable status types 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-24 15:35:00 +01:00
snipe b84a634ec7 Corrected comment 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-20 14:33:35 +01:00
snipe 2fc88a0e08 Eager load adminuser 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-20 14:33:26 +01:00
snipe b21c303e56 Merge remote-tracking branch 'origin/develop' into features/add_created_at_created_by 2024-09-20 13:43:50 +01:00
Marcus Moore d609ed50a4
Merge branch 'develop' into testing/fmcs-accessories 2024-09-19 13:20:55 -07:00
snipe b88f2054dd Refactor isDeletable on companies 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 20:38:34 +01:00
snipe d7bde37842
Merge pull request #15507 from setpill/setpill/feat/use_explicit_attributes_in_ldap_sync 
Added #15506: Explicitly request used LDAP attributes
 2024-09-19 20:33:10 +01:00
snipe 74088ea581 Optimize isDeletable counts 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 20:13:38 +01:00
snipe 727806372c Added created_by to status label 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 18:22:11 +01:00
snipe 5e1c736d49 Added created_by for manufacturers 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 18:04:50 +01:00
snipe 6579fa72da Added scoping for categories and companies 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 17:56:05 +01:00
snipe 82d6e1510f Order by created_by for depreciations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 17:41:05 +01:00
snipe 822ea96dfd Use auth()->id() instead of Auth::id() 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 17:31:46 +01:00
snipe bbce7b40ca Additional consistencies 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 17:20:56 +01:00
snipe 02a29c71ef Added created_by 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 17:01:48 +01:00
snipe 6699995972 Added created_by to components 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 17:01:36 +01:00
snipe 951f03094a Added created_by to kits 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 17:01:17 +01:00
snipe 354b00ef15 Made method name consistent 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 16:45:51 +01:00
snipe c93229179b Added order by created_by to accessories 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 16:45:39 +01:00
snipe a77a7065d7 Added order by admin to assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 16:34:10 +01:00
snipe 9adb2c24f3 Squashed commit of the following: 
commit dddbf27d78
Author: snipe <snipe@snipe.net>
Date:   Wed Sep 18 14:18:52 2024 +0100

    Updated language strings

    Signed-off-by: snipe <snipe@snipe.net>

commit fcefcc8184
Merge: 04bb3eec8 3519a82dd
Author: snipe <snipe@snipe.net>
Date:   Wed Sep 18 13:44:44 2024 +0100

    Merge pull request #15512 from marcusmoore/testing/fmcs

    Added tests for delete methods in api

commit 04bb3eec83
Merge: 154d5d8d9 f963b9a19
Author: snipe <snipe@snipe.net>
Date:   Wed Sep 18 13:41:37 2024 +0100

    Merge pull request #15521 from uberbrady/improve_country_selector

    Fix selected-index of Countries drop-down [fd-44144]

commit f963b9a19f
Author: Brady Wetherington <bwetherington@grokability.com>
Date:   Wed Sep 18 13:24:26 2024 +0100

    Fix selected-index of Countries drop-down

commit 154d5d8d91
Merge: 6c996b775 9e5f6d656
Author: snipe <snipe@snipe.net>
Date:   Tue Sep 17 23:40:25 2024 +0100

    Merge pull request #15491 from uberbrady/numeric_prefixes_add_multiple_assets

    [Fixes fd-43940] Improve multi-asset create when using numeric prefixes to asset_tags

commit 3519a82ddd
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 16:55:20 2024 -0700

    Fix name: TestsFullMultipleCompaniesSupport

commit a629df07bf
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 14:49:08 2024 -0700

    Implement interfaces on existing test classes

commit 9a13fcab23
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 14:38:38 2024 -0700

    Pluralize

commit f5705a1dde
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 14:34:55 2024 -0700

    More unification

commit f325c4afdb
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 14:32:38 2024 -0700

    Unify assertion method

commit 1fddacd7d0
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 14:25:11 2024 -0700

    Re-order test methods

commit 4af893df61
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 14:20:24 2024 -0700

    Improve assertions

commit b8b3f91ce4
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 13:55:18 2024 -0700

    Formatting

commit 7f40f55343
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 13:52:02 2024 -0700

    Add tests for delete supplier endpoint

commit b06e8d442d
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 13:37:08 2024 -0700

    Add tests for delete status label endpoint

commit c269184c60
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 13:29:41 2024 -0700

    Add tests for delete predefined kit endpoint

commit 53c673dee2
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 13:13:12 2024 -0700

    Add tests for delete manufacturer endpoint

commit 50730fc4fb
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 12:37:18 2024 -0700

    Add tests for delete location endpoint

commit 60a54cee79
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 12:33:30 2024 -0700

    Add tests for delete license endpoint

commit 446e962a50
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 10:38:51 2024 -0700

    Add tests for delete group endpoint

commit 79a4bb7316
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 10:35:44 2024 -0700

    Add tests for delete depreciation endpoint

commit 2f76c1bc5b
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 10:33:21 2024 -0700

    Add assertion

commit 38b9f4a438
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 10:29:20 2024 -0700

    Add tests for delete departments endpoint

commit 3105f53aff
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Thu Sep 12 16:54:29 2024 -0700

    Add tests for delete custom fieldsets endpoint

commit 2047cfed09
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Thu Sep 12 16:20:32 2024 -0700

    Add tests for delete custom fields endpoint

commit e3268d32df
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Thu Sep 12 16:00:02 2024 -0700

    Add tests for delete consumable endpoint

commit 6df8b0ac0e
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Thu Sep 12 15:52:07 2024 -0700

    Add tests for delete component endpoint

commit 910f13c1f7
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Thu Sep 12 15:38:30 2024 -0700

    Add tests for delete companies endpoint

commit 8ce2512f55
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Thu Sep 12 13:54:44 2024 -0700

    Add tests for delete category endpoint

commit 0ec415d4d0
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Thu Sep 12 13:46:22 2024 -0700

    Clean up

commit 2044570e95
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Thu Sep 12 13:39:36 2024 -0700

    Add tests for delete asset model endpoint

commit b336c6273d
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Thu Sep 12 13:32:42 2024 -0700

    Pluralize test classes

commit 5299b3e9f0
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Thu Sep 12 13:29:44 2024 -0700

    Remove code handled by CompanyableChildTrait

commit 872b76b45f
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Thu Sep 12 13:29:10 2024 -0700

    Add tests for delete asset maintenance endpoint

commit 275cf4630e
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Thu Sep 12 13:16:37 2024 -0700

    Add tests for delete asset endpoint

commit 5c2660bd34
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Thu Sep 12 13:02:32 2024 -0700

    Introduce interface

commit c7ae9d9dfa
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Thu Sep 12 12:58:47 2024 -0700

    Add tests for delete accessory endpoint

commit 9e5f6d656a
Author: Brady Wetherington <bwetherington@grokability.com>
Date:   Wed Sep 11 15:45:01 2024 +0100

    Improve multi-asset create when using numeric prefixes to asset_tags

Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 16:06:36 +01:00
snipe 7650628d30 Removed free seat count from fillable 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 16:00:59 +01:00
Marcus Moore 9b293afaac
Remove more dead code 2024-09-18 11:28:29 -07:00
snipe 655abe8be5 Fixed requestable user_id 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-18 14:32:59 +01:00
snipe bae9982833 Updated request methods 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-18 14:18:14 +01:00
snipe fcefcc8184
Merge pull request #15512 from marcusmoore/testing/fmcs 
Added tests for delete methods in api
 2024-09-18 13:44:44 +01:00
snipe 1582d81e5b Change user_id to created_by 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-17 22:16:41 +01:00
Marcus Moore c269184c60
Add tests for delete predefined kit endpoint 2024-09-16 13:29:41 -07:00
snipe 4debaaea39 Fixed #15504 - allow nulling/not changing locale in user bulk edit 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-16 14:31:10 +01:00
setpill 4facc4007e feat: Explicitly request LDAP attributes during sync 2024-09-13 17:05:48 +02:00
snipe f6bf2d03c4
Merge pull request #15445 from Godmartinz/eula_confusion
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details 
Fixed priority for category eula vs default eula
 2024-09-10 11:04:58 +01:00
snipe 7d9a0eba04 Added ability to sort on qty and remaining for consumables 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-09 03:49:58 +01:00
Godfrey M cf07186ae8 gives priority to default eula being checked vs catregory eula 2024-09-03 12:23:23 -07:00
snipe 4e4930ba62 Check for array 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-29 21:01:48 +01:00
snipe e62a802926 Use whereIn instead of where = 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-29 17:51:44 +01:00
Brady Wetherington ec2ea955d8 Fix PATCH of purchase_cost for assets for comma as decimal separator 2024-08-29 12:35:14 +01:00
snipe 486cd8c8c9 Nicer formatting for searchableAttributes 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-28 12:39:09 +01:00