Commit Graph

518 Commits (156296ac051a83cf009cd399dc097164238a6a18)
 

Author SHA1 Message Date
Rudi Floren 156296ac05 Fix Complement CI paths
The final container tried to COPY from the default cargo target dir, but we only checked if cached_target is present.
We copy from cached_target to target when cached_target is present now in the builder
3 years ago
Timo Kösters 643109309b Merge branch 'incoming-pdu' into 'master'
fix: don't accept incoming pdus if we know about them already

Closes #70

See merge request famedly/conduit!33
3 years ago
Timo Kösters 03440f4b15 Merge branch 'readme' into 'master'
docs: small readme changes

See merge request famedly/conduit!35
3 years ago
Timo Kösters 79c910efdf Merge branch 'clippy_again' into 'master'
Fix more clippy errors in master

See merge request famedly/conduit!34
3 years ago
Timo Kösters bb1064ce04
docs: small readme changes 3 years ago
Rudi Floren 4027cbd01d Fix various clippy errors 3 years ago
Rudi Floren 6309506a48 Allow suspicious_else_formatting
This is probably unfixable because it is caused by macros
3 years ago
Timo Kösters 1ce00f90fe
fix: don't accept incoming pdus if we know about them already 3 years ago
Timo Kösters bd6507eafb Merge branch 'valkum-master-patch-25423' into 'master'
Make clippy happy (needless-return, etc.)

See merge request famedly/conduit!23
3 years ago
Rudi Floren 231c6032f4 Make clippy happy (needless-return, etc.) 3 years ago
Timo Kösters eaeba35f3c Merge branch 'valkum/complement' into 'master'
Sync paths with CI pipeline due to dockerignore

See merge request famedly/conduit!24
3 years ago
Timo Kösters 3e274d7d2c Merge branch 'valkum/conduit-update_rocket' into 'master'
update dependencies

See merge request famedly/conduit!32
3 years ago
Timo Kösters 105f893cf3
chore: bump other dependencies to make it work 3 years ago
Timo Kösters a04860b513 Merge branch 'as-fix' into 'master'
fix: apply the same appservice sending rules to events coming from federation

See merge request famedly/conduit!31
3 years ago
Timo Kösters 437cb5783a
fix: apply the same appservice sending rules to events coming from federation
currently this code is duplicated from database/rooms.rs, when we
refactor server_server.rs we should deduplicate it
3 years ago
Rudi Floren f4039902d8 Bump Rocket to current HEAD 3 years ago
Timo Kösters 1a940b6e05 Merge branch 'as-fix' into 'master'
fix: don't always query aliases of appservices

See merge request famedly/conduit!29
3 years ago
Timo Kösters f2ec2be821
fix: don't always query aliases of appservices
only do so if the alias matches the regex in the registration file
3 years ago
Timo Kösters 1a198e7336 Merge branch 'jaeger' into 'master'
feat: opentelemetry/jaeger support

See merge request famedly/conduit!28
3 years ago
Timo Kösters 4155a47db1
feat: opentelemetry/jaeger support 3 years ago
Timo Kösters 066d5b92da Merge branch 'sending' into 'master'
fix: sending code got stuck sometimes

See merge request famedly/conduit!25
3 years ago
Timo Kösters f7713fdf2e
fix: sending code got stuck sometimes 3 years ago
Timo Kösters 566b8ebabb Merge branch 'receipt-and-txnid' into 'master'
/receipt and transaction ids for federated requests

Closes #11

See merge request famedly/conduit!27
3 years ago
Timo Kösters 278751eb23
improvement: use transaction ids for federation requests 3 years ago
Timo Kösters dd68031b69
improvement: implement /receipt 3 years ago
Timo Kösters a9239a4d0b Merge branch 'larodar-master-patch-53953' into 'master'
Chore: Add Issue Template

See merge request famedly/conduit!26
3 years ago
Niklas Zender a601c29c97 Chore: Add Issue Template 3 years ago
Valkum aa7b6b6e09 Sync paths with CI pipeline due to dockerignore#
As the docker ignore file includes the target dir, content in this dir
is no accessible to the docker daemon.
We circumvent this by providing the build artifact in a dir called
cached_dir
3 years ago
Timo Kösters fb9880fee9 Merge branch 'are-we-synpase-sync' into 'master'
Sync are-we-synapse with dendrite

See merge request famedly/conduit!21
3 years ago
Timo Kösters 098ecb2ca3 Merge branch 'jwt-token-fixed' into 'master'
Add 'm.login.token' authentication

See merge request famedly/conduit!5
3 years ago
Timo Kösters d49911c5e0
Add 'm.login.token' authentication 3 years ago
Timo Kösters 3588dcd6d0 Merge branch 'deviceid-login' into 'master'
Handle optional device_id field during login

See merge request famedly/conduit!16
3 years ago
Timo Kösters 2d7012cdb1 Merge branch 'appservices' into 'master'
Appservices

Closes #29

See merge request famedly/conduit!11
3 years ago
Timo Kösters ea1e4625d1
fix: default config options 3 years ago
Timo Kösters 6924dfc8ea
improvement: better appservice compatibility and optimizations 3 years ago
Timo Kösters 7be2a83195 Merge branch 'valkum/complement' into 'master'
Complement Testing: Fix binary name typo

See merge request famedly/conduit!20
3 years ago
Valkum 1d7207b39e Sync are-we-synapse with dendrite 3 years ago
Valkum a61b1cef5b Fix binary name typo 3 years ago
Timo Kösters a478ec0443 Merge branch 'cleanup' into 'master'
Update repository link in crate metadata

See merge request famedly/conduit!19
3 years ago
Timo Kösters fd3fb3a7ed
Merge remote-tracking branch 'famedly/master' into appservices 3 years ago
Jonas Platte 6de5b3c2a0
Update repository link in crate metadata 3 years ago
Timo Kösters 265fab843a
feature: push rule settings 3 years ago
Timo Kösters 87a0019f3a Merge branch 'valkum/complement' into 'master'
Allow the complement test image to use build artifacts

See merge request famedly/conduit!17
4 years ago
Valkum a1e296374f Allow the complement test image to use build artifacts 4 years ago
Devon Hudson 762255fa8d
Simplify device creation logic during login 4 years ago
Devon Hudson 890187e004
improvement: Handle optional device_id field during login
remove debug logging
4 years ago
Timo Kösters 9424ba0559 Merge branch 'logout-devices' into 'master'
Respect logout_devices param on password change

See merge request famedly/conduit!15
4 years ago
Devon Hudson ebb38cd330
improvement: respect logout_devices param on password change
Move logout devices comment next to relevant loop

remove unnecessary log
4 years ago
Paul van Tilburg c263e13000
fix: update binary file name in docs for consistency 4 years ago
Timo Kösters ad7b3f184b
improvement: send 200 response for turn server info
We didn't implement it, but this will stop clients from retrying the
endpoint every minute
4 years ago