spencerrlongg
|
a54fab5c33
|
add fieldset to allowed_columns
|
2023-09-28 13:02:12 -05:00 |
|
spencerrlongg
|
4d67c72eea
|
scope and switch case in api
|
2023-09-28 12:26:23 -05:00 |
|
snipe
|
279e6c7e4f
|
Check for null company ID
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-26 14:33:42 +01:00 |
|
snipe
|
2166d6649d
|
Merge pull request #13343 from snipe/fixes/re-scramble_password_if_ldap_pw_sync_not_enabled
Fixed #13336 - Save unhashed password if no password provided
|
2023-09-14 14:15:53 +01:00 |
|
snipe
|
d916e20c10
|
Merge pull request #13415 from marcusmoore/feature/department-scoping
Added `CompanyableTrait` to `Department` model
|
2023-09-14 12:52:53 +01:00 |
|
snipe
|
b92327eb40
|
Merge pull request #13520 from inietov/fixes/licenses_reassignable_feature
Fixed Not reassignable Licenses shouldn't show 'Checkin All Seats' button [sc-23506]
|
2023-09-14 12:52:13 +01:00 |
|
Ivan Nieto Vivanco
|
9cbd2d032c
|
Add a boolean variable and condition to handle the call to checkedOutToUser() method
|
2023-09-11 17:40:59 -06:00 |
|
Godfrey Martinez
|
a26b96185b
|
Merge branch 'develop' into asset-model-notifs
|
2023-09-11 09:37:22 -07:00 |
|
snipe
|
02c187b0a0
|
Merge pull request #13566 from snipe/features/13562_add_inline_file_link
Fixed #13562 - Added inline file link
|
2023-09-07 20:50:13 +01:00 |
|
Ivan Nieto Vivanco
|
abd2ed3b81
|
Filter unaccepted assets that are not assigned to users
|
2023-09-07 13:39:16 -06:00 |
|
snipe
|
894c34ff4f
|
Update to only use relative paths
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-07 20:22:14 +01:00 |
|
snipe
|
a67888f3d3
|
Merge pull request #13547 from inietov/fixes/Attempt_to_read_property_asset_tag
Fixed ErrorException: Attempt to read property "asset_tag" on null (rollbar #3541)
|
2023-09-05 20:26:21 +01:00 |
|
Ivan Nieto Vivanco
|
91b1cc7121
|
Move the early return to the controller instead of the Label model
|
2023-09-05 13:23:51 -06:00 |
|
snipe
|
d6dd332b09
|
Merge pull request #13557 from johnson-yi/fixes/add_changes_to_checkinout_actionlog
Added/Fixed: track changes on asset checkin/out
|
2023-09-05 19:08:49 +01:00 |
|
snipe
|
f53db8ba75
|
Fixed #13562 - allow inline view for uploaded files
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-05 18:28:01 +01:00 |
|
snipe
|
a62e2f092b
|
Merge pull request #13498 from marcusmoore/feature/add-checkin-date-range-filter-to-custom-asset-report
Added last check in column and filter to custom asset report
|
2023-09-05 13:22:15 +01:00 |
|
Johnson Yi
|
09f7b3debe
|
Track changes on asset checkin/out
|
2023-09-01 13:12:07 +10:00 |
|
snipe
|
b109ee281a
|
Merge pull request #13544 from marcusmoore/bug/sc-23675
Fixed user search not adhering to company scoping
|
2023-08-30 08:54:41 +01:00 |
|
Marcus Moore
|
806ab2cb9d
|
Ensure users are scoped by company in index method
|
2023-08-29 16:17:29 -07:00 |
|
Ivan Nieto Vivanco
|
4e4ba38038
|
Pass the model_id variable in the controller and get it only if we are cloning the asset model
|
2023-08-28 16:23:26 -06:00 |
|
snipe
|
baffcbad71
|
Set password property properly
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-28 20:47:56 +01:00 |
|
snipe
|
611db4c0d2
|
Removed stray line
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-28 20:46:45 +01:00 |
|
Godfrey M
|
8ebb9afedd
|
adds min_amt to asset model edit, index, and table
|
2023-08-24 10:30:07 -07:00 |
|
Ivan Nieto Vivanco
|
6161a0d76d
|
Add condition in LicenseCheckinController:bulkCheckin method to evaluate if the license is reassignable
|
2023-08-23 16:22:40 -06:00 |
|
snipe
|
79b330f492
|
Merge pull request #13400 from inietov/fixes/asset_acceptance_user_error
Fixed Asset acceptance error when user company and asset company don't match
|
2023-08-22 15:49:56 +01:00 |
|
snipe
|
a48762c64d
|
Merge pull request #13496 from snipe/features/setting_for_name_order
Fixed #13495 added setting for name order
|
2023-08-22 12:50:58 +01:00 |
|
snipe
|
aafb7668f5
|
Merge pull request #13453 from inietov/fixes/accessories_declined_issue
Fixed #13317 Accessories declined by user remain assigned
|
2023-08-22 12:42:55 +01:00 |
|
snipe
|
fea11ec7f1
|
Merge pull request #12761 from spencerrlongg/bulk_edit_custom_fields
Bulk Editing Custom Fields
|
2023-08-22 12:40:18 +01:00 |
|
Marcus Moore
|
4e2ef4f056
|
Default to using the current date if last check in end date is not provided
|
2023-08-21 14:35:15 -07:00 |
|
Marcus Moore
|
c332b98456
|
Add last checkin options to report front end
|
2023-08-21 13:44:49 -07:00 |
|
snipe
|
474c03e3fc
|
Added name order to settings save controller method
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-21 20:10:03 +01:00 |
|
Marcus Moore
|
489d30c685
|
Set last_checkin in ui and api controllers
|
2023-08-21 11:57:33 -07:00 |
|
snipe
|
1e82c2bfad
|
Changed example asset name
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-18 22:17:54 +01:00 |
|
snipe
|
da2f22d504
|
Fixed #13487 - include supplier url in listing
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-18 15:31:15 +01: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 |
|
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
|
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
|
e41368daac
|
Merge pull request #12050 from cram42/develop
New Label Engine
|
2023-08-15 17:58:57 +01: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 |
|
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 |
|
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
|
c32f099053
|
Remove unneeded call to Company::scopeCompanyables
|
2023-08-08 17:22:15 -07:00 |
|
Marcus Moore
|
7c5a1b376e
|
Remove redundant Company::scopeCompanyables wrapper
|
2023-08-07 16:54:23 -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 |
|