Ivan Nieto Vivanco
|
b607a59875
|
Add query to search default locations in advanced search
|
2023-08-16 15:04:17 -06:00 |
|
snipe
|
34f2221b02
|
Merge pull request #13471 from inietov/fixes/components_search
Fixed #13409 Search in component detail view not working
|
2023-08-16 21:59:40 +01:00 |
|
Brady Wetherington
|
852e9ff311
|
Accessory checkin via API reported wrong target user
|
2023-08-16 13:03:37 +01:00 |
|
Ivan Nieto Vivanco
|
92df32dfaa
|
Move a couple assignation of variables inside an else to only execute once
|
2023-08-15 21:10:48 -06:00 |
|
snipe
|
027afa71f1
|
Check that there is a company before trying to get name property
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-16 01:09:22 +01:00 |
|
Ivan Nieto Vivanco
|
993918f47c
|
Add query to search into the per-component view
|
2023-08-15 15:31:36 -06:00 |
|
snipe
|
01ab360ef3
|
Fixed accessory clone typo
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-15 20:39:09 +01:00 |
|
snipe
|
9af850dbaa
|
Re-apply a change that was dropped
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-15 20:27:47 +01:00 |
|
snipe
|
64342838fd
|
Return the user to the labels page on save
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-15 18:48:12 +01:00 |
|
snipe
|
443adc50da
|
Fixed unclosed brace
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-15 18:12:25 +01:00 |
|
snipe
|
e41368daac
|
Merge pull request #12050 from cram42/develop
New Label Engine
|
2023-08-15 17:58:57 +01:00 |
|
Godfrey M
|
d1efca2ae1
|
fixes conflicts
|
2023-08-15 09:28:42 -07:00 |
|
snipe
|
c56f664811
|
Merge pull request #13442 from Robert-Azelis/Robert-Azelis-patch-add_email_to_companies
Add email to companies
|
2023-08-15 13:26:20 +01:00 |
|
Marcus Moore
|
dc1a8840f1
|
Ensure empty string is not passed to strpos()
|
2023-08-14 16:40:34 -07:00 |
|
Ivan Nieto Vivanco
|
96440834bd
|
Move the declinedCheckout function so it don/'t separate the class properties
|
2023-08-14 16:16:28 -06:00 |
|
snipe
|
12e9d2adeb
|
Fixed #13450 - remove escaping on saveing new custom fields
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-14 22:21:41 +01:00 |
|
Ivan Nieto Vivanco
|
8da2a8a79c
|
Allows to save signature for declined items
|
2023-08-14 14:58:10 -06:00 |
|
Ivan Nieto Vivanco
|
4796598bb6
|
Add declinedCheckout method to Accessory model
|
2023-08-14 14:35:31 -06:00 |
|
Robert-Azelis
|
30d33310ae
|
Update CompanyPresenter.php
|
2023-08-13 17:23:33 +02:00 |
|
Robert-Azelis
|
bbb8ecfee4
|
Update Company.php
|
2023-08-13 17:21:55 +02:00 |
|
Robert-Azelis
|
8988a5dfc3
|
Update CompaniesTransformer.php
|
2023-08-13 17:20:15 +02:00 |
|
Robert-Azelis
|
ed5b4ca0a2
|
Update CompaniesController.php
|
2023-08-13 17:18:25 +02:00 |
|
Robert-Azelis
|
07bafa9508
|
Update CompaniesController.php
|
2023-08-13 17:15:20 +02:00 |
|
snipe
|
df8f6a8d2b
|
Correctly call the route for accessory index
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-11 09:40:49 +01:00 |
|
Marcus Moore
|
e0b464dcec
|
Merge branch 'develop' into feature/custom-report-scoping
|
2023-08-09 13:03:05 -07:00 |
|
snipe
|
a6a742d8d8
|
Merge pull request #13407 from marcusmoore/feature/sc-23465
Added messaging to category edit page to improve clarity around when users will be emailed
|
2023-08-09 10:36:19 +01:00 |
|
Marcus Moore
|
c32f099053
|
Remove unneeded call to Company::scopeCompanyables
|
2023-08-08 17:22:15 -07:00 |
|
Brady Wetherington
|
6afbf1b152
|
Re-add the option for asset_eol_date as an import field
|
2023-08-08 17:45:33 +01:00 |
|
Marcus Moore
|
7c5a1b376e
|
Remove redundant Company::scopeCompanyables wrapper
|
2023-08-07 16:54:23 -07:00 |
|
Marcus Moore
|
f7b2075e9e
|
Add CompanyableTrait to Department
|
2023-08-07 16:54:02 -07:00 |
|
Marcus Moore
|
ae9cf1e5b6
|
Formatting
|
2023-08-02 18:24:32 -07:00 |
|
Ivan Nieto Vivanco
|
053d3fc9ed
|
Prevent asset to be checked out if full company support is enabled and companies not match
|
2023-08-02 19:23:28 -06:00 |
|
Ivan Nieto Vivanco
|
9ca163e8cf
|
Stop asset acceptances from shown to user if full company support is enabled and companies not match
|
2023-08-02 19:22:35 -06:00 |
|
Marcus Moore
|
3fd0853fd0
|
Ensure eula field enabled when not using default eula
|
2023-08-02 18:02:56 -07:00 |
|
Marcus Moore
|
896f038054
|
Set send email back to original value when eulas cleared
|
2023-08-02 17:03:56 -07:00 |
|
Marcus Moore
|
48979ce177
|
Disable send email when it should not be modified
|
2023-08-02 16:52:56 -07:00 |
|
Marcus Moore
|
e12935f7fa
|
Disable eula textarea when using global eula
|
2023-08-02 16:18:57 -07:00 |
|
Marcus Moore
|
6400034435
|
Improve variable name
|
2023-08-02 16:06:59 -07:00 |
|
Marcus Moore
|
269414e4f2
|
Automatically check the send email to user checkbox in certain conditions
|
2023-08-02 16:04:01 -07:00 |
|
Marcus Moore
|
dee6ebf8e0
|
Scaffold component test
|
2023-08-02 12:58:07 -07:00 |
|
Marcus Moore
|
105c94aea9
|
Implement toggling message when email will be sent
|
2023-08-02 11:36:20 -07:00 |
|
Brady Wetherington
|
0af205dade
|
Put guard around assigning location via LDAP
|
2023-08-02 15:01:14 +01:00 |
|
Marcus Moore
|
6349d52803
|
WIP: migrate to livewire
|
2023-08-01 17:29:23 -07:00 |
|
Godfrey M
|
8a24a47475
|
removed unnecessary code
|
2023-08-01 09:45:48 -07:00 |
|
Godfrey M
|
fb52038e7c
|
applies a check if a sync field is designated
|
2023-08-01 09:39:58 -07:00 |
|
snipe
|
ffb605a37c
|
Merge pull request #13309 from inietov/fixes/checkout_range_doesnt_include_today
Fixed #13300 Custom Asset Report, Checkout date range never includes current day
|
2023-07-31 15:04:22 +01:00 |
|
snipe
|
2e1c3fb51b
|
Merge pull request #13295 from inietov/fixes/admins_cannot_view_encrypted_fields
Fixed #11794 Admins Cannot View Encrypted Field
|
2023-07-31 13:08:28 +01:00 |
|
Grant Le Roux
|
b1464e028c
|
Merge branch 'develop' into develop
|
2023-07-31 07:57:29 +08:00 |
|
Ivan Nieto Vivanco
|
0a841ddbb8
|
Change component validator to the correct asset id we're passing in the API call
|
2023-07-27 20:22:13 -06:00 |
|
Ivan Nieto Vivanco
|
c015264181
|
Adjust the license offset if it exceeds the total of license seats
|
2023-07-25 16:23:33 -06:00 |
|