MrM
|
b69364d5ff
|
Add copy of encrypted custom fields
Encrypted custom fields may contain sensitive or important information, and it may be useful to have the ability to copy them.
|
2024-02-25 14:47:06 +01:00 |
|
snipe
|
10dad8e6e6
|
Merge pull request #14327 from snipe/fixes/better_ui_for_history_importer
Nicer UI for history importer
|
2024-02-23 11:43:15 +00:00 |
|
snipe
|
a184b4e67c
|
Nicer UI for history importer
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-23 11:40:10 +00:00 |
|
snipe
|
8cd0a90ecd
|
Merge pull request #14325 from snipe/fixes/RB-17890
Check for valid supplier in license view
|
2024-02-23 10:49:56 +00:00 |
|
snipe
|
4a37632ef3
|
Check for valid supplier in license view
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-23 10:48:53 +00:00 |
|
snipe
|
3271d020e9
|
Merge pull request #14319 from snipe/fixes/RB-17889
Check for activeFile before trying to get header on import
|
2024-02-23 08:19:21 +00:00 |
|
snipe
|
e494a2670f
|
Merge pull request #14321 from akemidx/accessory_pdf_dl_link
Adding in PDF download to Accesories/Asset/License Histories
|
2024-02-23 08:18:55 +00:00 |
|
snipe
|
d3a0a337b9
|
Merge pull request #14323 from ubc-cpsc/bugfix/CVE-2024-25117
Fixes CVE-2024-25117 php-svg-lib lacks path validation on font through SVG inline styles
|
2024-02-23 08:05:03 +00:00 |
|
Joël Pittet
|
3951ee746d
|
Fixes CVE-2024-25117, no other dependencies
|
2024-02-22 16:49:02 -08:00 |
|
Joël Pittet
|
84e4257e75
|
Fixes CVE-2024-25117
|
2024-02-22 16:40:08 -08:00 |
|
Marcus Moore
|
c401c88702
|
Scope event fake
|
2024-02-22 16:19:33 -08:00 |
|
Godfrey M
|
550f9e2afa
|
removes visibility checkmarks for certain fields when in new label engine
|
2024-02-22 16:19:28 -08:00 |
|
Marcus Moore
|
b55a19cebb
|
Add assertion event is dispatched with correct timestamp
|
2024-02-22 13:50:46 -08:00 |
|
Marcus Moore
|
4caadcfa19
|
Clear pending checkout acceptances when checking in asset via api
|
2024-02-22 13:33:16 -08:00 |
|
Marcus Moore
|
dba837b1d2
|
Move location migration logic to trait
|
2024-02-22 13:21:52 -08:00 |
|
Marcus Moore
|
714fc63050
|
Have legacy locations updated upon api asset checkin
|
2024-02-22 13:14:30 -08:00 |
|
spencerrlongg
|
b6fa6cba22
|
note before switching tasks
|
2024-02-22 15:01:14 -06:00 |
|
Marcus Moore
|
2df026bcb5
|
Allow updating asset default location when checking in asset via api
|
2024-02-22 12:40:14 -08:00 |
|
Godfrey M
|
6ee24a7527
|
remove unnecessary code reformat
|
2024-02-22 12:36:27 -08:00 |
|
Godfrey M
|
e2dcee1959
|
cleans up dead code
|
2024-02-22 12:26:57 -08:00 |
|
Godfrey M
|
4fbea9512f
|
puts textY inside of the forloop
|
2024-02-22 12:08:47 -08:00 |
|
Godfrey M
|
b7850ab839
|
puts textY outside of the forloop
|
2024-02-22 12:08:04 -08:00 |
|
Godfrey M
|
c0215baca5
|
minor changes
|
2024-02-22 11:41:04 -08:00 |
|
Godfrey M
|
c62758c5b5
|
adds custom field select to default label view
|
2024-02-22 11:36:39 -08:00 |
|
spencerrlongg
|
14358651e4
|
pushing to test other branches
|
2024-02-22 13:28:23 -06:00 |
|
snipe
|
f04aeb9f2b
|
Fixed spacing
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-22 18:31:02 +00:00 |
|
snipe
|
dc902e7a5a
|
Fixed return type
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-22 18:30:23 +00:00 |
|
snipe
|
4fc66e19bb
|
Check for activeFile before trying to get header
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-22 18:28:01 +00:00 |
|
snipe
|
e12d2b2a42
|
Merge pull request #14317 from snipe/fixes/make_website_searchable_on_users_list
Made website searchable on users table
|
2024-02-22 17:01:58 +00:00 |
|
snipe
|
cb78451d6c
|
Made website searchable on users table
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-22 16:13:54 +00:00 |
|
snipe
|
7979bc63ae
|
Merge pull request #14316 from snipe/feature/sc-24871
Added email, phone icons
|
2024-02-22 14:50:46 +00:00 |
|
snipe
|
e8ad8a7448
|
Added email, phone icons
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-22 14:48:01 +00:00 |
|
snipe
|
eb61f5aa9e
|
Merge pull request #14315 from snipe/fixes/rb-3565
Only send notification if the item is assigned to a person
|
2024-02-22 12:05:59 +00:00 |
|
snipe
|
3351998efd
|
Only send notification if the item is assigned to a person
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-22 12:03:07 +00:00 |
|
spencerrlongg
|
20dbacd22f
|
store good, update needs work
|
2024-02-21 21:33:34 -06:00 |
|
akemidx
|
0f3be4fdf8
|
adding in eula pdf dl link. mimics activity log
|
2024-02-21 17:45:10 -05:00 |
|
Marcus Moore
|
3ae8adfbf9
|
Remove incomplete flag on test case
|
2024-02-21 12:33:32 -08:00 |
|
Marcus Moore
|
aa2632fe46
|
Merge branch 'develop' into chore/sc-24808
|
2024-02-21 12:33:06 -08:00 |
|
Brady Wetherington
|
8f2843bfcf
|
Merge branch 'develop' into snipeit_v7_laravel10
Had to re-generate composer.lock, and re-do package.json and rebuild assets as well.
|
2024-02-21 20:22:28 +00:00 |
|
Godfrey M
|
14c86d447b
|
added filter to collectifunction
|
2024-02-21 11:38:03 -08:00 |
|
Godfrey M
|
bee016e0be
|
keeps example values in the example preview, fixes indent
|
2024-02-21 09:31:01 -08:00 |
|
snipe
|
54552fc95c
|
Merge pull request #14192 from inietov/fixes/api_issue_checkin_licenses
Fixed #14183 API /hardware/:id/checkin doesn't return Licenses
|
2024-02-21 11:35:06 +00:00 |
|
akemidx
|
9397372f87
|
permissions, but they are now all in their own column because reasons???
|
2024-02-20 18:48:17 -05:00 |
|
akemidx
|
8bbf6da052
|
user block, trying to pick out ONLY permissions we wanna see
|
2024-02-20 18:25:41 -05:00 |
|
snipe
|
ffa7d25fc0
|
Merge pull request #14308 from snipe/fixes/eager_load_relations_on_locations
Eager load relations to determine deletability on locations
|
2024-02-20 22:28:39 +00:00 |
|
snipe
|
a37d3b00d0
|
Merge pull request #14307 from marcusmoore/bug/sc-24867
Fixed title not appearing in new label engine
|
2024-02-20 22:25:45 +00:00 |
|
snipe
|
04891c7c61
|
Eager load relations to determine
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-20 22:25:00 +00:00 |
|
spencerrlongg
|
d67ff54f4b
|
temporary decrypt, almost there
|
2024-02-20 16:20:03 -06:00 |
|
Marcus Moore
|
ccec190985
|
Set label title properly
|
2024-02-20 13:59:50 -08:00 |
|
spencerrlongg
|
26728a85ad
|
this seems to work for patches
|
2024-02-20 13:18:40 -06:00 |
|