 Jonas Pflanzer
|
05b3592a8f
Autoformat
|
vor 5 Jahren |
|
Jonas Pflanzer
|
8057419999
Merge branch '43-us24-allow-server-to-communicate-with-a-fixed-partner-server' into develop
|
vor 5 Jahren |
|
Serdyukov, Denys
|
8bbc6644ae
Merge branch 'us29-cli-batch-mode' into 'develop'
|
vor 5 Jahren |
|
Sander, Paul
|
d44dbc8a7c
US29: CLI Batch Mode
|
vor 5 Jahren |
|
Sander, Paul
|
b9bc001a85
Merge branch 'gui-delete-me-confirmation-popup' into 'develop'
|
vor 5 Jahren |
|
Wach, Tobias Alexander
|
b9efe62ccd
GUI DeleteMe Confirmation Popup
|
vor 5 Jahren |
|
Sander, Paul
|
7e3478a9e1
Merge branch 'us-31-configurable-gui' into 'develop'
|
vor 5 Jahren |
|
Wach, Tobias Alexander
|
38b60e5091
US31: Configurable GUI
|
vor 5 Jahren |
|
Jonas Pflanzer
|
1167dc2dd2
Fix Filter again...
|
vor 5 Jahren |
|
Jonas Pflanzer
|
173735cd0d
Forward because it's not a relay
|
vor 5 Jahren |
|
Jonas Pflanzer
|
78c555afce
Clarifying filters
|
vor 5 Jahren |
|
Jonas Pflanzer
|
928935d441
Another typo
|
vor 5 Jahren |
|
Jonas Pflanzer
|
d5e266ed51
Forgot to set some MACs
|
vor 5 Jahren |
|
Jonas Pflanzer
|
0e73467ac8
Testing routing with MAC addresses
|
vor 5 Jahren |
 Missingmew
|
02d53ba353
adjust pcap filter string for relay
|
vor 5 Jahren |
|
Jonas Pflanzer
|
e68c0ee458
Proxy Channel might work now
|
vor 5 Jahren |
|
Sander, Paul
|
808eac41db
Merge branch '32-us21-1-user-deletion-server' into 'develop'
|
vor 5 Jahren |
 Pflanzer, Jonas
|
0015e7cd9f
Resolve "US21.1: User deletion (Server)"
|
vor 5 Jahren |
|
Sander, Paul
|
4f323c4e98
Merge branch 'us26-3-gui-delete' into 'develop'
|
vor 5 Jahren |
|
Wach, Tobias Alexander
|
39387be497
US26.3: Delete command (GUI)
|
vor 5 Jahren |
|
Sander, Paul
|
a0166fb796
Merge branch 'us26-2-delete-cli' into 'develop'
|
vor 5 Jahren |
|
Serdyukov, Denys
|
cabfe9036d
US26.2: delete file (CLI)
|
vor 5 Jahren |
|
Serdyukov, Denys
|
8fdc418298
Merge branch 'us28-encryption-cli' into 'develop'
|
vor 5 Jahren |
|
Sander, Paul
|
57d083fcb5
rework crypto, fix broken read of key, crypto should now work together with cryptotest in test folder
|
vor 5 Jahren |
|
Serdyukov, Denys
|
2660f49cdf
Merge branch 'us25-secure-comms-client-server' into 'develop'
|
vor 5 Jahren |
|
Sander, Paul
|
e2ab8c089f
implement very basic ssl, todo allow server to run without ssl and get ssl fully running (broken right now, complains about no shared cipher)
|
vor 5 Jahren |
|
Jonas Pflanzer
|
4f641f1c16
Proxy Channel test
|
vor 5 Jahren |
|
Jonas Pflanzer
|
d5b85b1a25
Proxy channel
|
vor 5 Jahren |
|
Jonas Pflanzer
|
2d7dd30a54
Forward channel works, Proxy channel is garbage
|
vor 5 Jahren |
|
Serdyukov, Denys
|
d160819ef7
Merge branch 'us27-gui-file-listing' into 'develop'
|
vor 5 Jahren |
