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

..

capture.go

[client, proxy] Add packet capture to debug bundle and CLI (#5891)

2026-05-04 11:28:56 +02:00

debug.go

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

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

event.go

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

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

extend_authsession_test.go

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

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

forwardingrules.go

[client, management] Add port forwarding (#3275)

2025-03-09 16:06:43 +01:00

jwt_cache.go

[client,management] Rewrite the SSH feature (#4015)

2025-11-17 17:10:41 +01:00

log.go

Restore netbird state and log level after debug (#2047)

2024-05-24 13:27:41 +02:00

login_overrides_test.go

[client] Migrate profile identity from display name to ID and allow renaming of profiles (#6367)

2026-06-18 08:49:19 +02:00

mdm.go

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

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

network_exitnode_test.go

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

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

network.go

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

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

panic_generic.go

[client] Log windows panics (#2829)

2024-11-01 15:08:22 +01:00

panic_windows.go

Revert "Revert "[relay] Update GO version and QUIC version (#4736)" (#5055)" (#5071)

2026-01-08 18:58:22 +01:00

probe_throttle_test.go

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

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

probe_throttle.go

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

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

server_connect_test.go

[client] add MDM configuration profile support (Windows registry + macOS plist) (#6374)

2026-06-12 12:28:49 +02:00

server_privileged_test.go

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

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

server_test.go

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

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

server.go

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

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

setconfig_mdm_test.go

Resolve merge conflicts from main

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

setconfig_test.go

[client] Make lazy connections opt-out via NB_LAZY_CONN (#6617)

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

sleep.go

[client] Move macOS sleep detection into the daemon (purego) (#5926)

2026-04-29 08:09:55 +02:00

state_generic.go

[client] Handle UPnP routers that only support permanent leases (#5826)

2026-04-08 17:59:59 +02:00

state_linux.go

[client] Handle UPnP routers that only support permanent leases (#5826)

2026-04-08 17:59:59 +02:00

state.go

[client] Restore residual state in foreground mode before login (#6707)

2026-07-14 17:43:59 +02:00

status_stream.go

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

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

trace.go

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

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

triggerupdate.go

[client] refactor auto update workflow (#5448)

2026-03-13 17:01:28 +01:00

updateresult.go

[client] refactor auto update workflow (#5448)

2026-03-13 17:01:28 +01:00