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
|
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
|
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 |
|
|
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 |
|