shruub
/
conduit
mirror of https://gitlab.com/famedly/conduit
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
449 Commits
48 Branches
7 Tags
20 MiB
restricted-make-send-join
next
master
make-send-leave
error-parse-image-thumbnail
update-device-seen-on-usage
presence
chore/format-nix
all-the-lints
generate-config
push-federation-invites-to-appservices
unstable-msc4125
jonas-test-ci-docker-building-quemu-on-fsinfo-runner
askstate
recoverbroken
Nyaaori/temp-combined-feature-branch
Nyaaori/destructive-rocksdb-recovery
Nyaaori/full-profile-directory
Nyaaori/read-receipt-config-options
Nyaaori/private-read-receipts
Nyaaori/federation-backfill
Nyaaori/declare-msc3827
Nyaaori/remove-misisng-e2ee-readme
Nyaaori/refactor-next
refactor-ci-fix
bump-docker-alpine-to-3.16.2
jplatte/up-ruma
mdbook-docs-preparation
async
complement-integration
brokenjoinfix
state_full_ids_cache
ticho34782694/conduit-rocksdb-memory-usage
docs-the-second
serve-element-web
perf
nyaaori/older-room-versions
unbeatable-101-next-patch-64009
docs-overhaul
state-res-perf
stablecrosssigning
member-reason
admin-command-for-cache-memory-usage
measure-cache-memory-usage
lesscache
locks
state-res-closure-rebased
ruma-client
v0.2.0
v0.3.0
v0.4.0
v0.5.0
v0.6.0
v0.7.0
v0.8.0
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'd62f17a91a'
${ noResults }
Commit Graph

449 Commits (d62f17a91a6647fd7b5bd503ddcd08e6a7e3e951)
 

