snipe
|
6fa0d42bc2
|
Fixed bug where license checkout/checkin notes were not being saved
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-28 15:40:18 +01:00 |
|
snipe
|
492fb15036
|
Fixed #13670 - order number missing from license import
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-28 14:24:07 +01:00 |
|
snipe
|
ee72c92d4f
|
Fix for asset history with enfrypted fields
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-28 03:00:49 +01:00 |
|
snipe
|
660abeca9e
|
Merge pull request #13638 from marcusmoore/bug/sc-20704
Fixed exception being thrown when selected import was deleted
|
2023-09-26 15:00:35 +01:00 |
|
snipe
|
279e6c7e4f
|
Check for null company ID
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-26 14:33:42 +01:00 |
|
Marcus Moore
|
5a88a64ebd
|
Remove unnecessary redirect
|
2023-09-20 17:35:34 -07:00 |
|
Marcus Moore
|
b1199100a0
|
Display error message if import file deleted before it can be selected
|
2023-09-20 17:22:12 -07:00 |
|
Godfrey M
|
b7901ae2d8
|
dont allow redirects, messaging applied, general webhook validation applied
|
2023-09-20 12:54:34 -07:00 |
|
spencerrlongg
|
4660a2e5b7
|
rm more duplicate
|
2023-09-20 14:37:32 -05:00 |
|
spencerrlongg
|
a9123754f5
|
remove unnecessary code
|
2023-09-20 14:34:42 -05:00 |
|
spencerrlongg
|
cbef531811
|
parse purchase date even though it's cast
|
2023-09-20 14:26:49 -05:00 |
|
spencerrlongg
|
7dab59c98d
|
fix for no eol, fix for optional in view
|
2023-09-20 14:17:30 -05:00 |
|
spencerrlongg
|
c48a47936c
|
add validation back in
|
2023-09-20 14:00:59 -05:00 |
|
Godfrey M
|
66abf8d5c0
|
redoing logic
|
2023-09-19 17:46:29 -07:00 |
|
spencerrlongg
|
d65d1930e4
|
asset models
|
2023-09-19 19:24:53 -05:00 |
|
spencerrlongg
|
6b4f8f1813
|
rm duplicate fillable
|
2023-09-19 18:07:15 -05:00 |
|
spencerrlongg
|
929e107a20
|
rm byod from casts
|
2023-09-19 18:04:16 -05:00 |
|
snipe
|
0b562d2f55
|
Fixes #13609 - disallow sorting on age
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-15 15:25:52 +01:00 |
|
spencerrlongg
|
1cfd7673e0
|
change Importer.php back
|
2023-09-14 16:11:24 -05: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
|
dcae5503c8
|
Use $attributes array
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-14 13:52:57 +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 |
|
snipe
|
c7b24821b3
|
Merge pull request #13549 from inietov/fixes/attempt_to_read_property_id_on_null
Fixed ErrorException: Attempt to read property "id" on null (rollbar #3541)
|
2023-09-14 12:50:54 +01:00 |
|
spencerrlongg
|
64a9859efd
|
cleanup
|
2023-09-13 17:58:33 -05:00 |
|
Ivan Nieto Vivanco
|
439e031911
|
Evaluate if the event properties exists before run the CheckoutAcceptance query
|
2023-09-13 16:35:10 -06:00 |
|
spencerrlongg
|
0368b9df43
|
viola
|
2023-09-13 17:16:17 -05:00 |
|
spencerrlongg
|
951521dc81
|
push
|
2023-09-13 15:20:55 -05:00 |
|
Marcus Moore
|
11208ee064
|
Guard against attempting to send notification to model that isn't notifiable
|
2023-09-13 12:56:27 -07:00 |
|
spencerrlongg
|
70a251de55
|
fix up gui edit
|
2023-09-13 13:51:14 -05:00 |
|
spencerrlongg
|
e21a8b6717
|
fix up this file
|
2023-09-12 18:11:36 -05:00 |
|
spencerrlongg
|
7047869367
|
cleanup
|
2023-09-12 18:03:13 -05:00 |
|
spencerrlongg
|
53d4fd1d0b
|
purchase_date
|
2023-09-12 18:01:33 -05:00 |
|
Brady Wetherington
|
c77f5eee8c
|
Merge branch 'develop' into snipeit_v7_laravel10
|
2023-09-12 12:04:42 +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 |
|
spencerrlongg
|
30dade1fba
|
cleanup
|
2023-09-11 17:35:12 -05:00 |
|
spencerrlongg
|
431af5f530
|
this works!!!!
|
2023-09-11 17:34:05 -05:00 |
|
spencerrlongg
|
3e3bb594ea
|
some import stuff
|
2023-09-11 17:34:04 -05:00 |
|
spencerrlongg
|
fb001caee4
|
fix conflicts
|
2023-09-11 17:33:31 -05:00 |
|
spencerrlongg
|
3fb62874f0
|
quick push to check something else
|
2023-09-11 17:22:46 -05:00 |
|
spencerrlongg
|
c66804bcee
|
a little cleanup
|
2023-09-11 17:22:46 -05:00 |
|
slong753
|
27bea2abb9
|
just some more wip on the importer
|
2023-09-11 17:21:51 -05:00 |
|
slong753
|
1b18cd7fe6
|
added asset_eol_date and explicit to factory
|
2023-09-11 17:21:51 -05:00 |
|
slong753
|
78c400e948
|
fix conflicts
|
2023-09-11 17:21:50 -05:00 |
|
slong753
|
75d7e3e1a0
|
fix conflicts
|
2023-09-11 17:20:21 -05:00 |
|
slong753
|
5948679a4a
|
fix purchase date update
|
2023-09-11 17:17:59 -05:00 |
|
slong753
|
774f21bb7f
|
some more cleanup
|
2023-09-11 17:17:59 -05:00 |
|
slong753
|
20367eecc9
|
fix conflicts
|
2023-09-11 17:17:59 -05:00 |
|
slong753
|
cda9dd57dd
|
asset update logic
|
2023-09-11 17:15:25 -05:00 |
|
slong753
|
41b65bd9a2
|
small changes
|
2023-09-11 17:15:25 -05:00 |
|
slong753
|
17a83129b9
|
this all needs to be tested tediously
|
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 |
|
slong753
|
8456b3ec0c
|
wip stuff
|
2023-09-11 16:51:40 -05: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 |
|
snipe
|
7f892bf5ef
|
Merge pull request #13574 from inietov/fixes/unaccepted_assets_report_incorrect
Fixed Unaccepted Assets report has incorrect people [freshdesk-37808]
|
2023-09-07 20:49:40 +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 |
|
Ivan Nieto Vivanco
|
1509c512a5
|
Add guard clauses around some License and LicenseSeat models functions
|
2023-09-06 11:54:11 -06:00 |
|
johnson-yi
|
5897f4d6d9
|
Add rtd_location_id to tracked changes on checkin actionlog
|
2023-09-06 00:36:48 +00: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
|
b17af38d8e
|
Merge pull request #12901 from Godmartinz/user_total_cost
Added users total cost of assets to user profile
|
2023-09-05 13:52:34 +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
|
f08cef8664
|
Merge pull request #13556 from snipe/feature/sc-23684
Added model name and number to dynamic url
|
2023-08-31 18:23:33 +01:00 |
|
snipe
|
e192cbbbe1
|
Merge pull request #13550 from marcusmoore/remove-dusk
Removed Dusk
|
2023-08-31 18:06:04 +01:00 |
|
snipe
|
83b178f5b2
|
Added model name and number to dynamic url
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-31 18:03:32 +01: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 |
|
Marcus Moore
|
5828d29952
|
Remove Dusk
|
2023-08-30 16:43:18 -07:00 |
|
snipe
|
663faffcc1
|
Un-cast byod, validate as boolean
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-30 19:13:55 +01:00 |
|
Ivan Nieto Vivanco
|
3cf9c1fea5
|
Adds a null coalescing operator to the license seat checkin notification
|
2023-08-30 11:57:29 -06:00 |
|
Ivan Nieto Vivanco
|
085a993340
|
Early return if no asset is found
|
2023-08-30 11:05:58 -06:00 |
|
snipe
|
2a93c38830
|
Don’t cast as boolean, validate as boolean
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-30 16:40:28 +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 |
|
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 |
|
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
|
18ff810d7e
|
Reverse orderof parent
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-28 20:51:52 +01: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
|
e56628499c
|
fixed lost changes
|
2023-08-24 11:45:23 -07:00 |
|
Godfrey M
|
2b7a899ef8
|
removed unnecessary code
|
2023-08-24 11:43:44 -07:00 |
|
Godfrey M
|
18cb514a53
|
revert unwanted changes
|
2023-08-24 10:40:44 -07:00 |
|