Ivan Nieto Vivanco
|
ec8cb1b09e
|
Add the withTrashed() method to requestingUser() method in CheckoutRequest model, so the view of requestable assets doesn't crash
|
2023-07-10 16:34:00 -06:00 |
|
snipe
|
4845a88c68
|
Merge pull request #13280 from snipe/security/webpack-upgade
[Snyk] Upgrade webpack from 5.86.0 to 5.87.0 #13267
|
2023-07-10 20:17:44 +01:00 |
|
snipe
|
73c2202d94
|
[Snyk] Upgrade webpack from 5.86.0 to 5.87.0 #13267
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-10 20:16:09 +01:00 |
|
snipe
|
0d37d1a905
|
Merge pull request #13279 from snipe/security/acorn-upgrade
Upgraded acorn
|
2023-07-10 20:08:46 +01:00 |
|
snipe
|
83cf106ce5
|
Upgraded acorn
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-10 20:06:57 +01:00 |
|
snipe
|
7debf126d6
|
Dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-10 20:03:12 +01:00 |
|
snipe
|
c5c87ea0ca
|
Merge pull request #13278 from snipe/security/bs-tables-update
Applied Snyk #13272
|
2023-07-10 20:01:41 +01:00 |
|
snipe
|
8169206943
|
Applied Snyk #13272
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-10 19:59:08 +01:00 |
|
snipe
|
22d9df304b
|
Merge pull request #13265 from marcusmoore/chore/chipperci-on-prs
Have ChipperCi run on each PR
|
2023-07-10 19:48:40 +01:00 |
|
snipe
|
14c61e4c17
|
Added phone, fax to departments, locations, companies
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-10 19:44:21 +01:00 |
|
Joël Pittet
|
a4a676ef0b
|
Update league/oauth2-server for CVE-2023-3726 and lcobucci/clock to semver to allow dependencies to update
|
2023-07-10 11:19:54 -07:00 |
|
Ivan Nieto Vivanco
|
299e546021
|
Adds the Username and Email to License Importer dropdown
|
2023-07-06 18:36:13 -06:00 |
|
snipe
|
5a9c2925c3
|
Merge pull request #13264 from marcusmoore/bug/sc-23451
Fix label wrapping on category edit page
|
2023-07-06 19:01:36 +01:00 |
|
Marcus Moore
|
149184dc3c
|
Have ChipperCI on on each PR
Following up on #13218
|
2023-07-06 11:00:03 -07:00 |
|
Marcus Moore
|
ef160b0e15
|
Add span tag so label is displayed properly
|
2023-07-06 10:49:57 -07:00 |
|
Ivan Nieto Vivanco
|
f4ca29b4a8
|
Only show radio inputs for location in checkin view
|
2023-07-06 11:36:55 -06:00 |
|
Ivan Nieto Vivanco
|
9591442f1e
|
Evaluate the radio input to update location only or default location too
|
2023-07-06 10:46:21 -06:00 |
|
Ivan Nieto Vivanco
|
743e852998
|
Add radio buttons to alter asset checkin location behavior
|
2023-07-06 10:38:48 -06:00 |
|
snipe
|
2faa73f983
|
Merge pull request #13169 from akemidx/license_sn_check1
Making Serial Number the logic checked against for new imports
|
2023-07-06 16:40:27 +01:00 |
|
snipe
|
d37aaee4c8
|
Merge pull request #13257 from snipe/fixes/check_for_ceiling_in_upgrader
Check for max PHP version in upgrader
|
2023-07-06 16:07:10 +01:00 |
|
snipe
|
a9d175a396
|
Check for max PHP version
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-05 18:47:48 +01:00 |
|
snipe
|
35039cd590
|
Merge pull request #13255 from snipe/fixes/larger_field_for_idp_meta
Change settings table `saml_idp_metadata` to MEDIUMTEXT
|
2023-07-05 17:30:02 +01:00 |
|
snipe
|
c85a33be6a
|
Change settings table saml_idp_metadata to MEDIUMTEXT
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-05 17:28:08 +01:00 |
|
snipe
|
d890d923ff
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-05 14:40:54 +01:00 |
|
snipe
|
4b4983e550
|
Merge pull request #13253 from uberbrady/improve_scim_404s
Properly return SCIM Exceptions
|
2023-07-05 14:37:32 +01:00 |
|
Brady Wetherington
|
a6a89ddd6c
|
Also log(debug) the error - could be useful for troubleshooting
|
2023-07-05 14:31:08 +01:00 |
|
Brady Wetherington
|
1f4d2f1e4a
|
Properly return SCIM Exceptions
|
2023-07-05 14:27:10 +01:00 |
|
Godfrey M
|
d44e667697
|
fixed margin if qr_code present
|
2023-06-29 13:37:38 -07:00 |
|
snipe
|
bbbeaaee2b
|
Merge pull request #13232 from Godmartinz/labels_overlapping_issue
fixed barcode and info from overlapping
|
2023-06-29 21:23:31 +01:00 |
|
Godfrey M
|
df90e924b4
|
prevent labels from overlapping
|
2023-06-29 13:18:17 -07:00 |
|
snipe
|
630b6496ec
|
Merge pull request #13231 from snipe/fixes/small_fix_for_error_during_seeding
Redirect if the license can’t be found
|
2023-06-29 21:18:02 +01:00 |
|
snipe
|
7937542dcb
|
Redirect if the license can’t be found
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-29 21:15:50 +01:00 |
|
akemidx
|
d0212d4bda
|
formatting fix
|
2023-06-29 15:39:19 -04:00 |
|
snipe
|
e236bf412c
|
Merge pull request #13230 from snipe/fixes/windows_backup_filename_colon_wtf_issue
Fixed windows backup filename - swapped colon in timestamp to hyphen to handle windows filesystems
|
2023-06-29 20:37:09 +01:00 |
|
snipe
|
fb9b3a5453
|
Switched from a colon to a hyphen to handle windows filesystems
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-29 20:32:20 +01:00 |
|
snipe
|
faf2a235fb
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-29 20:31:13 +01:00 |
|
snipe
|
9f99f8275c
|
Merge pull request #13229 from Godmartinz/status_label_color
fixed custom fields labels being unreadable
|
2023-06-29 20:21:46 +01:00 |
|
Godfrey M
|
f83effbb85
|
removed unnecessary css rule
|
2023-06-29 11:25:40 -07:00 |
|
Godfrey M
|
d4cddebba5
|
fixes custom fields labels being unreadable
|
2023-06-29 11:21:21 -07:00 |
|
snipe
|
825e988dfa
|
Merge pull request #13228 from snipe/bug/sc-23434
Use proper alias for table scope
|
2023-06-29 17:11:50 +01:00 |
|
snipe
|
bcefe73c9c
|
Use proper alias for table scope
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-29 16:52:09 +01:00 |
|
snipe
|
a3096e1b47
|
Merge pull request #13219 from inietov/features/cancel_request_asset
Cancel requested assets without checkin/out [ch-17606]
|
2023-06-29 16:18:13 +01:00 |
|
snipe
|
16ce06a3cc
|
Merge pull request #13222 from snipe/feature/sc-23427
Fixed #13213 - Use the Helper::parseEscapedMarkedown in notes
|
2023-06-29 16:16:25 +01:00 |
|
snipe
|
8be3a6985b
|
Merge pull request #13227 from snipe/bug/sc-23433
More reshuffling of scopes in assets API
|
2023-06-29 16:10:26 +01:00 |
|
snipe
|
4c3a306a6e
|
More shuffling of scopes
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-29 13:35:41 +01:00 |
|
Ivan Nieto Vivanco
|
011726154c
|
Set rtd_location if a location is given at checkin
|
2023-06-29 03:16:59 -06:00 |
|
akemidx
|
af03b9f140
|
user department clarification & translation for that phrase. will be used in a later PR
|
2023-06-28 17:45:13 -04:00 |
|
snipe
|
f7f2d799f2
|
Merge pull request #13223 from inietov/fixes/delete_notes_map_from_asset_importer
Delete notes column map from assets importer
|
2023-06-28 20:06:33 +01:00 |
|
Ivan Nieto Vivanco
|
a4b8723dcb
|
Delete notes column map from assets importer
|
2023-06-28 11:38:51 -06:00 |
|
Ivan Nieto Vivanco
|
e2c2736a9c
|
Delete (gulp) Form for bulk edit since is not used in this view
|
2023-06-28 11:23:37 -06:00 |
|