Marcus Moore
|
deaba46e1c
|
Merge branch 'develop' into chore/sc-25103/add-tests-around-asset-checkout
|
2024-04-10 11:01:35 -07:00 |
|
snipe
|
adacdc038d
|
Apply company scoping for users
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-10 12:34:32 +01:00 |
|
snipe
|
e11287ec25
|
Redirect on checkin if the asset is already checked in
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-04 15:00:55 +01:00 |
|
snipe
|
a72d4e5dc1
|
Fixed ambiguous id clause in custom report
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-04 14:23:58 +01:00 |
|
spencerrlongg
|
0a90df2b14
|
alright conflicts resolved
|
2024-04-03 14:40:14 -05:00 |
|
Spencer Long
|
4ab75c1c03
|
Merge branch 'develop' into bug/sc-24884
|
2024-04-03 14:08:41 -05:00 |
|
Godfrey M
|
08f9aae8ae
|
adds note to log listener and checkout accept notif
|
2024-04-03 11:59:47 -07:00 |
|
Godfrey M
|
ce1d677cdc
|
adds note to acceptance
|
2024-04-03 11:36:03 -07:00 |
|
Godfrey M
|
bb2c73348d
|
only grabs custom Fields that are not encrpyted
|
2024-04-03 11:03:58 -07:00 |
|
Godfrey M
|
4327653d70
|
remove db cleaner for encrypted selections
|
2024-04-03 10:57:41 -07:00 |
|
Brady Wetherington
|
65e21faa3e
|
Merge branch 'develop' into snipeit_v7_laravel10
Hopefully, last merge?
|
2024-04-02 20:34:04 +01:00 |
|
snipe
|
f42e5d5292
|
Reverting the store/update asset API responses for now
This currently breaks the Jamf integration - need a better longer term plan.
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-28 21:58:49 +00:00 |
|
akemidx
|
721902c2d4
|
committed for later
|
2024-03-28 16:44:44 -04:00 |
|
snipe
|
1f2d30ebf4
|
Check that the array key exists
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-28 12:25:29 +00:00 |
|
akemidx
|
e6b366020a
|
lots of attempts and syntax, but no go
|
2024-03-27 19:05:59 -04:00 |
|
snipe
|
86677b5f13
|
Make last_checkin sortable
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-27 20:37:25 +00:00 |
|
spencerrlongg
|
cec84b857b
|
fixed last audit date + test
|
2024-03-27 14:39:23 -05:00 |
|
Robert Spadaro
|
ccd00caa70
|
Wrap where logic in additional where statement to protect appended params
|
2024-03-27 15:36:00 -04:00 |
|
snipe
|
545a185614
|
Merge pull request #14262 from akemidx/bug/sc-24812
Last Checkin Date added to Hardware View and Index
|
2024-03-27 19:02:25 +00:00 |
|
Spencer Long
|
013463aafc
|
Merge branch 'develop' into bug/sc-24884
|
2024-03-27 12:45:45 -05:00 |
|
snipe
|
8bc9688d71
|
Added ability to filter on category ID and model ID from user’s asset API
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-27 16:04:00 +00:00 |
|
Godfrey M
|
aa8af2220c
|
trying to remove an encrypted field but not all fields
|
2024-03-26 16:10:08 -07:00 |
|
snipe
|
ae403da8c1
|
Merge pull request #14502 from marcusmoore/bug/sc-25004/pwd_secure_complexity-validation
Added validation around `pwd_secure_complexity`
|
2024-03-26 20:05:04 +00:00 |
|
snipe
|
850f85ff59
|
Merge pull request #14369 from spencerrlongg/bug/sc-24343
Add new validator for custom field checkboxes and fix asset model default updates
|
2024-03-26 19:22:29 +00:00 |
|
snipe
|
3ced85080a
|
Fixed #14495 - Allow user_id to be passed to limit to only specific admins
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-26 14:45:20 +00:00 |
|
Marcus Moore
|
5815607924
|
Add validation for pwd_secure_complexity
|
2024-03-25 17:45:41 -07:00 |
|
spencerrlongg
|
7e4a0eedf0
|
rm dumb note
|
2024-03-25 10:46:26 -05:00 |
|
Godfrey M
|
633249b08a
|
user assets get updated when a user changes location
|
2024-03-21 15:15:40 -07:00 |
|
Godfrey M
|
21c3b1fbd2
|
rename declined message to note, increased width of textarea
|
2024-03-21 14:03:25 -07:00 |
|
snipe
|
828b84084d
|
Added validation for last_audit_date and next_audit_date
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-21 18:29:38 +00:00 |
|
spencerrlongg
|
be282dd038
|
resolve a couple issues
|
2024-03-21 09:26:45 -05:00 |
|
snipe
|
c4b7e77498
|
Merge pull request #14089 from spencerrlongg/bug/escaped_quotes_in_listbox
Use `htmlentities()` instead of `htmlspecialcharacters()` on Custom Field Listbox Values
|
2024-03-21 12:55:25 +00:00 |
|
snipe
|
91c7180bfd
|
Merge pull request #14469 from snipe/feature/sc-19515/2fa_reset_log
Added 2FA reset log entry
|
2024-03-21 12:52:22 +00:00 |
|
snipe
|
7c39f516b9
|
Merge pull request #14421 from marcusmoore/fixes/add-minimal-validation-around-asset-tags
Adds a minimal amount of validation around asset_tags in AssetsController
|
2024-03-21 00:04:44 +00:00 |
|
snipe
|
5ed2bd0fb7
|
Skip the normal edit observer
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-20 23:52:22 +00:00 |
|
snipe
|
2067b1138a
|
Added the log item
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-20 23:43:58 +00:00 |
|
Marcus Moore
|
530291f81c
|
Implement some tests
|
2024-03-20 14:28:27 -07:00 |
|
spencerrlongg
|
e7b9903341
|
delete some extra lines
|
2024-03-20 15:29:06 -05:00 |
|
spencerrlongg
|
d18aa1db98
|
some more cleanup + tests
|
2024-03-20 15:18:15 -05:00 |
|
Spencer Long
|
b4b4927370
|
Merge branch 'develop' into bug/sc-24884
|
2024-03-20 12:36:39 -05:00 |
|
spencerrlongg
|
0ffceb9691
|
some notes and a little progress
|
2024-03-20 00:07:52 -05:00 |
|
spencerrlongg
|
1e810d2426
|
most tests now passing, still one broken
|
2024-03-19 19:47:26 -05:00 |
|
Godfrey M
|
62745923cf
|
fixes API location delete
|
2024-03-19 15:25:28 -07:00 |
|
Godfrey M
|
090466123f
|
add withCount to query instead
|
2024-03-19 15:18:18 -07:00 |
|
Godfrey M
|
38a3e36cd6
|
fixes translation usage
|
2024-03-19 14:32:21 -07:00 |
|
Godfrey M
|
e8dc634a40
|
fixes translation usage
|
2024-03-19 14:30:53 -07:00 |
|
Godfrey M
|
b9986033cc
|
removed abbr. of variable, changed variable types in migration
|
2024-03-18 16:03:40 -07:00 |
|
Godfrey M
|
57f5d4a570
|
deleted_msg saves to db
|
2024-03-18 10:45:47 -07:00 |
|
Godfrey M
|
4588393b76
|
adds declined msg to mail notif, updates lang files and checkout acceptance controller
|
2024-03-18 10:25:55 -07:00 |
|
snipe
|
cce8cb4f5e
|
Move requestable scope below sorting, etc
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-14 13:24:22 +00:00 |
|