Timo Kösters
|
bb1064ce04
|
docs: small readme changes
|
2021-03-04 15:28:28 +01:00 |
|
Timo Kösters
|
bd6507eafb
|
Merge branch 'valkum-master-patch-25423' into 'master'
Make clippy happy (needless-return, etc.)
See merge request famedly/conduit!23
|
2021-03-04 12:35:12 +00:00 |
|
Timo Kösters
|
eaeba35f3c
|
Merge branch 'valkum/complement' into 'master'
Sync paths with CI pipeline due to dockerignore
See merge request famedly/conduit!24
|
2021-03-04 12:32:55 +00:00 |
|
Timo Kösters
|
3e274d7d2c
|
Merge branch 'valkum/conduit-update_rocket' into 'master'
update dependencies
See merge request famedly/conduit!32
|
2021-03-04 12:32:22 +00:00 |
|
Timo Kösters
|
105f893cf3
|
chore: bump other dependencies to make it work
|
2021-03-04 12:29:08 +01:00 |
|
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
|
2021-03-04 11:18:00 +00:00 |
|
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
|
2021-03-04 11:34:38 +01:00 |
|
Timo Kösters
|
1a940b6e05
|
Merge branch 'as-fix' into 'master'
fix: don't always query aliases of appservices
See merge request famedly/conduit!29
|
2021-03-03 21:07:18 +00:00 |
|
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
|
2021-03-03 21:53:32 +01:00 |
|
Timo Kösters
|
1a198e7336
|
Merge branch 'jaeger' into 'master'
feat: opentelemetry/jaeger support
See merge request famedly/conduit!28
|
2021-03-02 14:14:26 +00:00 |
|
Timo Kösters
|
4155a47db1
|
feat: opentelemetry/jaeger support
|
2021-03-02 15:08:54 +01:00 |
|
Timo Kösters
|
066d5b92da
|
Merge branch 'sending' into 'master'
fix: sending code got stuck sometimes
See merge request famedly/conduit!25
|
2021-03-02 14:04:11 +00:00 |
|
Timo Kösters
|
f7713fdf2e
|
fix: sending code got stuck sometimes
|
2021-03-02 14:58:46 +01:00 |
|
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
|
2021-03-02 13:49:14 +00:00 |
|
Timo Kösters
|
278751eb23
|
improvement: use transaction ids for federation requests
|
2021-03-02 14:36:48 +01:00 |
|
Timo Kösters
|
dd68031b69
|
improvement: implement /receipt
|
2021-03-02 14:33:35 +01:00 |
|
Timo Kösters
|
a9239a4d0b
|
Merge branch 'larodar-master-patch-53953' into 'master'
Chore: Add Issue Template
See merge request famedly/conduit!26
|
2021-02-26 15:00:19 +00:00 |
|
Timo Kösters
|
fb9880fee9
|
Merge branch 'are-we-synpase-sync' into 'master'
Sync are-we-synapse with dendrite
See merge request famedly/conduit!21
|
2021-02-07 21:36:05 +00:00 |
|
Timo Kösters
|
098ecb2ca3
|
Merge branch 'jwt-token-fixed' into 'master'
Add 'm.login.token' authentication
See merge request famedly/conduit!5
|
2021-02-07 17:11:53 +00:00 |
|
Timo Kösters
|
d49911c5e0
|
Add 'm.login.token' authentication
|
2021-02-07 17:38:45 +01:00 |
|
Timo Kösters
|
3588dcd6d0
|
Merge branch 'deviceid-login' into 'master'
Handle optional device_id field during login
See merge request famedly/conduit!16
|
2021-02-07 12:28:05 +00:00 |
|
Timo Kösters
|
2d7012cdb1
|
Merge branch 'appservices' into 'master'
Appservices
Closes #29
See merge request famedly/conduit!11
|
2021-02-07 12:24:28 +00:00 |
|
Timo Kösters
|
ea1e4625d1
|
fix: default config options
|
2021-02-07 13:20:00 +01:00 |
|
Timo Kösters
|
6924dfc8ea
|
improvement: better appservice compatibility and optimizations
|
2021-02-06 15:28:30 +01:00 |
|
Timo Kösters
|
7be2a83195
|
Merge branch 'valkum/complement' into 'master'
Complement Testing: Fix binary name typo
See merge request famedly/conduit!20
|
2021-02-05 08:52:25 +00:00 |
|
Timo Kösters
|
a478ec0443
|
Merge branch 'cleanup' into 'master'
Update repository link in crate metadata
See merge request famedly/conduit!19
|
2021-02-03 18:30:11 +00:00 |
|
Timo Kösters
|
fd3fb3a7ed
|
Merge remote-tracking branch 'famedly/master' into appservices
|
2021-02-03 12:54:37 +01:00 |
|
Timo Kösters
|
265fab843a
|
feature: push rule settings
|
2021-01-28 20:47:19 +01:00 |
|
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
|
2021-01-23 07:43:05 +00:00 |
|
Timo Kösters
|
9424ba0559
|
Merge branch 'logout-devices' into 'master'
Respect logout_devices param on password change
See merge request famedly/conduit!15
|
2021-01-16 22:35:08 +00:00 |
|
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
|
2021-01-11 17:26:47 +01:00 |
|
Timo Kösters
|
d45d033bf1
|
fix: send presence updates when going offline
remaining bug: conduit sends presence updates every 5 minutes even if
the user is already offline
|
2021-01-10 17:12:34 +01:00 |
|
Timo Kösters
|
b4818716b8
|
improvement: better deploy guide
|
2021-01-01 22:21:05 +01:00 |
|
Timo Kösters
|
d7e56dbfa0
|
docs: recommend using binaries
|
2021-01-01 11:27:01 +01:00 |
|
Timo Kösters
|
3bdaf6e79e
|
improvement: better default config
|
2021-01-01 11:24:09 +01:00 |
|
Timo Kösters
|
85364a9c27
|
improvement: change federation_enabled to federation_disabled
This enables federation by default
|
2021-01-01 10:52:43 +01:00 |
|
Timo Kösters
|
edfd3c1f34
|
improvement: better config, better logs
|
2020-12-31 21:07:55 +01:00 |
|
Timo Kösters
|
df16b2ba98
|
fix: rare state races
|
2020-12-31 14:52:08 +01:00 |
|
Timo Kösters
|
2cf6fd57b7
|
improvement: don't send pdus to appservices if it isn't interested
TODO: we need to send pdus if a user of the appservice is in the room
but not the appservice user itself
|
2020-12-23 19:41:54 +01:00 |
|
Timo Kösters
|
fb9bd34696
|
improvement: better warnings when server is unreachable
|
2020-12-23 15:53:41 +01:00 |
|
Timo Kösters
|
c1bc70aeca
|
Merge branch 'kuboschek/conduit-always-query-srv' into appservices
|
2020-12-22 20:35:43 +01:00 |
|
Timo Kösters
|
f12fbca3c5
|
fix: send state in /sync, element displays wrong membership changes
|
2020-12-22 20:22:17 +01:00 |
|
Timo Kösters
|
6606e41dde
|
feat: improved state store
|
2020-12-20 13:34:11 +01:00 |
|
Timo Kösters
|
6e5b35ea92
|
feat: implement appservices
this also reverts some stateres changes
|
2020-12-08 12:59:20 +01:00 |
|
Timo Kösters
|
d62f17a91a
|
improvement: cache actual destination
|
2020-12-06 11:05:51 +01:00 |
|
Timo Kösters
|
9d4c7c34a0
|
Merge branch 'cargo-deb-packaging' into 'master'
Add Debian packaging via cargo-deb
See merge request famedly/conduit!3
|
2020-12-06 07:31:09 +00:00 |
|
Timo Kösters
|
45086b54b3
|
improvement: upgrade dependencies, fix timeline reload bug
|
2020-12-05 21:04:34 +01:00 |
|
Timo Kösters
|
49f6ab503a
|
Merge branch 'better-logs' into 'master'
feat: send logs into admin room
See merge request famedly/conduit!6
|
2020-12-05 16:36:05 +00:00 |
|
Timo Kösters
|
6e36081573
|
improvement: more logging
|
2020-12-05 17:35:00 +01:00 |
|
Timo Kösters
|
9439f2c183
|
feat: send logs into admin room
Log entries will automatically be deduplicated, so a message won't be
sent if the same line has already been sent in the last 30 mins
|
2020-12-05 17:34:58 +01:00 |
|
Timo Kösters
|
ecea0d4af2
|
Merge branch 'fix-admin-room' into 'master'
fix: logging thread crash when admin room does not exist
See merge request famedly/conduit!9
|
2020-12-05 16:31:18 +00:00 |
|
Timo Kösters
|
e691e880e0
|
fix: logging thread crash when admin room does not exist
|
2020-12-02 16:08:59 +01:00 |
|
Timo Kösters
|
7078443460
|
Merge branch 'fix_complement' into 'master'
Fix complement
See merge request famedly/conduit!7
|
2020-11-18 20:17:50 +00:00 |
|
Timo Kösters
|
998f9e2109
|
Merge branch 'sending' into 'master'
Sending improvements
See merge request famedly/conduit!2
|
2020-11-09 19:28:56 +00:00 |
|
Timo Kösters
|
9f8cffcd22
|
Admin room improvements
|
2020-11-09 12:21:57 +01:00 |
|
Timo Kösters
|
16b22bb432
|
fix: don't allow more than 50 PDUs in a transaction
|
2020-11-03 21:53:57 +01:00 |
|
Timo Kösters
|
0762196963
|
fix: don't send new events from left rooms
|
2020-10-27 20:26:28 +01:00 |
|
Timo Kösters
|
2f5df4aac9
|
improvement: more reliable federation sending
|
2020-10-27 20:26:27 +01:00 |
|
Timo Kösters
|
18f33b1ece
|
Merge pull request 'Frequent flushing, configurable cache capacity, welcome message' (#237) from small-improvements into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/237
|
2020-10-23 14:41:54 +02:00 |
|
Timo Kösters
|
df82314440
|
improvement: welcome message
|
2020-10-23 14:38:12 +02:00 |
|
Timo Kösters
|
6b3934e31d
|
feat: configurable cache capacity
|
2020-10-23 14:38:12 +02:00 |
|
Timo Kösters
|
6dbe195695
|
improvement: flush after every request that manipulates the db
|
2020-10-23 14:38:07 +02:00 |
|
Timo Kösters
|
b2a1505535
|
Merge pull request 'improvement: correct thumbnailing algorithm' (#233) from fix-thumbnailing into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/233
|
2020-10-19 17:46:22 +02:00 |
|
Timo Kösters
|
6bb8284fc0
|
improvement: correct thumbnailing algorithm
|
2020-10-19 17:21:28 +02:00 |
|
Timo Kösters
|
de8bba4b49
|
Merge pull request 'Fix order of docker command arguments' (#232) from Weasy666/conduit:master into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/232
Reviewed-by: Timo Kösters <timo@koesters.xyz>
|
2020-10-19 07:05:18 +02:00 |
|
Timo Kösters
|
cde4178f4a
|
Merge pull request 'fix: use device_id when registering' (#231) from fix-deviceid into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/231
|
2020-10-18 21:54:37 +02:00 |
|
Timo Kösters
|
f0a21b6165
|
fix: use device_id when registering
TIL body.device_id != (*body).device_id, which is pretty bad, so I
renamed body.device_id to body.sender_device
|
2020-10-18 21:51:28 +02:00 |
|
Timo Kösters
|
9936027e8f
|
Merge pull request 'Change license to Apache-2.0' (#195) from license into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/195
|
2020-10-18 19:37:18 +02:00 |
|
Timo Kösters
|
fccd3fdb88
|
Merge pull request 'Allow unjoined users to read state of world readable rooms' (#230) from allow-reading-state into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/230
|
2020-10-18 16:45:17 +02:00 |
|
Timo Kösters
|
f6f15d9396
|
Use conduit.rs server in the README shield
|
2020-10-18 16:44:18 +02:00 |
|
Timo Kösters
|
243126d393
|
Allow reading state if history_visibility is world readable
See https://matrix.org/docs/spec/client_server/r0.6.1#id87
|
2020-10-18 16:44:18 +02:00 |
|
Timo
|
a2dbc6fe6d
|
Change license to Apache-2.0
|
2020-10-18 13:47:52 +02:00 |
|
Timo Kösters
|
9f487dd93a
|
Merge pull request 'Update README.md' (#229) from update-readme into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/229
|
2020-10-18 13:35:01 +02:00 |
|
Timo Kösters
|
ce94ad05a7
|
Update README.md
|
2020-10-18 13:23:06 +02:00 |
|
Timo Kösters
|
fbbf9f8999
|
Merge pull request 'docs: cross compile' (#226) from cross-compile into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/226
|
2020-10-18 13:03:18 +02:00 |
|
Timo Kösters
|
935546b25b
|
Merge pull request 'fix: random timeline reloads' (#227) from fix-random-timeline-reloads into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/227
|
2020-10-18 09:56:28 +02:00 |
|
Timo Kösters
|
151ef07fb3
|
docs: cross compile
|
2020-10-18 09:04:11 +02:00 |
|
Timo Kösters
|
12b0efac8b
|
fix: random timeline reloads
|
2020-10-18 09:03:40 +02:00 |
|
Timo Kösters
|
f56b463278
|
Merge pull request 'fix: double join over federation' (#225) from join into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/225
|
2020-10-17 11:29:03 +02:00 |
|
Timo Kösters
|
9109cb492f
|
fix: double join over federation
|
2020-10-17 11:24:57 +02:00 |
|
Timo Kösters
|
a89f7eaf9f
|
Merge pull request 'Add complement support for CI' (#209) from valkum/complement into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/209
|
2020-10-16 14:34:08 +02:00 |
|
Timo Kösters
|
f7c2d23599
|
Merge branch 'master' into valkum/complement
|
2020-10-16 14:27:09 +02:00 |
|
Timo Kösters
|
294fae5cdb
|
Merge pull request 'Update dependencies, remove dbgs' (#222) from deps into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/222
|
2020-10-16 14:12:08 +02:00 |
|
Timo Kösters
|
dfcfab5b7e
|
Merge branch 'master' into deps
|
2020-10-16 14:06:14 +02:00 |
|
Timo Kösters
|
9d1387954f
|
Update dependencies, remove dbgs
|
2020-10-16 14:04:29 +02:00 |
|
Timo Kösters
|
15fa7fb1cc
|
Merge pull request 'Reduce media ID length from 256 to 32' (#216) from miruka/conduit:reduce-mxc-length into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/216
Reviewed-by: Timo Kösters <timo@koesters.xyz>
|
2020-10-16 13:24:52 +02:00 |
|
Timo Kösters
|
b6ed018d16
|
Merge branch 'master' into reduce-mxc-length
|
2020-10-14 11:48:25 +02:00 |
|
Timo Kösters
|
0e817f6951
|
Merge pull request 'Federation, Admin room and many fixes' (#221) from federation into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/221
|
2020-10-13 19:04:42 +02:00 |
|
Timo Kösters
|
304c53c4f5
|
style: make clippy happier
|
2020-10-07 12:29:19 +02:00 |
|
Timo Kösters
|
4964e21342
|
Merge remote-tracking branch 'origin/master' into federation
|
2020-10-07 12:02:36 +02:00 |
|
Timo Kösters
|
6afc4c9b3e
|
feat: federation disabled by default
It can be enable in the Rocket.toml config or using ROCKET_FEDERATION_ENABLED=true
|
2020-10-07 11:51:56 +02:00 |
|
Timo Kösters
|
c15ae3c126
|
fix: invalid typing bytes because of 0xff in numbers
|
2020-10-07 11:51:56 +02:00 |
|
Timo Kösters
|
bcd1fe1856
|
feat: admin room
|
2020-10-07 11:51:49 +02:00 |
|
Timo Kösters
|
0d6159c2da
|
improvement: get_missing_events route and cleanup
|
2020-10-01 20:49:15 +02:00 |
|
Timo Kösters
|
ab332363ce
|
fix: don't send new requests to servers if we are already waiting
|
2020-10-01 20:49:14 +02:00 |
|
Timo Kösters
|
e08dfd982b
|
improvement: look at SRV record when sending requests
|
2020-09-23 12:04:02 +02:00 |
|
Timo Kösters
|
f0beffb0a9
|
Merge pull request 'Fix ruma dependency' (#211) from fix into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/211
|
2020-09-20 18:18:45 +02:00 |
|
Timo Kösters
|
19207845bc
|
Fix ruma dependency
|
2020-09-20 13:49:13 +02:00 |
|
Timo Kösters
|
267c721616
|
fix: encryption and sync spam
|
2020-09-18 10:29:44 +02:00 |
|
Timo Kösters
|
8bcfff2766
|
fix: no notification counts for fast /syncs
|
2020-09-18 10:29:43 +02:00 |
|