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 |
|
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 |
|
Marcus Moore
|
2137890496
|
Remove dead code
|
2024-09-19 11:33:20 -07: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
|
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
|
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 |
|
Godfrey M
|
4ff5fc1ff9
|
clean up variables
|
2024-09-18 16:19:35 -07:00 |
|
Godfrey M
|
c40209f500
|
seperates emails and webhook notifications
|
2024-09-18 15:23:44 -07:00 |
|
Marcus Moore
|
9b293afaac
|
Remove more dead code
|
2024-09-18 11:28:29 -07:00 |
|
Marcus Moore
|
636c776620
|
Remove dead code
|
2024-09-18 11:27:37 -07:00 |
|
Marcus Moore
|
c021609c13
|
Merge branch 'develop' into testing/fmcs-accessories
|
2024-09-18 10:42:58 -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 |
|
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 |
|
snipe
|
9e957baeb5
|
Fixed check for outside assets on user update validation
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-17 15:46:45 +01:00 |
|
Marcus Moore
|
eb35608bb5
|
Remove call handled by form request
|
2024-09-16 16:35:33 -07:00 |
|
Marcus Moore
|
c269184c60
|
Add tests for delete predefined kit endpoint
|
2024-09-16 13:29:41 -07: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 |
|
setpill
|
4facc4007e
|
feat: Explicitly request LDAP attributes during sync
|
2024-09-13 17:05:48 +02:00 |
|
setpill
|
31da47e046
|
refactor: Put LDAP attribute mapping in array
|
2024-09-13 17:05:28 +02:00 |
|
Marcus Moore
|
5299b3e9f0
|
Remove code handled by CompanyableChildTrait
|
2024-09-12 13:29:44 -07:00 |
|
snipe
|
a97530367d
|
Fixed tests again
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-11 17:29:22 +01:00 |
|
snipe
|
43250ae881
|
Updated tests
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-11 17:04:09 +01:00 |
|
snipe
|
98323185de
|
Null and warn if editing asset to a non-deployabe state
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-11 16:43:33 +01:00 |
|
Marcus Moore
|
ca01261c1f
|
Merge branch 'develop' into fixes/custom-field-values
|
2024-09-10 16:05:39 -07:00 |
|
snipe
|
f6bf2d03c4
|
Merge pull request #15445 from Godmartinz/eula_confusion
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
Fixed priority for category eula vs default eula
|
2024-09-10 11:04:58 +01:00 |
|
Marcus Moore
|
6423df2133
|
Merge branch 'develop' into fixes/custom-field-values
# Conflicts:
# resources/views/livewire/custom-field-set-default-values-for-model.blade.php
|
2024-09-09 16:07:37 -07:00 |
|
Marcus Moore
|
dc6a5bf998
|
Reflash session so login message is displayed
|
2024-09-09 14:54:19 -07:00 |
|
snipe
|
c5dbc5f6b8
|
Correctly save user’s city on bulk edit
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-09 10:01:07 +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
|
7c8955b126
|
revert changes to label view
|
2024-09-04 12:38:35 -07:00 |
|
Godfrey M
|
f04a4a3cf5
|
adds test
|
2024-09-04 12:21:49 -07:00 |
|
Godfrey M
|
cf07186ae8
|
gives priority to default eula being checked vs catregory eula
|
2024-09-03 12:23:23 -07:00 |
|
snipe
|
13dbf9ee74
|
Added icon for dept
Crowdin Action / upload-sources-to-crowdin (push) Has been cancelled
Docker images (Alpine) / docker (push) Has been cancelled
Docker images / docker (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-31 13:48:42 +01:00 |
|
snipe
|
3c7d455ee3
|
Added employee number to asset view
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-31 13:38:38 +01:00 |
|
snipe
|
12fa505972
|
Disabmiguate licenses company_id
Crowdin Action / upload-sources-to-crowdin (push) Has been cancelled
Docker images (Alpine) / docker (push) Has been cancelled
Docker images / docker (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-29 21:07:30 +01:00 |
|
snipe
|
4e4930ba62
|
Check for array
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-29 21:01:48 +01:00 |
|
snipe
|
964e105cf9
|
Merge pull request #15415 from snipe/rules/prevent_company_switch
Validation rules to prevent switching user companies if items are assigned to them
|
2024-08-29 19:20:03 +01:00 |
|
snipe
|
e62a802926
|
Use whereIn instead of where =
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-29 17:51:44 +01:00 |
|
snipe
|
abb4221539
|
Validation rules to prevent switchng user companies if assets are assigned
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-29 14:55:18 +01:00 |
|
Brady Wetherington
|
da1e383295
|
Use the null-safe property accessor for new-user creation
|
2024-08-29 14:09:23 +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
|
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
|
b06c527767
|
Check that the user exists before trying to print
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-29 11:06:30 +01:00 |
|
snipe
|
94c981e22c
|
Set image to null if model is deleted
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-28 14:23:49 +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
|
63a05c89a7
|
Added counts to show method
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-28 12:39:52 +01:00 |
|
snipe
|
385c4f69f7
|
Added counts to depreciation transformer
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-28 12:39:43 +01:00 |
|
snipe
|
486cd8c8c9
|
Nicer formatting for searchableAttributes
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-28 12:39:09 +01:00 |
|
snipe
|
eb5d93b3c2
|
Added assets relationship
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-28 12:38:55 +01:00 |
|
snipe
|
a5ff623484
|
Added asset, license, model count to API
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-28 12:38:43 +01:00 |
|
snipe
|
22bc088f6f
|
Added start_date and end_date to user bulk edit
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-27 07:21:19 +01:00 |
|
snipe
|
1b933f7add
|
Added s to fa icons
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-26 13:47:17 +01:00 |
|
snipe
|
aa86e07cd2
|
Fixed #15385 - small icon tweaks
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-23 15:22:39 +01:00 |
|
snipe
|
cc2c8f76d0
|
Merge pull request #15375 from Godmartinz/fix-acceptance-reminder-command
Fixes the `acceptance-reminder` command
|
2024-08-23 07:31:29 +01:00 |
|
snipe
|
78d355f136
|
Merge pull request #15377 from marcusmoore/fixes/custom-field-values-on-validation-error
Fixed custom field defaults being prematurely updated
|
2024-08-23 07:20:23 +01:00 |
|
Marcus Moore
|
9a73311a99
|
Fix nested checkboxes being updated as a group
|
2024-08-22 17:04:04 -07:00 |
|
Marcus Moore
|
aec781e7df
|
Be a little more explicit
|
2024-08-22 16:03:30 -07:00 |
|
setpill
|
1d7853cbfe
|
fixed #15374: load TrustProxies middleware in Kernel.php
|
2024-08-22 23:41:27 +02:00 |
|
Marcus Moore
|
c3165717ed
|
Handle old input
|
2024-08-22 13:20:04 -07:00 |
|
Marcus Moore
|
d0a351a132
|
Add comment
|
2024-08-22 12:59:03 -07:00 |
|
Marcus Moore
|
68749e7e87
|
Simplify logic
|
2024-08-22 12:58:35 -07:00 |
|
Marcus Moore
|
0abb5637e0
|
WIP: handle old input
|
2024-08-22 12:54:54 -07:00 |
|
Marcus Moore
|
d67975cb62
|
Implement fix
|
2024-08-22 10:18:23 -07:00 |
|
Godfrey M
|
3957d670d0
|
fixes send acceptance reminder query
|
2024-08-22 10:04:46 -07: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 |
|
snipe
|
456c7d8d91
|
Merge pull request #15065 from Godmartinz/explicit_eol_removal_command
Adds `snipeit:remove-explicit-eols` command
|
2024-08-22 13:20:56 +01:00 |
|
snipe
|
ec0b9b198f
|
Merge pull request #15296 from uberbrady/expose_restore_sanitize
Expose the 'sanitize' system for backup restores to the web GUI
|
2024-08-22 12:43:07 +01:00 |
|
Marcus Moore
|
1d89759706
|
Implement fix
|
2024-08-21 16:59:44 -07: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
|
4d03f1e110
|
Fixed #15341 - validate parent ID
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-21 09:46:18 +01:00 |
|
Marcus Moore
|
6c5ec6a16c
|
Get datepicker working
|
2024-08-20 16:41:24 -07:00 |
|
Marcus Moore
|
5d1f98bf93
|
Simplify by directly wire:modeling
|
2024-08-20 15:38:43 -07:00 |
|
spencerrlongg
|
a8cd1027f3
|
rm commented code
|
2024-08-20 11:40:15 -05:00 |
|
snipe
|
74136761df
|
Added TrimStrings middleware
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-20 11:45:13 +01:00 |
|
snipe
|
64bed01a91
|
Merge pull request #15327 from snipe/update_button_style
Update icons to use blade components, standardize button colors and format
|
2024-08-20 10:13:43 +01:00 |
|
akemidx
|
8e1111c681
|
Merge remote-tracking branch 'upstream/develop' into eol_date_range_for_reports
|
2024-08-19 19:33:44 -04:00 |
|
Marcus Moore
|
fa765667f2
|
Merge branch 'develop' into livewire-importer-improvements
|
2024-08-19 14:41:58 -07:00 |
|
snipe
|
be5f3f38f8
|
Settings pages
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-19 14:48:12 +01:00 |
|
snipe
|
6f024849e9
|
Few more
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-19 13:39:24 +01:00 |
|
snipe
|
e048f0955f
|
More icons
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-19 13:27:21 +01:00 |
|
snipe
|
84f14a05bd
|
Fixed logging for asset model restore
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-19 13:20:19 +01:00 |
|
snipe
|
229d8b9bf5
|
Added location restore
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-19 13:19:59 +01:00 |
|
snipe
|
f82266fade
|
Cleaned up presenters
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-19 11:58:31 +01:00 |
|
snipe
|
f200960a57
|
Aaaand more
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-18 22:26:57 +01:00 |
|
snipe
|
c700127f1a
|
Updated user view
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-18 22:09:00 +01:00 |
|
snipe
|
ae2f9571b4
|
And still more
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-18 21:57:37 +01:00 |
|
snipe
|
a77dcad336
|
More links
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-18 20:30:53 +01:00 |
|
snipe
|
d2e889e927
|
Still more
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-18 19:21:59 +01:00 |
|
snipe
|
7c9b1f6e38
|
Added the plus icon
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-18 18:39:22 +01:00 |
|
snipe
|
4d8904938d
|
Added calendar icon for datepickers
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-18 18:24:26 +01:00 |
|
snipe
|
0c09f2b2c0
|
Moar icon replacement
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-18 18:13:49 +01:00 |
|
snipe
|
bffba02511
|
Updated icons
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-18 17:26:44 +01:00 |
|
snipe
|
901f4df7ee
|
Added more icons
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-18 17:03:36 +01:00 |
|
snipe
|
9337cba340
|
Added download
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-18 15:53:58 +01:00 |
|
snipe
|
a102c085df
|
Added icon helper
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-18 15:47:37 +01:00 |
|
snipe
|
4253acad4c
|
Prevent passing an array as login
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-18 04:51:36 +01:00 |
|
snipe
|
a25efe53aa
|
Removed some debugging
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-17 00:35:42 +01:00 |
|
snipe
|
318aff1ef0
|
Fixed behavior for null model numbers
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-17 00:27:44 +01:00 |
|
snipe
|
3ae4a5caf0
|
Removed debugging
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-16 22:53:27 +01:00 |
|
snipe
|
9b6a36c8aa
|
Removed unusued parameter
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-16 22:45:57 +01:00 |
|
snipe
|
1a4aebf805
|
Added TwoColumnUniqueUndeletedTrait trait
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-16 22:45:47 +01:00 |
|
snipe
|
6ad7100aa3
|
Removed unused use statements
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-16 22:45:17 +01:00 |
|
snipe
|
b57283d8d1
|
Removed commented code
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-16 22:43:56 +01:00 |
|
snipe
|
7658f7c41d
|
First shot
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-16 20:29:53 +01:00 |
|
spencerrlongg
|
70e5e0f9df
|
get rid of dd
|
2024-08-16 12:52:06 -05:00 |
|
snipe
|
856c57cb12
|
Corrected some translations
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-16 12:39:59 +01:00 |
|
snipe
|
3167ee91d1
|
Added a setting test and validation on settings
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-16 10:51:49 +01:00 |
|
snipe
|
de29c1d8a0
|
Merge pull request #15314 from Glukose1/features/add_setting_due_for_checkin_in_days
Added #15312: Add checkin due in days setting
|
2024-08-16 10:21:36 +01:00 |
|
Marcus Moore
|
94d8a547b8
|
Merge branch 'develop' into livewire-importer-improvements
|
2024-08-15 13:47:49 -07:00 |
|
Marcus Moore
|
75c1e7658f
|
Improve method name
|
2024-08-15 10:43:41 -07:00 |
|
Marcus Moore
|
6ab976f353
|
Use cached values for text input
|
2024-08-15 10:32:33 -07:00 |
|
snipe
|
b39a7c6f0c
|
String constraint
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
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-15 15:42:11 +01:00 |
|
snipe
|
a3d847151a
|
Model name uniqueness
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-15 15:19:27 +01:00 |
|
snipe
|
4356cb7b9b
|
Added confetti option
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-15 11:32:42 +01:00 |
|
Glukose1
|
d8df52cc8f
|
Implemented setting to specify the amount of days before an assets appers in the due for checkin page. Currently this uses the audit warning days but a sperated setting gives the possibility of defineing different values for each field.
|
2024-08-15 12:20:51 +02:00 |
|
snipe
|
d8038ac483
|
Removed status label list
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-15 10:17:08 +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 |
|
Marcus Moore
|
ab63a19aff
|
Initialize concept of cached values
|
2024-08-14 11:01:51 -07:00 |
|
spencerrlongg
|
a70b94e707
|
Merge branch 'refs/heads/develop' into bug/sc-26584
|
2024-08-14 11:36:19 -05:00 |
|
Brady Wetherington
|
cc5ad456e6
|
Expose the 'sanitize' system for backup restores to the web GUI
|
2024-08-14 15:59:21 +01:00 |
|
snipe
|
371afde52d
|
Bulk edit asset name
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-14 09:52:25 +01:00 |
|
Marcus Moore
|
038e86954b
|
Improve property name
|
2024-08-13 17:30:53 -07:00 |
|
Marcus Moore
|
f6c1642bf2
|
Use computed fields in CustomFieldSetDefaultValuesForModel component
|
2024-08-13 17:01:35 -07:00 |
|
spencerrlongg
|
120cfd13c5
|
translation
|
2024-08-13 14:07:40 -05:00 |
|
spencerrlongg
|
09f2739298
|
works, un-reassignable licenses are an issue
|
2024-08-13 13:45:41 -05:00 |
|
snipe
|
e9fc455a30
|
Merge pull request #15192 from Godmartinz/status_labels_check_emails
Added status labels to confirmation emails
|
2024-08-13 18:24:15 +01:00 |
|
snipe
|
72fd9977e5
|
Merge pull request #15277 from uberbrady/silence_saml_errors
Fixed: [sc-26355] Attempt to de-escalate SAML login and logout errors
|
2024-08-13 15:51:03 +01:00 |
|
Brady Wetherington
|
10f35c682b
|
Re-add space
|
2024-08-13 15:49:51 +01:00 |
|
Brady Wetherington
|
4b96721393
|
Attempt to de-escalate SAML login and logout errors
|
2024-08-13 14:55:13 +01:00 |
|
snipe
|
c163d6774f
|
Merge pull request #15198 from spencerrlongg/feature/add_trait_to_request
Add MayContainCustomFields Trait to Asset Update Request
|
2024-08-13 14:12:52 +01:00 |
|
spencerrlongg
|
ec863df007
|
rm conditional that might be unnecessary
|
2024-08-12 16:58:53 -05:00 |
|
spencerrlongg
|
cc3b8e0681
|
this should more or less work, but i need to determine if this is the best way
|
2024-08-12 16:58:21 -05:00 |
|
spencerrlongg
|
ff145abbe7
|
use array for eager loading, makes ide prettier
|
2024-08-12 16:13:03 -05:00 |
|
snipe
|
b45a8f4b5f
|
Added reporting-only access for selectlists
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-12 20:44:17 +01: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 |
|
snipe
|
9d354ca657
|
Merge pull request #15266 from uberbrady/checkout_to_fixer
Checkout-to fixer
|
2024-08-12 16:34:19 +01:00 |
|
snipe
|
ce5be8ac24
|
Merge pull request #15100 from Godmartinz/depreciation_percentage
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
Added Depreciation Percentage as an option
|
2024-08-12 10:10:25 +01:00 |
|
snipe
|
1777bb4b93
|
Pulled searchable relation on model - needs revisit
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
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-11 10:26:02 +01:00 |
|
snipe
|
ce33deed86
|
Remove unused use statement
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-10 17:14:34 +01:00 |
|
snipe
|
1e6c172f18
|
Removed unusued use statement
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-10 17:14:20 +01:00 |
|
snipe
|
a1ce9b9285
|
Added query scope for ordering by admin
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-10 17:00:50 +01:00 |
|
snipe
|
6ec3693030
|
Load admin on actionlog
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-10 17:00:34 +01:00 |
|
snipe
|
71729f0b16
|
Load admin and model on assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-10 17:00:20 +01:00 |
|
snipe
|
f76fbe75e0
|
Merge pull request #15221 from marcusmoore/fixes/bulk-checkin-logging
Crowdin Action / upload-sources-to-crowdin (push) Has been cancelled
Docker images (Alpine) / docker (push) Has been cancelled
Docker images / docker (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
Fixed accessories and consumables not being logged correctly during bulk check-in
|
2024-08-08 10:43:59 +01:00 |
|
snipe
|
8094f3c0e1
|
Merge pull request #15245 from spencerrlongg/bug/acceptance_issue
Fixed Issue with Acceptances Being Created
|
2024-08-08 01:22:34 +01:00 |
|
Marcus Moore
|
6521c02526
|
Merge branch 'develop' into livewire-importer-improvements
# Conflicts:
# resources/views/livewire/importer.blade.php
|
2024-08-07 15:20:39 -07:00 |
|
spencerrlongg
|
2412333152
|
added conditional to listener
|
2024-08-07 16:53:06 -05:00 |
|
Marcus Moore
|
d03baa4613
|
Make diff cleaner
|
2024-08-07 13:29:45 -07:00 |
|
Marcus Moore
|
41437e4d8f
|
Merge branch 'develop' into fixes/bulk-checkin-logging
# Conflicts:
# app/Http/Controllers/Users/BulkUsersController.php
|
2024-08-07 13:06:59 -07:00 |
|
snipe
|
7d220dd8c2
|
set default
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-07 20:58:04 +01:00 |
|
snipe
|
a99ec062e6
|
Added checkbox for preferences
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-07 20:49:07 +01:00 |
|
snipe
|
9350a20189
|
Include accessories count
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Has been cancelled
Codacy Security Scan / Codacy Security Scan (push) Has been cancelled
Docker images (Alpine) / docker (push) Has been cancelled
Docker images / docker (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
This isn’t exactly right right now
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-07 20:19:47 +01:00 |
|
snipe
|
889d5da71e
|
Check for accessories on bulk items
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-07 20:04:32 +01:00 |
|
snipe
|
5546ab08c2
|
Only delete user records in accessories_checkouts for bulk delete
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-07 19:53:18 +01:00 |
|
snipe
|
ef183f256c
|
Merge pull request #15242 from Godmartinz/shortcut_option
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
Fixed shortcuts to be optional now
|
2024-08-07 18:56:27 +01:00 |
|
Godfrey M
|
6b1784f2ee
|
makes shortcuts optional
|
2024-08-07 10:47:16 -07:00 |
|
snipe
|
a5f075548a
|
Default to user
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-07 18:04:39 +01:00 |
|
Brady Wetherington
|
1706ddd511
|
working fixup script, but failing tests. But I have tests!
|
2024-08-07 16:06:00 +01:00 |
|
Marcus Moore
|
c7ddabcc8b
|
Check for FMCS when checking out component
|
2024-08-06 12:27:15 -07:00 |
|
Marcus Moore
|
bee80fcf8a
|
Remove global scope when counting check outs
|
2024-08-06 12:16:06 -07:00 |
|
Marcus Moore
|
f2b78d18a4
|
Merge branch 'develop' into fixes/bulk-checkin-logging
# Conflicts:
# app/Http/Controllers/Users/BulkUsersController.php
|
2024-08-05 17:25:54 -07:00 |
|
Marcus Moore
|
17eccfcd8b
|
Formatting
|
2024-08-05 16:58:27 -07:00 |
|
Marcus Moore
|
01e4382d20
|
Formatting
|
2024-08-05 16:58:17 -07:00 |
|
Marcus Moore
|
1c664af326
|
Remove todo outside of scope
|
2024-08-05 16:58:08 -07:00 |
|