riccardom e92aa7dfb0 Resolve merge conflicts from main ...

- login.go: keep both new imports (mdm + nbnet + server)
- ios/NetBirdSDK/client.go: additive struct-field merge (mdmLoader + stateMu/connectClient/config)
- setconfig_mdm_test.go: adopt new withMDMPolicy(t, s, policy) signature; fix stray old-signature call in TestSetConfig_MDMAllow_ManagementURLPortNormalized

2026-07-28 11:04:04 +02:00

..

android

Merge branch 'main' into mdm_integration (with unresolved conflict markers)

2026-07-28 10:48:04 +02:00

anonymize

[management, client] Add IPv6 overlay support (#5631)

2026-05-07 11:33:37 +02:00

cmd

Resolve merge conflicts from main

2026-07-28 11:04:04 +02:00

configs

[client] make /var/lib/netbird paths configurable (#3084)

2025-01-13 10:15:01 +01:00

embed

Merge branch 'main' into mdm_integration (with unresolved conflict markers)

2026-07-28 10:48:04 +02:00

errors

[client] Fix error count formatting (#2641)

2024-09-24 20:57:56 +02:00

firewall

[client] Evaluate IP fragments against firewall ACLs (#6781)

2026-07-17 16:05:32 +02:00

grpc

[client] Add env var for management gRPC max receive message size (#5622)

2026-03-19 17:33:50 +01:00

iface

[client] Make Test_ConnectPeers deterministic under Docker/eBPF kernel / Darwin CI (#6884)

2026-07-24 15:23:22 +02:00

internal

Merge branch 'main' into mdm_integration (with unresolved conflict markers)

2026-07-28 10:48:04 +02:00

ios/NetBirdSDK

Resolve merge conflicts from main

2026-07-28 11:04:04 +02:00

jobexec

[Management/Client] Trigger debug bundle runs from API/Dashboard (#4592) (#4832)

2026-01-19 11:22:16 +01:00

mdm

Merge branch 'main' into mdm_integration (with unresolved conflict markers)

2026-07-28 10:48:04 +02:00

net

[client] Replace exclusion routes with scoped default + IP_BOUND_IF on macOS (#5918)

2026-04-20 10:01:01 +02:00

proto

[client] fix: re-generate gateway proto files (#6696)

2026-07-08 16:35:37 +02:00

server

Resolve merge conflicts from main

2026-07-28 11:04:04 +02:00

ssh

Merge remote-tracking branch 'origin/main' into 0.74.7-branch-sync

2026-07-17 16:34:58 +02:00

status

[client] Include system events in ToProtoFullStatus conversion (#6746)

2026-07-13 18:49:17 +02:00

system

[client, management] offload client config generation to the client (#6711)

2026-07-22 18:20:27 +02:00

test

[client] add json gateway for netbird daemon (#6272)

2026-07-07 16:58:48 +02:00

testdata

[management] Move testdata to sql files (#2693)

2024-10-10 12:35:03 +02:00

testutil/privileged

[client] Categorize privileged tests behind a build tag and run them in Docker (#6425)

2026-06-28 16:15:54 +02:00

ui

[client] Exit GUI immediately on Windows session end (#6878)

2026-07-28 14:09:16 +09:00

wasm

[client] Fix js relay WebSocket close, raise RDP dial timeout, adjust WASM log levels (#6684)

2026-07-09 13:21:08 +02:00

Dockerfile

[misc] improve goreleaser with RC handling and update docker builds (#6438)

2026-06-17 20:13:13 +02:00

Dockerfile-rootless

[misc] improve goreleaser with RC handling and update docker builds (#6438)

2026-06-17 20:13:13 +02:00

installer.nsis

[management,client] 0.75.0 release with new desktop UI (#6473)

2026-07-06 13:47:16 +02:00

main.go

Clarify XORMapped panic case (#877)

2023-05-18 19:47:36 +02:00

manifest.xml

Renaming project builds and including new Icons (#318)

2022-05-21 18:42:56 +02:00

netbird-entrypoint.sh

[client] Simplify entrypoint by running netbird up unconditionally (#5652)

2026-03-23 09:39:32 +01:00

netbird.wxs

[management,client] 0.75.0 release with new desktop UI (#6473)

2026-07-06 13:47:16 +02:00

resources.rc

[client] UI Refactor Icon Paths (#3420)

2025-03-04 18:29:29 +03:00