Rudi Floren
6e04b23892
Merge branch 'valkum-master-patch-25423' into 'master'
...
Make clippy happy (needless-return, etc.)
See merge request famedly/conduit!23
5 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
5 years ago
Timo Kösters
3e274d7d2c
Merge branch 'valkum/conduit-update_rocket' into 'master'
...
update dependencies
See merge request famedly/conduit!32
5 years ago
Timo Kösters
105f893cf3
chore: bump other dependencies to make it work
5 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
5 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
5 years ago
Valkum
ce4024c321
Fix clippy::needless-lifetimes
5 years ago
Valkum
86b2e1138c
Fix clippy::borrowed-box
5 years ago
Valkum
61f8766736
Fix clippy::single-char-pattern
5 years ago
Valkum
f3b60386d7
Fix clippy::string-lit-as-bytes
5 years ago
Valkum
874821b035
Circumvent clippy::blocks_in_if_conditions
5 years ago
Valkum
d3b9288f38
Fix clippy::single-char-pattern
5 years ago
Valkum
d78c870e51
Fix clippy::string-lit-as-bytes
5 years ago
Valkum
0cc9d1be37
Circumvent clippy::blocks_in_if_conditions
5 years ago
Valkum
b2d543972b
Circumvent clippy::too-many-arguments
5 years ago
Valkum
386b79fcf8
Fix clippy::redundant_closure
5 years ago
Valkum
11830f6e1a
Fix clippy::type_complexity
5 years ago
Valkum
2563838009
Fix clippy::search_is_some
5 years ago
Valkum
54a080fe1f
Fix clippy::useless_conversion
5 years ago
Valkum
85b8f1b7cb
Fix clippy::single_char_pattern
5 years ago
Rudi Floren
b7d6fa0562
Make clippy happy (needless-return)
5 years ago
Rudi Floren
f4039902d8
Bump Rocket to current HEAD
5 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
5 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
5 years ago
Timo Kösters
1a198e7336
Merge branch 'jaeger' into 'master'
...
feat: opentelemetry/jaeger support
See merge request famedly/conduit!28
5 years ago
Timo Kösters
4155a47db1
feat: opentelemetry/jaeger support
5 years ago
Timo Kösters
066d5b92da
Merge branch 'sending' into 'master'
...
fix: sending code got stuck sometimes
See merge request famedly/conduit!25
5 years ago
Timo Kösters
f7713fdf2e
fix: sending code got stuck sometimes
5 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
5 years ago
Timo Kösters
278751eb23
improvement: use transaction ids for federation requests
5 years ago
Timo Kösters
dd68031b69
improvement: implement /receipt
5 years ago
Timo Kösters
a9239a4d0b
Merge branch 'larodar-master-patch-53953' into 'master'
...
Chore: Add Issue Template
See merge request famedly/conduit!26
5 years ago
Niklas Zender
a601c29c97
Chore: Add Issue Template
5 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
5 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
5 years ago
Timo Kösters
098ecb2ca3
Merge branch 'jwt-token-fixed' into 'master'
...
Add 'm.login.token' authentication
See merge request famedly/conduit!5
5 years ago
Timo Kösters
d49911c5e0
Add 'm.login.token' authentication
5 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
5 years ago
Timo Kösters
2d7012cdb1
Merge branch 'appservices' into 'master'
...
Appservices
Closes #29
See merge request famedly/conduit!11
5 years ago
Timo Kösters
ea1e4625d1
fix: default config options
5 years ago
Timo Kösters
6924dfc8ea
improvement: better appservice compatibility and optimizations
5 years ago
Timo Kösters
7be2a83195
Merge branch 'valkum/complement' into 'master'
...
Complement Testing: Fix binary name typo
See merge request famedly/conduit!20
5 years ago
Valkum
1d7207b39e
Sync are-we-synapse with dendrite
5 years ago
Valkum
a61b1cef5b
Fix binary name typo
5 years ago
Timo Kösters
a478ec0443
Merge branch 'cleanup' into 'master'
...
Update repository link in crate metadata
See merge request famedly/conduit!19
5 years ago
Timo Kösters
fd3fb3a7ed
Merge remote-tracking branch 'famedly/master' into appservices
5 years ago
Jonas Platte
6de5b3c2a0
Update repository link in crate metadata
5 years ago
Timo Kösters
265fab843a
feature: push rule settings
5 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
5 years ago
Valkum
a1e296374f
Allow the complement test image to use build artifacts
5 years ago