Skip to content

Commit 47de748

Browse files
authored
Merge branch 'main' into copilot/add-policy-to-override-settings-folder-location
2 parents fedc544 + 8c2865f commit 47de748

File tree

7 files changed

+19
-14
lines changed

7 files changed

+19
-14
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Streamline and simplify your network administration and troubleshooting with <strong>NETworkManager</strong>. Connect, monitor, and troubleshoot your network and server infrastructure using built-in tools like Remote Desktop (RDP), PuTTY (SSH, Serial, etc.), PowerShell (WSL, K9s, etc.) and TigerVNC (VNC). Perform in-depth network diagnostics with features including WiFi Analyzer, IP Scanner, Port Scanner, Ping Monitor, Traceroute, DNS Lookup, LLDP/CDP Capture, and <a href="https://borntoberoot.net/NETworkManager/docs/introduction">many more</a> — all in a clean, unified interface.
99
</p>
1010
<p>
11-
Organize hosts and networks in profiles with seamless access across all features. Profile files can be encrypted to protect your sensitive data and used to separate different customers or environments. NETworkManager is enterprise-ready with an MSI installer, signed binaries, and support for package managers like Chocolatey, Evergreen, and WinGet. Available in over 16 languages with customizable light/dark themes and accent colors.
11+
Organize hosts and networks in profiles with seamless access across all features. Profile files can be encrypted to protect your sensitive data and used to separate different customers or environments. NETworkManager is enterprise-ready with an MSI installer, signed binaries, system-wide policies for centralized configuration, and support for package managers like Chocolatey, Evergreen, and WinGet. Available in over 16 languages with customizable light/dark themes and accent colors.
1212
</p>
1313
<p>
1414
<a href="https://borntoberoot.net/NETworkManager/download" target="_blank">
@@ -73,7 +73,7 @@ Here's why you'll love it:
7373
- 🔍 **Analyze & Troubleshoot** - Deep network diagnostics with WiFi Analyzer, IP Scanner, Port Scanners, Ping Monitor, Traceroute, DNS Lookup, LLDP/CDP Capture, and <a href="https://borntoberoot.net/NETworkManager/docs/introduction">many more</a>.
7474
- 🔐 **Secure Profiles** - Organize hosts and networks in profiles with seamless access across all features. Encrypt profile files and separate them by customer or environment.
7575
- 💎 **Open Source & Free** - No ads, no subscriptions, no selling your data, fully community-driven.
76-
- 🏢 **Enterprise-Ready** - MSI installer, signed binaries, and package manager support (Chocolatey, Evergreen, and WinGet).
76+
- 🏢 **Enterprise-Ready** - MSI installer, signed binaries, [system-wide policies](https://borntoberoot.net/NETworkManager/docs/system-wide-policies) for centralized configuration, and package manager support (Chocolatey, Evergreen, and WinGet).
7777
- 🎨 **Personalized Experience** - Available in 16+ languages, with customizable light/dark themes and accent colors.
7878

7979
📖 Explore all features in detail in our [documentation](https://borntoberoot.net/NETworkManager/docs/introduction).

Source/NETworkManager.Localization/Resources/Strings.ja-JP.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3961,6 +3961,6 @@ Windows の「設定」&gt;「プライバシーとセキュリティ」&gt;「
39613961
<value>最も古いものが削除されるまで保持されるバックアップの数。</value>
39623962
</data>
39633963
<data name="SettingManagedByAdministrator" xml:space="preserve">
3964-
<value>This setting is managed by your administrator.</value>
3964+
<value>この設定は管理者によって管理されています。</value>
39653965
</data>
39663966
</root>

Source/global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.102",
3+
"version": "10.0.103",
44
"rollForward": "latestFeature",
55
"allowPrerelease": false
66
}

Website/docs/introduction.mdx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ Organize hosts and networks in profiles with individual settings, and use them s
4444
Keep your sensitive data secure with encrypted profile files, and manage customers or environments by using
4545
different profile files. See the [Groups and Profiles](./groups-and-profiles.md) section for more information.
4646

47+
## System-Wide Policies
48+
49+
Administrators can enforce specific settings for all users on a machine using system-wide policies. Policies are defined in a `config.json` file placed in the application installation directory and override user-specific settings, providing centralized control over application behavior in enterprise environments. See the [System-Wide Policies](./system-wide-policies.md) section for more information.
50+
4751
## Customization
4852

4953
NETworkManager comes with a dark and light theme and multiple accent colors. You can also provide your own custom

Website/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"prism-react-renderer": "^2.4.1",
2323
"react": "^19.2.4",
2424
"react-dom": "^19.2.4",
25-
"react-image-gallery": "^2.0.7"
25+
"react-image-gallery": "^2.0.8"
2626
},
2727
"devDependencies": {
2828
"@docusaurus/module-type-aliases": "3.9.2",

Website/src/components/HomepageFeatures/index.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@ const FeatureList = [
4747
<>
4848
Diagnose and resolve issues effectively with a comprehensive suite of
4949
tools in one place. It's enterprise-ready — includes an MSI installer for
50-
centralized deployment, signed binaries, translations in 16+ languages,
51-
and distribution via package managers like winget and Chocolatey.
50+
centralized deployment, signed binaries, system-wide policies for
51+
centralized configuration, translations in 16+ languages, and
52+
distribution via package managers like winget and Chocolatey.
5253
</>
5354
),
5455
},

Website/yarn.lock

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7352,9 +7352,9 @@ pupa@^3.1.0:
73527352
escape-goat "^4.0.0"
73537353

73547354
qs@~6.14.0:
7355-
version "6.14.1"
7356-
resolved "https://registry.yarnpkg.com/qs/-/qs-6.14.1.tgz#a41d85b9d3902f31d27861790506294881871159"
7357-
integrity sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==
7355+
version "6.14.2"
7356+
resolved "https://registry.yarnpkg.com/qs/-/qs-6.14.2.tgz#b5634cf9d9ad9898e31fba3504e866e8efb6798c"
7357+
integrity sha512-V/yCWTTF7VJ9hIh18Ugr2zhJMP01MY7c5kh4J870L7imm6/DIzBsNLTXzMwUA3yZ5b/KBqLx8Kp3uRvd7xSe3Q==
73587358
dependencies:
73597359
side-channel "^1.1.0"
73607360

@@ -7428,10 +7428,10 @@ react-fast-compare@^3.2.0:
74287428
react-fast-compare "^3.2.0"
74297429
shallowequal "^1.1.0"
74307430

7431-
react-image-gallery@^2.0.7:
7432-
version "2.0.7"
7433-
resolved "https://registry.yarnpkg.com/react-image-gallery/-/react-image-gallery-2.0.7.tgz#b72ea60f0ce3d3588701c8ab0fe7010093dcfd02"
7434-
integrity sha512-JP+EKjf+PKIbNMbKlDUCIIz4zV+ZKfFlHHxwMOF+3ztkNTGI44fsrAUVpjXcSOr44lbnNXwdWwqEPbtxf7+ksQ==
7431+
react-image-gallery@^2.0.8:
7432+
version "2.0.8"
7433+
resolved "https://registry.yarnpkg.com/react-image-gallery/-/react-image-gallery-2.0.8.tgz#b463c868a1486d8f6653d7d82efdfe0e7ab2d4ea"
7434+
integrity sha512-zI7Z8Zj4vGwYrF0iwQFSbIfT38tShlq1Phv9w/vjadlB4pWRgtr7RMcPTm44Ye2heTA3SorMevEAd3C8CEJ8fg==
74357435

74367436
react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0:
74377437
version "16.13.1"

0 commit comments

Comments
 (0)