Godfrey M
|
e2679852ce
|
added export button, half the logic for export method
|
2024-04-10 11:31:30 -07:00 |
|
Marcus Moore
|
deaba46e1c
|
Merge branch 'develop' into chore/sc-25103/add-tests-around-asset-checkout
|
2024-04-10 11:01:35 -07:00 |
|
snipe
|
989dab6259
|
Moved company scoping methods to group them together
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-10 14:35:13 +01:00 |
|
snipe
|
adacdc038d
|
Apply company scoping for users
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-10 12:34:32 +01:00 |
|
Marcus Moore
|
1aeaa0094a
|
Fix assigned to in labels
|
2024-04-09 13:52:54 -07:00 |
|
spencerrlongg
|
99d7155729
|
translation strings
|
2024-04-07 19:50:53 -05:00 |
|
spencerrlongg
|
f30439a544
|
small refactor, pretty much good to go now though
|
2024-04-07 17:07:46 -05:00 |
|
spencerrlongg
|
997eddfed1
|
cleanup + notes for monday
|
2024-04-04 18:23:03 -05:00 |
|
Godfrey M
|
d548b800d5
|
nullifies location after ldap user sync
|
2024-04-04 15:43:33 -07:00 |
|
spencerrlongg
|
52340aca78
|
just about wrapped up
|
2024-04-04 17:41:10 -05:00 |
|
spencerrlongg
|
e1fb446888
|
this is a pretty good start, need to know about other PR
|
2024-04-04 14:20:03 -05: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 |
|
steve@degga.net
|
bf10fd0cf0
|
Rename dynamicUrl() method
|
2024-03-31 22:37:41 -04:00 |
|
steve@degga.net
|
f7bbec6be4
|
Makes all manufacturer URLs dynamic, not just warranty lookup.
|
2024-03-31 22:18:44 -04: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
|
0d3d172108
|
Make last_checkin searchable and fillable
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-27 20:37:40 +00: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 |
|
spencerrlongg
|
1d4a7a7b02
|
added audit dates
|
2024-03-27 14:05:30 -05: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 |
|
spencerrlongg
|
701411c1b9
|
get rid of a couple unnecessary changes
|
2024-03-27 13:53:57 -05: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 |
|
spencerrlongg
|
39c15b2868
|
reformat array
|
2024-03-27 10:35:25 -05: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 |
|
Phil J R
|
afe1cb8234
|
Create LabelWriter_1933081.php
Added a longer version of the existing label (25 x 54mm vs. 25 x 89mm) due to better availability and to support longer asset names.
|
2024-03-26 08:29:47 +00:00 |
|
Phil J R
|
f836342194
|
Rename Label_Writer_2112283.php to LabelWriter_2112283.php
Fix the name of LabelWWriter_2112283 to be consistent with the existing one.
|
2024-03-26 08:16:00 +00:00 |
|
spencerrlongg
|
5cf1a6c300
|
new validator for radio buttons
|
2024-03-25 21:03:13 -05:00 |
|
Marcus Moore
|
5815607924
|
Add validation for pwd_secure_complexity
|
2024-03-25 17:45:41 -07:00 |
|
Marcus Moore
|
57d1c036ec
|
Improve method name
|
2024-03-25 13:53:30 -07:00 |
|
Marcus Moore
|
71722b753d
|
Little bit of clean up
|
2024-03-25 13:49:03 -07:00 |
|
Marcus Moore
|
a2625c889a
|
Improve comment
|
2024-03-25 13:48:32 -07:00 |
|
Marcus Moore
|
c98b9da612
|
Pass last_audit_date through for model level validation if not a date
|
2024-03-25 13:47:24 -07:00 |
|
Marcus Moore
|
5f4c964309
|
Account for last_audit_date not being provided
|
2024-03-25 12:45:11 -07:00 |
|
Marcus Moore
|
66ba96d531
|
Set last_audit_date to valid format in StoreAssetRequest
|
2024-03-25 12:38:12 -07:00 |
|