slong753
|
cda9dd57dd
|
asset update logic
|
2023-09-11 17:15:25 -05:00 |
|
slong753
|
1ea0de8bca
|
prevent injection, fix asset update
|
2023-09-11 17:15:25 -05:00 |
|
slong753
|
17ccfa9ada
|
resolve some conflicts
|
2023-09-11 17:15:24 -05:00 |
|
slong753
|
c1daabef08
|
progress
|
2023-09-11 17:10:41 -05:00 |
|
Godfrey M
|
e73b16846e
|
adds an option to bulk edit actual location for bulk edit and fixes update issue
|
2023-09-11 11:21:56 -07:00 |
|
Godfrey Martinez
|
a26b96185b
|
Merge branch 'develop' into asset-model-notifs
|
2023-09-11 09:37:22 -07:00 |
|
Godfrey M
|
0eb50ceb3d
|
removes commented code
|
2023-09-11 09:36:38 -07:00 |
|
snipe
|
06836663c8
|
Merge pull request #13575 from marcusmoore/fixes/improve-api-messaging
Added validation around department_id in API patch request
|
2023-09-07 21:36:20 +01:00 |
|
Marcus Moore
|
4caa501996
|
Relax property type check
|
2023-09-07 13:28:32 -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 |
|
Marcus Moore
|
899c2eb19b
|
Implement test case
|
2023-09-07 12:34:50 -07:00 |
|
snipe
|
894c34ff4f
|
Update to only use relative paths
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-07 20:22:14 +01:00 |
|
Brady Wetherington
|
ec1059e74c
|
Merge branch 'develop' into snipeit_v7_laravel10
|
2023-09-07 20:11:41 +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
|
e486fe2794
|
Removed soft-delete query
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-05 16:10:20 +01:00 |
|
snipe
|
f85df6bb8c
|
Use same method of accessing companies as others
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-05 16:02:28 +01:00 |
|
snipe
|
2acf2b880e
|
Account for hard-deleted models, suppliers
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-05 15:58:21 +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 |
|
Brady Wetherington
|
3500217f94
|
Merge branch 'develop' into snipeit_v7_laravel10
|
2023-08-31 13:07:06 +01:00 |
|
snipe
|
c51574099f
|
Merge pull request #13507 from Godmartinz/ignore_encrypt_and_other_changes
Added eager loading for `changedinfo` and removed encrypted values from Asset history
|
2023-08-31 13:04:39 +01: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 |
|
akemidx
|
f1cc2c8d8b
|
submitting form after capturing/formatting fixes
|
2023-08-29 16:55:21 -04:00 |
|
Godfrey Martinez
|
d86c63cf23
|
Merge branch 'ignore_encrypt_and_other_changes' into fix-companyable
|
2023-08-28 19:38:16 -07:00 |
|
Godfrey M
|
74f45a4473
|
reworks company queries for asset history
|
2023-08-28 19:35:46 -07:00 |
|
akemidx
|
734af87f2f
|
template structuring
|
2023-08-28 19:26:31 -04: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 Martinez
|
92e88a0ae2
|
Merge branch 'develop' into ignore_encrypt_and_other_changes
|
2023-08-28 10:14:41 -07:00 |
|
Brady Wetherington
|
427f8b1522
|
Merge branch 'develop' into snipeit_v7_laravel10
Upgraded composer due to lockfile conflicts
|
2023-08-28 16:04:21 +01:00 |
|
Godfrey M
|
18cb514a53
|
revert unwanted changes
|
2023-08-24 10:40:44 -07:00 |
|
Godfrey M
|
a3b6e0fbe6
|
adds some spacing
|
2023-08-24 10:36:09 -07:00 |
|
Godfrey M
|
34ba0c4440
|
adds id to history info
|
2023-08-24 10:36:08 -07:00 |
|
Godfrey M
|
739fc152c2
|
Adds readable asset history in the action log transformer
|
2023-08-24 10:36:08 -07:00 |
|
Godfrey M
|
8ebb9afedd
|
adds min_amt to asset model edit, index, and table
|
2023-08-24 10:30:07 -07:00 |
|
Marcus Moore
|
e32c07be02
|
Clear commented log statements
|
2023-08-24 08:15:40 -07:00 |
|
Marcus Moore
|
5a0b0522b0
|
Explicitly declare $clean_meta variable
|
2023-08-24 08:15: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 |
|
Godfrey Martinez
|
28cf533d19
|
Merge branch 'develop' into ignore_encrypt_and_other_changes
|
2023-08-23 00:42:59 -07:00 |
|
Godfrey M
|
0fc79ec936
|
fixes conflicts
|
2023-08-23 00:40:59 -07:00 |
|
Godfrey M
|
ffe1b11419
|
merged develop
|
2023-08-23 00:38:58 -07:00 |
|
Godfrey M
|
27488c1009
|
adds soft deletes to eager loading
|
2023-08-23 00:34:09 -07:00 |
|
Godfrey M
|
ce60db009c
|
adds soft deletes to eager loading
|
2023-08-23 00:32:43 -07:00 |
|
Marcus Moore
|
bee680683d
|
Add withTrashed to asset model query
|
2023-08-22 17:05:06 -07:00 |
|