snyk-bot
|
e8f0f1cf48
|
fix: upgrade bootstrap-table from 1.22.3 to 1.22.4
Snyk has created this PR to upgrade bootstrap-table from 1.22.3 to 1.22.4.
See this package in npm:
https://www.npmjs.com/package/bootstrap-table
See this project in Snyk:
https://app.snyk.io/org/snipe/project/3d53e1dd-b8bf-46b5-ba61-18ce26933166?utm_source=github&utm_medium=referral&page=upgrade-pr
|
2024-04-17 04:27:39 +00:00 |
|
snipe
|
fce98b9ca4
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/dist/skins/skin-black-dark.css
# public/css/dist/skins/skin-black-dark.min.css
# public/css/dist/skins/skin-blue-dark.css
# public/css/dist/skins/skin-blue-dark.min.css
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/css/dist/skins/skin-orange-dark.css
# public/css/dist/skins/skin-orange-dark.min.css
# public/css/dist/skins/skin-purple-dark.css
# public/css/dist/skins/skin-purple-dark.min.css
# public/css/dist/skins/skin-red-dark.css
# public/css/dist/skins/skin-red-dark.min.css
# public/css/dist/skins/skin-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/mix-manifest.json
|
2024-04-11 18:58:50 +01:00 |
|
|
snipe
|
c0dcae16f7
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-11 18:57:06 +01:00 |
|
|
snipe
|
da21424416
|
Merge pull request #14581 from marcusmoore/bug/sc-25237
Fixed assigned to field in new label engine
|
2024-04-11 15:36:18 +01:00 |
|
|
snipe
|
b5c83721ad
|
Merge pull request #14577 from Godmartinz/signature_pad_upgrade
Upgraded Signature-pad.js && Fixed Resizing Canvas on mobile
|
2024-04-11 15:35:47 +01:00 |
|
|
snipe
|
9b21fca1a0
|
Merge pull request #14558 from akemidx/bug/sc-25192
Fixed: Header Dropdown Menus had no hover coloring in dark themes
|
2024-04-11 15:35:33 +01:00 |
|
|
snipe
|
af94b07771
|
Merge pull request #14582 from akemidx/feature/sc-25288
Reduce Extra Space in Header Dropdown
|
2024-04-11 15:35:11 +01:00 |
|
akemidx
|
f0aefaac42
|
padding fix
|
2024-04-09 17:51:42 -04:00 |
|
Marcus Moore
|
1aeaa0094a
|
Fix assigned to in labels
|
2024-04-09 13:52:54 -07:00 |
|
|
akemidx
|
6d3fa12f37
|
white texty for dropdown lists
|
2024-04-09 14:52:43 -04:00 |
|
Godfrey M
|
052f1eedd0
|
fixes signature canvas refresh on mobile
|
2024-04-09 10:30:33 -07:00 |
|
|
Godfrey M
|
858da800be
|
attempting to lock screen orientation
|
2024-04-09 09:40:39 -07:00 |
|
|
snipe
|
954cac3af7
|
Merge remote-tracking branch 'origin/develop'
|
2024-04-08 10:56:04 +01:00 |
|
|
snipe
|
d0f171ebc6
|
Merge pull request #14567 from snipe/bug/sc-25257
Remove city as required field on location modal
|
2024-04-08 10:54:09 +01:00 |
|
|
snipe
|
90cf612ac7
|
Remove city as required field on location modal
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-08 10:50:52 +01:00 |
|
|
snipe
|
802b5863ab
|
Merge remote-tracking branch 'origin/develop'
|
2024-04-08 08:49:54 +01:00 |
|
|
snipe
|
4baa949a99
|
Merge pull request #14557 from Godmartinz/add-audit-date-to-labels
Added audit dates to label options
|
2024-04-08 04:59:53 +01:00 |
|
|
snipe
|
3bed04a6d3
|
Merge pull request #14559 from Godmartinz/ldap_location_bug
Fixed ldap location syncing incorrect locations for users.
|
2024-04-08 04:59:27 +01:00 |
|
|
Godfrey M
|
d548b800d5
|
nullifies location after ldap user sync
|
2024-04-04 15:43:33 -07:00 |
|
|
akemidx
|
f7f199d929
|
black hover bg for dark yellow theme
|
2024-04-04 15:51:46 -04:00 |
|
|
akemidx
|
5519fddb78
|
new clean branch for color change
|
2024-04-04 15:50:30 -04:00 |
|
|
Godfrey M
|
a9ed748fb2
|
adds audit dates to label options
|
2024-04-04 11:39:49 -07:00 |
|
|
snipe
|
dcba2bfd25
|
Merge pull request #14529 from mauro-miatello/develop
Hide/Show encrypted values in hardware list
|
2024-04-04 15:07:58 +01:00 |
|
|
snipe
|
72c91ead8b
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
|
2024-04-04 15:06:37 +01:00 |
|
|
snipe
|
774d0aa90c
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-04 15:05:35 +01:00 |
|
|
snipe
|
2eea67ce34
|
Merge pull request #14547 from Godmartinz/user-dropdown-media-change
Fixed alignment of dropdown menu for user in nav bar
|
2024-04-04 15:04:36 +01:00 |
|
|
snipe
|
db1c44f921
|
Merge pull request #14552 from snipe/bug/sc-25229/redirect_if_already_checked_in
Redirect on checkin if the asset is already checked in
|
2024-04-04 15:01:43 +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
|
4f10adfb76
|
Merge remote-tracking branch 'origin/develop'
|
2024-04-04 14:27:35 +01:00 |
|
|
snipe
|
f22803c59f
|
Merge pull request #14551 from snipe/bug/sc-25221/ambiguous_id_in_custom_report
Fixed ambiguous id clause in custom report
|
2024-04-04 14:25:43 +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 |
|
|
Godfrey M
|
5f7f4c9b91
|
aligns dropdown menu for user in nav
|
2024-04-03 10:41:50 -07:00 |
|
|
snipe
|
d44202e55b
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
|
2024-04-03 13:09:48 +01:00 |
|
|
snipe
|
df95447ea4
|
New dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-03 13:08:08 +01:00 |
|
|
snipe
|
01852c7188
|
Merge pull request #14520 from Godmartinz/loading_overlap_bug
fixes z-index of table load
|
2024-04-03 13:07:14 +01:00 |
|
|
snipe
|
79c5697042
|
Fixed dev - take 2!
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-03 13:06:49 +01:00 |
|
MrM
|
658ba092e2
|
Hide encrypted values in hardware list
Encrypted values are now hidden also in hardware list, clicking on them show the decrypted value
|
2024-03-31 18:55:58 +02:00 |
|
|
MrM
|
b221d99e7b
|
Encrypted values enhancement
Show asterisks instead of the value, respecting the length of the field
|
2024-03-31 12:27:35 +02:00 |
|
|
snipe
|
b7af049589
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2024-03-29 13:20:22 +00:00 |
|
|
snipe
|
c2d863da99
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-29 13:19:22 +00:00 |
|
|
snipe
|
6f9ba6ede4
|
Merge remote-tracking branch 'origin/develop'
|
2024-03-29 12:49:22 +00:00 |
|
|
snipe
|
df4e6a0023
|
Fixed typo in Polish
I will fix this in CrowdIn shortly
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-29 12:47:43 +00:00 |
|
|
snipe
|
d60fa65f85
|
Merge remote-tracking branch 'origin/develop'
|
2024-03-28 21:59:36 +00:00 |
|
|
snipe
|
8081a82fe4
|
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
|
2024-03-28 21:58:58 +00: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 |
|
|
snipe
|
5a3f5b03d0
|
Merge pull request #14456 from akemidx/feature/sc-25079/legacy-locations
Default Locale value changed to en-US
|
2024-03-28 21:47:40 +00:00 |
|
|
Godfrey M
|
a450530c74
|
fixes z-index of table load
|
2024-03-28 11:44:55 -07:00 |
|
|
snipe
|
2b4886f37f
|
Commented out Heroic deploy for now
|
2024-03-28 17:43:18 +00:00 |
|
|
snipe
|
b45de3e17f
|
Update README.md
Added alert notations
|
2024-03-28 17:41:46 +00:00 |
|
|
snipe
|
b2eea3e5a5
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/js/dist/all-defer.js
# public/mix-manifest.json
|
2024-03-28 13:02:51 +00:00 |
|