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