Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

client
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Contributor analytics
- Model experiments

Snippets Groups Projects

af368242

Commit af368242 authored 2 years ago by Jono Wenger

Downloads
- Plain Diff

Merge branch 'project/Channels' into XX-4279/ChannelsDatabaseEncryption

# Conflicts:
#	go.mod
#	go.sum

parents 5e9ddca5 2d5fca6e

No related branches found

No related tags found

3 merge requests!510Release,!422Add cipher bindings,!340Project/channels

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

bindings/channels.go 71 additions, 37 deletions

bindings/channels.go
channels/manager.go 2 additions, 0 deletions

channels/manager.go
channels/sendTracker.go 11 additions, 12 deletions

channels/sendTracker.go
cmix/follow.go 0 additions, 1 deletion

cmix/follow.go
cmix/gateway/hostPool.go 2 additions, 1 deletion

cmix/gateway/hostPool.go
cmix/nodes/register.go 4 additions, 1 deletion

cmix/nodes/register.go
cmix/nodes/registrar.go 2 additions, 2 deletions

cmix/nodes/registrar.go
cmix/nodes/request.go 12 additions, 19 deletions

cmix/nodes/request.go
cmix/nodes/verifyNodeSig.go 17 additions, 2 deletions

cmix/nodes/verifyNodeSig.go
cmix/nodes/verifyNodeSig_js.go 1 addition, 1 deletion

cmix/nodes/verifyNodeSig_js.go
fileTransfer/store/received.go 1 addition, 1 deletion

fileTransfer/store/received.go
fileTransfer/store/sent.go 1 addition, 1 deletion

fileTransfer/store/sent.go
go.mod 1 addition, 1 deletion

go.mod
go.sum 2 additions, 4 deletions

go.sum

with 127 additions and 83 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment