DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-15 18:14:09 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
15581 commits 96 branches 267 tags 295 MiB
Commit graph

1135 commits

Author SHA1 Message Date
Tobias Regnery fb4fe30049 Fix asset creation with API and FullMultipleCompanySupport 
It is currently possible to create an asset with arbitrary company without being superuser and FullMultipleCompanySupport enabled.
This bug goes back to 75ac7f80b9 which is part of version 6.3.0.
Fix this by restoring the previous behaviour to check the company_id with getIdForCurrentUser().
 2024-10-11 12:19:20 +02:00
Brady Wetherington 350b627ce1 Fix numeric sort 'ambiguous order clause' error 2024-10-03 14:23:40 +01:00
snipe 27ba641aa5 Added checkin on delete to API 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-01 14:30:34 +01:00
snipe 658c94ad8b Changed action_date to created_at 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-25 17:25:15 +01:00
snipe 0ce5832b6c Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-24 17:29:40 +01:00
snipe 5fb43dd159 Handle audit *and* audits for urls 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-24 16:55:56 +01:00
snipe de57d71bf1 Fixed #15548 - unify audit due/overdue APIs 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-24 16:30:24 +01:00
snipe b68805cf83 Small fix for notifications checkout 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-20 19:11:52 +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
snipe b88f2054dd Refactor isDeletable on companies 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 20:38:34 +01:00
snipe 454796e52a
Merge pull request #15518 from snipe/sort_by_numeric_custom_fields 
Fixed #11634 - Sort by numeric columns for numeric custom fields
 2024-09-19 20:32:03 +01:00
snipe f283b5fbe8 Eager load adminuser 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 19:56:39 +01:00
snipe eb6f05faf7 Eager load adminuser 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 19:41:46 +01:00
snipe cd98b3817d Removed duplicate line 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 18:26:08 +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 b247fc33b9 Added legacy comment 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 17:28:01 +01:00
snipe 2dcae780c0 Reapply deleted code 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 17:26:21 +01:00
snipe 5c3180ffa0 Removed duplicate code 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 17:25:09 +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 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 634a4afa75 Fixed 1001 query on license 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 16:04:54 +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
snipe 7c85ad54eb Sort by numeric columns for numeric custom fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-17 19:44:03 +01:00
Marcus Moore 60a54cee79
Add tests for delete license endpoint 2024-09-16 12:33:30 -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
Marcus Moore 5299b3e9f0
Remove code handled by CompanyableChildTrait 2024-09-12 13:29:44 -07: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
snipe 12fa505972 Disabmiguate licenses company_id
Some checks failed
Crowdin Action / upload-sources-to-crowdin (push) Has been cancelled
Details
Docker images (Alpine) / docker (push) Has been cancelled
Details
Docker images / docker (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
Details 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-29 21:07:30 +01:00
snipe c197644ba7
Merge pull request #15284 from spencerrlongg/bug/sc-26584 
[Multi-Company] Fixes Users Being Moved With Items Still Assigned
 2024-08-29 11:38:15 +01:00
snipe c6ddc501c5 Filter by depreciation_id 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-28 12:40:12 +01:00
snipe 4839181beb Added counts to API 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-28 12:40:01 +01:00
snipe 56e31d2303 Fixed #15366 - use permission for encrypted custom fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-22 14:58:09 +01:00
r-xyz cd7db5c4a8
Fix some typos in models file handler. 2024-08-21 22:24:08 +02:00
r-xyz 4ec361c718
Add AssetModel files endpoints to API 2024-08-21 19:49:51 +02:00
snipe 856c57cb12 Corrected some translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-16 12:39:59 +01:00
snipe 01c69c8f8f Allow optional status label on quickscan checkin 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-15 10:08:48 +01:00
spencerrlongg f031309f8f set up api controller for route/model binding 2024-08-14 16:09:15 -05:00
spencerrlongg 20ec420ba3 not quite done, api side needs some work 2024-08-14 13:53:29 -05:00
snipe ac1543d568 Fixed #15247 - make pie chart on dashboard respect the “show archived” setting 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-12 17:54:42 +01:00