Author SHA1 Message Date
Timo 4be68eba76
feat: allow querying conduit's room list over federation 4 years ago
Timo 940f533d61
refactor: avoid some allocations when redacting 4 years ago
Timo 04eee089e0
feat: first steps towards joining rooms over federation 4 years ago
timokoesters f40f1d9f75
docs: endpoint documentation 4 years ago
Timo Kösters cfda76860b Merge pull request 'Make default server name more obvious' (#192) from spaetz/conduit:master into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/192
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 4 years ago
Sebastian Spaeth 6b7e92ccf5 Make default server name more obvious 
Too many people fell into the trap and left conduit.rs in the deployment
configuration, wondering why users are all listed as @conduit.rs.

Make the default server name really easy to identify and make it obvious
that this needs to be changed.
 4 years ago
Timo Kösters 6191c3bd00 Merge pull request 'Fix license.' (#190) from q-b/conduit-fork:license into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/190
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 4 years ago
Faelar 0fef955b28 Fix license. 4 years ago
Timo Kösters 2d96323d5f Merge pull request 'Update ruma' (#184) from jplatte/conduit:up-ruma into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/184
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 4 years ago
Jonas Platte 75ea0b3163
Update ruma 4 years ago
Timo Kösters 4b3d6e736f Merge pull request 'Alpine based Docker image' (#152) from Weasy666/conduit:master into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/152
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 4 years ago
Timo 2fc99c05e1
docs: add documentation to the repo and improve layout 4 years ago
Daniel Wiesenberg 87ed132ae4 Add README in docker folder and mention docker in Conduit's README 4 years ago
Daniel Wiesenberg 7288010e55 Move additional files into dedicated folder and make build the def... 
...fault in the compose files.
 4 years ago
Daniel Wiesenberg 31c725660f Add build option to compose file 4 years ago
Daniel Wiesenberg 7456caeefd Add Element-Web to compose and provide extra compose files for using.. 
..Conduit behind Traefik Reverse Proxy
 4 years ago
Daniel Wiesenberg 5f3cb3f926 Minor modifications to compose file and update Dockerfile comments 4 years ago
Daniel Wiesenberg 0338053774 Add ability to switch between local and remote build with build arg a... 
...nd add env vars to docker-compose
 4 years ago
Daniel Wiesenberg ecb6416244 Image now builds and runs 🎉 Thx to the help of yzhr 4 years ago
Daniel Wiesenberg a21858758c Change labels from label-schema to opencontainer.image 4 years ago
Daniel Wiesenberg 624ff08a07 Initial docker files trinity 
The image builds as is, but running it exits with: standard_init_linux.go:211: exec user process caused "no such file or directory"
 4 years ago
Timo Kösters 0f1e3d8214 Merge pull request 'Make State struct constructable by lib user' (#178) from DevinR528/conduit:library-mode into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/178
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 4 years ago
Devin Ragotzy da1c53aaef Make State struct constructable by lib user 4 years ago
Timo Kösters 4a8bc93b1a Merge pull request 'Send invites only if invited during the sync request' (#176) from gnieto/conduit:fix/send-invite-when-needed into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/176
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 4 years ago
Guillem Nieto b575593647 Do not ignore db errors 4 years ago
Guillem Nieto 47abe6686e Send invites only if invited during the sync request 
Fixes: https://git.koesters.xyz/timo/conduit/issues/175
 4 years ago
Timo Kösters 935f0e6185 Merge pull request 'feat: handle /publicRooms pagination' (#174) from publicrooms-pagination into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/174
 4 years ago
timokoesters 98f37302a6
feat: handle /publicRooms pagination 4 years ago
Timo Kösters 5cfda2f5d3 Merge pull request 'feat: handle inhibit_login in /register' (#173) from inhibit-login into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/173
 4 years ago
timokoesters 0616acbde6
feat: handle inhibit_login in /register 4 years ago
Timo Kösters acc7b15981 Merge pull request 'refactor: put endpoints into modules' (#172) from route-files into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/172
 4 years ago
timokoesters c1c62b7eb4
refactor: put endpoints into modules 4 years ago
Timo Kösters 485a24398b Merge pull request 'Implement ignore invite when inviting user is ignored' (#164) from DevinR528/conduit:ignored-list-invite into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/164
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 4 years ago
Devin Ragotzy 7a70d8488f Rebase with master and update append_pdu call 4 years ago
Devin Ragotzy c8d7d80eb2 Fix start/end token swap left from dropped commits 4 years ago
Devin Ragotzy 99220565d4 Fix invite leave auth error by moving update_membership 4 years ago
Devin Ragotzy 25c0e75f29 Cargo fmt 4 years ago
Devin Ragotzy 8aac332b3a Move ignore invite logic into update_member 4 years ago
Devin Ragotzy f2fab27d81 Implement filtering invites if sender is ignored by receiver 4 years ago
Timo Kösters 100e3d6d6d Merge pull request 'improvement: handle limit and set limited in /user_directory/search' (#169) from user-dir-limit into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/169
 4 years ago
timokoesters 52b1df6fd2
improvement: handle limit and set limited in /user_directory/search 4 years ago
Timo Kösters 18dcf44aa4 Merge pull request 'fix: send device list updates when user is in no rooms' (#170) from fix-set-up-encryption into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/170
 4 years ago
timokoesters ce460ea159
fix: send device list updates when user is in no rooms 4 years ago
Timo Kösters c824652de6 Merge pull request 'Fix clippy warnings and run rustfmt' (#163) from DevinR528/conduit:clippy-fix2 into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/163
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 4 years ago
timokoesters b67372b11b
refactor: make all mods in database pub 
Now they can easily export their own structs
 4 years ago
Devin Ragotzy d948f896c0
Turn append_pdu args into struct PduBuilder 4 years ago
Devin Ragotzy 1c6f211933
Create media::FileMeta to represent a file and meta data 4 years ago
Devin Ragotzy 2da48b941d
Convert all map_err -> expect when deserializing to Raw 4 years ago
Devin Ragotzy 62df9ca580
Fix all clippy warnings, shorten line len in client_server 4 years ago
Timo Kösters 3ccbd02081 Merge pull request 'Long polling and more' (#162) from longpoll into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/162
 4 years ago