Commits · master · Jonathan de Jong / Conduit · GitLab

Mar 04, 2021
- Merge branch 'readme' into 'master' · 6538d915
  Timo Kösters authored Mar 04, 2021
  6538d915
- docs: add icon and license to readme · 96431069
  Timo Kösters authored Mar 04, 2021
  
  96431069
- Merge branch 'valkum-master-patch-62987' into 'master' · 3436e844
  Timo Kösters authored Mar 04, 2021
  3436e844
- Fix Complement CI paths · 156296ac
  Rudi Floren authored Mar 04, 2021
  156296ac
- Merge branch 'incoming-pdu' into 'master' · 64310930
  Timo Kösters authored Mar 04, 2021
  64310930
- Merge branch 'readme' into 'master' · 03440f4b
  Timo Kösters authored Mar 04, 2021
  03440f4b
- Merge branch 'clippy_again' into 'master' · 79c910ef
  Timo Kösters authored Mar 04, 2021
  79c910ef
- docs: small readme changes · bb1064ce
  Timo Kösters authored Mar 04, 2021
  
  bb1064ce
- Fix various clippy errors · 4027cbd0
  Rudi Floren authored Mar 04, 2021
  
  4027cbd0
- Allow suspicious_else_formatting · 6309506a
  Rudi Floren authored Mar 04, 2021
  6309506a
- fix: don't accept incoming pdus if we know about them already · 1ce00f90
  Timo Kösters authored Mar 04, 2021
  
  1ce00f90
- Merge branch 'valkum-master-patch-25423' into 'master' · bd6507ea
  Timo Kösters authored Mar 04, 2021
  bd6507ea
- Make clippy happy (needless-return, etc.) · 231c6032
  Rudi Floren authored Mar 04, 2021 and Timo Kösters committed Mar 04, 2021
  
  231c6032
- Merge branch 'valkum/complement' into 'master' · eaeba35f
  Timo Kösters authored Mar 04, 2021
  eaeba35f
- Merge branch 'valkum/conduit-update_rocket' into 'master' · 3e274d7d
  Timo Kösters authored Mar 04, 2021
  3e274d7d
- chore: bump other dependencies to make it work · 105f893c
  Timo Kösters authored Mar 04, 2021
  
  105f893c
- Merge branch 'as-fix' into 'master' · a04860b5
  Timo Kösters authored Mar 04, 2021
  a04860b5
- fix: apply the same appservice sending rules to events coming from federation · 437cb578
  Timo Kösters authored Mar 04, 2021
  437cb578
Mar 03, 2021
- Bump Rocket to current HEAD · f4039902
  Rudi Floren authored Mar 03, 2021
  
  f4039902
- Merge branch 'as-fix' into 'master' · 1a940b6e
  Timo Kösters authored Mar 03, 2021
  1a940b6e
- fix: don't always query aliases of appservices · f2ec2be8
  Timo Kösters authored Mar 03, 2021
  f2ec2be8
Mar 02, 2021
- Merge branch 'jaeger' into 'master' · 1a198e73
  Timo Kösters authored Mar 02, 2021
  1a198e73
- feat: opentelemetry/jaeger support · 4155a47d
  Timo Kösters authored Feb 28, 2021
  
  4155a47d
- Merge branch 'sending' into 'master' · 066d5b92
  Timo Kösters authored Mar 02, 2021
  066d5b92
- fix: sending code got stuck sometimes · f7713fdf
  Timo Kösters authored Feb 26, 2021
  
  f7713fdf
- Merge branch 'receipt-and-txnid' into 'master' · 566b8eba
  Timo Kösters authored Mar 02, 2021
  566b8eba
- improvement: use transaction ids for federation requests · 278751eb
  Timo Kösters authored Mar 02, 2021
  
  278751eb
- improvement: implement /receipt · dd68031b
  Timo Kösters authored Mar 02, 2021
  
  dd68031b
Feb 26, 2021
- Merge branch 'larodar-master-patch-53953' into 'master' · a9239a4d
  Timo Kösters authored Feb 26, 2021
  a9239a4d
- Chore: Add Issue Template · a601c29c
  Niklas Zender authored Feb 26, 2021
  
  a601c29c
Feb 22, 2021
- Sync paths with CI pipeline due to dockerignore# · aa7b6b6e
  Valkum authored Feb 22, 2021
  aa7b6b6e
Feb 07, 2021
- Merge branch 'are-we-synpase-sync' into 'master' · fb9880fe
  Timo Kösters authored Feb 07, 2021
  fb9880fe
- Merge branch 'jwt-token-fixed' into 'master' · 098ecb2c
  Timo Kösters authored Feb 07, 2021
  098ecb2c
- Add 'm.login.token' authentication · d49911c5
  Timo Kösters authored Feb 07, 2021
  
  d49911c5
- Merge branch 'deviceid-login' into 'master' · 3588dcd6
  Timo Kösters authored Feb 07, 2021
  3588dcd6
- Merge branch 'appservices' into 'master' · 2d7012cd
  Timo Kösters authored Feb 07, 2021
  2d7012cd
- fix: default config options · ea1e4625
  Timo Kösters authored Feb 07, 2021
  
  ea1e4625
Feb 06, 2021
- improvement: better appservice compatibility and optimizations · 6924dfc8
  Timo Kösters authored Feb 06, 2021
  
  6924dfc8
Feb 05, 2021
- Merge branch 'valkum/complement' into 'master' · 7be2a831
  Timo Kösters authored Feb 05, 2021
  7be2a831
- Sync are-we-synapse with dendrite · 1d7207b3
  Valkum authored Feb 05, 2021
  
  1d7207b3