Viktor Liu 76d73548d6 Fix more conflicts

2025-03-10 18:46:01 +01:00

..

android

[client] Report client system flags to management server on login (#3187)

2025-01-16 13:58:00 +01:00

anonymize

[client, management] Add new network concept (#3047)

2024-12-20 11:30:28 +01:00

cmd

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

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

configs

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

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

embed

[client] Prevent to block channel writing (#3474)

2025-03-10 13:17:09 +01:00

errors

[client] Fix error count formatting (#2641)

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

firewall

Fix more conflicts

2025-03-10 18:46:01 +01:00

iface

Merge branch 'main' into feature/flow

2025-03-10 18:30:45 +01:00

internal

Fix conflict

2025-03-10 18:35:32 +01:00

ios/NetBirdSDK

[client] Report client system flags to management server on login (#3187)

2025-01-16 13:58:00 +01:00

proto

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

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

server

Merge branch 'main' into feature/flow

2025-03-10 18:30:45 +01:00

ssh

[client] Allow ssh server on freebsd (#3170)

2025-01-14 12:43:13 +01:00

status

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

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

system

[client] fix privacy warning on macOS (#3350)

2025-02-22 12:41:24 +01:00

testdata

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

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

ui

[client] UI Refactor Icon Paths (#3420)

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

Dockerfile

[client] fix client/Dockerfile to reduce vulnerabilities (#3359)

2025-02-21 12:04:26 +01:00

Dockerfile-rootless

[client] Add experimental support for userspace routing (#3134)

2025-02-07 14:11:53 +01:00

installer.nsis

[client] Add option to autostart netbird ui in the Windows installer (#3469)

2025-03-10 13:19:17 +01: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.wxs

[client] UI Refactor Icon Paths (#3420)

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

resources.rc

[client] UI Refactor Icon Paths (#3420)

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