snipe
|
b83d1a043f
|
Merge pull request #15519 from snipe/features/add_created_at_created_by
Change `user_id` to `created_by`
|
2024-09-20 13:47:31 +01:00 |
|
|
snipe
|
4ab478bb97
|
Merge remote-tracking branch 'origin/develop'
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Codacy Security Scan / Codacy Security Scan (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
|
2024-09-20 13:44:45 +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
|
5128fd49e6
|
Allow printing all users
|
2024-09-19 17:27:25 -07:00 |
|
|
Marcus Moore
|
2d2d5bdc7e
|
Pass user in array
|
2024-09-19 17:23:47 -07:00 |
|
|
Marcus Moore
|
8364d26c9b
|
Extract parent layout
|
2024-09-19 17:18:26 -07:00 |
|
|
Marcus Moore
|
efd6d7625f
|
Remove bad closing tag
|
2024-09-19 17:16:05 -07:00 |
|
|
Marcus Moore
|
bdf5708bfc
|
Remove accidental line
|
2024-09-19 17:10:43 -07:00 |
|
|
Marcus Moore
|
e95703cb18
|
Use eager load
|
2024-09-19 17:10:07 -07:00 |
|
|
Marcus Moore
|
7ad4a29970
|
Add eager loading
|
2024-09-19 16:54:39 -07:00 |
|
|
snipe
|
cdb7ccb8f3
|
Merge pull request #15532 from spencerrlongg/bug/15253
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Catch Exceptions on Checkout Notification
|
2024-09-19 21:54:03 +01:00 |
|
|
snipe
|
8270947ed2
|
Merge pull request #13291 from akemidx/eol_date_range_for_reports
Added date range for EOL in custom reports
|
2024-09-19 21:49:27 +01:00 |
|
|
snipe
|
4f7c8e0c3d
|
Merge pull request #14671 from Robert-Azelis/patch-6
[FIX] Update EOL date when used bulk update of purchase date
|
2024-09-19 21:36:09 +01:00 |
|
|
snipe
|
b88f2054dd
|
Refactor isDeletable on companies
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-19 20:38:34 +01:00 |
|
|
snipe
|
d7914e238d
|
Added created by to company on save
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-19 20:34:54 +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
|
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
|
eef487d61b
|
Merge pull request #15531 from Godmartinz/status-doesnt-update-in-email
Fixed mail notification field `status label` not updating
|
2024-09-19 20:31:02 +01:00 |
|
Godfrey M
|
71dbc7abb0
|
refreshed the assetstatus relationship
|
2024-09-19 12:23:07 -07:00 |
|
|
snipe
|
74088ea581
|
Optimize isDeletable counts
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-19 20:13:38 +01:00 |
|
spencerrlongg
|
d446773fdd
|
catch exceptions on notification
|
2024-09-19 14:05:48 -05: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
|
118183ff58
|
Removed footer
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-19 19:41:39 +01:00 |
|
|
snipe
|
ebf6ce6980
|
Refactor for fewer queries
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-19 19:27:10 +01:00 |
|
|
snipe
|
5ebf0ed2b2
|
Updated variable
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-19 19:19:14 +01:00 |
|
|
snipe
|
836893cba5
|
Added id to report
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-19 18:35:00 +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
|
65eba30038
|
Fixed markdown in acceptance reminder
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-19 17:23:34 +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
|
4363e8b34c
|
Updated importer
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-19 16:20:42 +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
|
7650628d30
|
Removed free seat count from fillable
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-19 16:00:59 +01:00 |
|
|
snipe
|
7f690a6238
|
Fixed variable name
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-19 15:58:32 +01:00 |
|
|
Godfrey M
|
b32ab6a06c
|
import User model
|
2024-09-18 16:36:24 -07:00 |
|