Commits · next · digital / Conduit

Browse files

Jan 14, 2023
- Merge branch 'joinfix' into 'next' · 815db0d9
  Timo Kösters authored Jan 14, 2023
  815db0d9
- Maybe fix room joins · 809c9b44
  Timo Kösters authored Jan 14, 2023
  809c9b44
Jan 09, 2023
- Merge branch 'trusted-servers-doc' into 'next' · c6e3438e
  Timo Kösters authored Jan 09, 2023
  c6e3438e
- document `trusted_servers` option · 844508bc
  Charles Hall authored Jan 09, 2023
  
  844508bc
- Merge branch 'partial-nix-fix' into 'next' · b3aec63d
  Timo Kösters authored Jan 09, 2023
  b3aec63d
- Merge branch 'code-of-conduct' into 'next' · 2da4ae6b
  Timo Kösters authored Jan 09, 2023
  2da4ae6b
- Merge branch 'fix-nix-docs' into 'next' · 5e6b498c
  Timo Kösters authored Jan 09, 2023
  5e6b498c
Jan 08, 2023
- fix nix docs · 391bedda
  Charles Hall authored Jan 08, 2023
  391bedda
- Add Contributor's Covenant Code of Conduct · 112b76b1
  June Strawberry authored Jan 08, 2023
  112b76b1
Dec 23, 2022
- remind people to update the hash · 31594496
  Charles Hall authored Dec 23, 2022
  31594496
- update flake.lock · 9f74555c
  Charles Hall authored Dec 16, 2022
  
  9f74555c
- update rust toolchain hash · 0a4e8e59
  Charles Hall authored Dec 16, 2022
  
  0a4e8e59
Dec 21, 2022
- Update Cargo.lock · 19156c7b
  Timo Kösters authored Dec 21, 2022
  
  19156c7b
- Bump version to 0.6.0-alpha · 2a66ad43
  Timo Kösters authored Dec 21, 2022
  
  2a66ad43
- Merge remote-tracking branch 'origin/next' · 53f14a2c
  Timo Kösters authored Dec 21, 2022
  
  View commits for tag v0.5.0 v0.5.0
  53f14a2c
- Merge branch 'nextversion' into 'next' · d20f21ae
  Timo Kösters authored Dec 21, 2022
  d20f21ae
- Bump version to v0.5.0 · f7db3490
  Timo Kösters authored Dec 21, 2022
  
  f7db3490
- Bump ruma · c7a7c913
  Timo Kösters authored Dec 21, 2022
  
  c7a7c913
- tweak default rocksdb settings · 76a82339
  Timo Kösters authored Dec 21, 2022
  
  76a82339
- Merge branch 'Nyaaori/prev_events-config-option' into 'next' · 94df9cdb
  Timo Kösters authored Dec 21, 2022
  94df9cdb
- Merge branch 'Nyaaori/membership-events-reason' into 'next' · b231d7f1
  Timo Kösters authored Dec 21, 2022
  b231d7f1
- feat: Implement membership ban/join/leave/invite reason support · 7cc346bc
  Nyaaori authored Dec 21, 2022
  
  7cc346bc
- Merge branch 'Nyaaori/code-cleanup' into 'next' · 48bc0db7
  Timo Kösters authored Dec 21, 2022
  48bc0db7
- feat: Add max prev events config option, allowing adjusting limit for prev_events fetching · 7c196f4e
  Nyaaori authored Sep 09, 2022
  
  7c196f4e
- chore: code cleanup · c86313d4
  Nyaaori authored Dec 21, 2022
  c86313d4
Dec 18, 2022
- Merge branch 'restrictedjoinlocally' into 'next' · 7b987411
  Timo Kösters authored Dec 18, 2022
  7b987411
- improvement: handle restricted joins locally · 2a04c213
  Timo Kösters authored Dec 18, 2022
  
  2a04c213
- Merge branch 'logging-cleanup' into 'next' · d7eaa9c5
  Timo Kösters authored Dec 18, 2022
  d7eaa9c5
- Replace println/dbg calls with corresponding macros from tracing crate · 2a0515f5
  Timo Kösters authored Dec 18, 2022
  
  2a0515f5
- Merge branch 'docs' into 'next' · 3930fd08
  Timo Kösters authored Dec 18, 2022
  3930fd08
- Update README · 683eefbd
  Timo Kösters authored Dec 18, 2022
  
  683eefbd
- Merge branch 'jaegerfix' into 'next' · d963ad8c
  Timo Kösters authored Dec 18, 2022
  d963ad8c
- fix: jaeger support · 6d5e54a6
  Timo Kösters authored Dec 18, 2022
  
  6d5e54a6
- Merge branch 'up-ruma' into 'next' · 2b2bfb91
  Timo Kösters authored Dec 18, 2022
  2b2bfb91
Dec 17, 2022
- finish upgrade ruma · f1d25746
  Timo Kösters authored Dec 17, 2022
  
  f1d25746
Dec 16, 2022
- WIP: Upgrade Ruma · d39ce140
  Jonas Platte authored Dec 14, 2022
  
  d39ce140
- The procMacro option has long been on by default · 7fd5b22e
  Jonas Platte authored Dec 16, 2022
  7fd5b22e
- Merge branch 'fix/pushrules_database' into 'next' · db7a7085
  Timo Kösters authored Dec 16, 2022
  db7a7085
Nov 30, 2022
- Merge branch 'fixrestrictedjoin' into 'next' · 5894d35e
  Timo Kösters authored Nov 30, 2022
  5894d35e
- fix: rejoining restricted rooms over federation · b9fd6127
  Timo Kösters authored Nov 27, 2022
  
  b9fd6127