Timo Kösters
|
6d109b9902
|
Merge branch 'mdformatting' into 'master'
docs: Fix markdown formatting in DEPLOY.md
See merge request famedly/conduit!58
|
2021-04-16 09:24:52 +00:00 |
|
Timo Kösters
|
18398e1f17
|
Merge branch 'bump-stateres' into 'master'
Bump stateres
See merge request famedly/conduit!57
|
2021-04-14 15:47:00 +00:00 |
|
Timo Kösters
|
04b08d4505
|
chore: bump stateres
|
2021-04-14 17:46:17 +02:00 |
|
Timo Kösters
|
f6c4da829e
|
Merge branch 'better-joining' into 'master'
improvement: use invite state as hints to what servers to ask for joining
See merge request famedly/conduit!56
|
2021-04-14 13:06:14 +00:00 |
|
Timo Kösters
|
bc98425dfe
|
improvement: use invite state as hints to what servers to ask for joining
|
2021-04-14 14:46:40 +02:00 |
|
Timo Kösters
|
d6b59cd20c
|
Merge branch 'develop' into 'master'
State resolution overhaul
See merge request famedly/conduit!53
|
2021-04-14 11:36:53 +00:00 |
|
Timo Kösters
|
001d8dc257
|
fix: don't do expensive operation on local /send
|
2021-04-14 12:55:14 +02:00 |
|
Timo Kösters
|
c1953efa6b
|
chore: code cleanup
|
2021-04-14 10:43:31 +02:00 |
|
Timo Kösters
|
abddfc2d2a
|
Merge remote-tracking branch 'famedly/master' into develop
|
2021-04-14 10:26:28 +02:00 |
|
Timo Kösters
|
5951294638
|
feat: join cursed rooms
this removes several restrictions and tries to continue verifying a pdu
event if some auth events fail (it drops/ignores bad pdus)
|
2021-04-14 09:39:06 +02:00 |
|
Timo Kösters
|
8b40e0a85f
|
improvement: fetch signing keys in parallel when joining a room
|
2021-04-13 22:54:01 +02:00 |
|
Timo Kösters
|
5049d0e01b
|
improvement: check signatures on join
|
2021-04-13 18:17:51 +02:00 |
|
Timo Kösters
|
b4f79b77ba
|
feat: reject invites over federation
|
2021-04-13 17:41:14 +02:00 |
|
Timo Kösters
|
662a0cf1df
|
improvement: better and more efficient message count calculation
|
2021-04-12 12:40:16 +02:00 |
|
Timo Kösters
|
1dc85895a7
|
fix: show warning for invalid user ids
|
2021-04-12 10:12:52 +02:00 |
|
Timo Kösters
|
a961732f5f
|
fix: overflow
|
2021-04-11 21:35:17 +02:00 |
|
Timo Kösters
|
a8231eef25
|
fix: alias parsing
|
2021-04-11 21:29:37 +02:00 |
|
Timo Kösters
|
8773e5013d
|
feat: incoming invites over federation
|
2021-04-11 21:04:31 +02:00 |
|
Timo Kösters
|
b427395648
|
Merge branch 'add-vscode-settings' into 'master'
Add settings.json for vscode rust-analyzer
See merge request famedly/conduit!45
|
2021-04-11 10:56:38 +00:00 |
|
Timo Kösters
|
b4bbbd26bf
|
Merge branch 'MTRNord/propose-better-systemd-user' into 'master'
fix: Do not run conduit as root instead use a separate user
See merge request famedly/conduit!49
|
2021-04-11 10:52:52 +00:00 |
|
Timo Kösters
|
b0ea692706
|
fix: malformed pushrule error when event does not trigger any actions
|
2021-04-11 10:50:30 +02:00 |
|
Timo Kösters
|
588de12d79
|
fix: lost forward extremity
|
2021-04-11 10:12:29 +02:00 |
|
Timo Kösters
|
044e65afcc
|
fix: move back to sled stable
|
2021-04-11 10:12:05 +02:00 |
|
Timo Kösters
|
84f4ce73e5
|
fix: membership deserializing
|
2021-04-09 21:45:22 +02:00 |
|
Timo Kösters
|
51aa6448bc
|
fix: use sled main to avoid deadlock
|
2021-04-07 17:58:33 +02:00 |
|
Timo Kösters
|
f3f95a73d0
|
improvement: /event route
|
2021-04-07 15:57:23 +02:00 |
|
Timo Kösters
|
d0cdbe2e2b
|
Merge branch 'up-ruma' into 'develop'
Upgrade ruma
See merge request famedly/conduit!48
|
2021-04-07 13:55:31 +00:00 |
|
Timo Kösters
|
c9b1f0ca83
|
Merge branch 'k0gen-master-patch-33282' into 'master'
No need to log out and back in fix
See merge request famedly/conduit!47
|
2021-04-03 13:04:55 +00:00 |
|
Timo Kösters
|
db7044a950
|
sytest test
|
2021-03-26 13:41:05 +01:00 |
|
Timo Kösters
|
8c6a49bec3
|
Merge branch 'update_CI_for_develop' into 'develop'
Update Complement CI container
See merge request famedly/conduit!46
|
2021-03-26 12:31:34 +00:00 |
|
Timo Kösters
|
cd4dc13731
|
fix: use correct room versions
|
2021-03-26 13:30:17 +01:00 |
|
Timo Kösters
|
c213769d9f
|
improvement: refactor state res and fix a few bugs in the process
|
2021-03-25 23:55:40 +01:00 |
|
Timo Kösters
|
16eed1d8c2
|
chore: get rid of warnings
|
2021-03-24 12:44:10 +01:00 |
|
Timo Kösters
|
e50f2864de
|
improvement: save state for send_join pdu
|
2021-03-24 11:46:15 +01:00 |
|
Timo Kösters
|
e305889b72
|
feat: room_account_data endpoints
|
2021-03-24 08:48:28 +01:00 |
|
Timo Kösters
|
1d00a8c41f
|
improvement: better logging
Use CONDUIT_LOG or the log setting in the config
|
2021-03-23 22:06:09 +01:00 |
|
Timo Kösters
|
46d8f36a2c
|
fix: media thumbnail calculation and appservice detection
|
2021-03-23 21:18:16 +01:00 |
|
Timo Kösters
|
3ea7d162db
|
fix: various improvements and fixes
|
2021-03-23 12:59:27 +01:00 |
|
Timo Kösters
|
363c629faf
|
fix: signature key fetching, optimize push sending
|
2021-03-22 14:04:41 +01:00 |
|
Timo Kösters
|
d4c76f4654
|
chore: update ruma
|
2021-03-18 19:38:08 +01:00 |
|
Timo Kösters
|
f775c76d8a
|
chore: get rid of warnings
|
2021-03-18 18:33:43 +01:00 |
|
Timo Kösters
|
abe9122df6
|
Merge branch 'more-gitignore' into 'master'
Add more gitignore
See merge request famedly/conduit!42
|
2021-03-18 17:09:04 +00:00 |
|
Timo Kösters
|
5cb15551f3
|
improvement: use db compression
|
2021-03-18 13:13:08 +01:00 |
|
Timo Kösters
|
a0fa0ee7a0
|
fix: join appservice room with alias
|
2021-03-18 12:03:44 +01:00 |
|
Timo Kösters
|
a77fcd106e
|
feat: implement /state_ids and fix federation stuff
|
2021-03-18 00:11:13 +01:00 |
|
Timo Kösters
|
100307c936
|
improvement: optimize state storage
|
2021-03-17 22:31:28 +01:00 |
|
Timo Kösters
|
44425a903a
|
fix: multiple federation/pusher fixes
|
2021-03-16 18:00:46 +01:00 |
|
Timo Kösters
|
21f785d530
|
Merge branch 'correct-sendtxn' into pushers
|
2021-03-15 09:56:04 +01:00 |
|
Timo Kösters
|
6da40225bb
|
improvement: make state res actually work
|
2021-03-13 16:30:12 +01:00 |
|
Timo Kösters
|
e785ff6f56
|
Merge branch 'sled-no-metrics' into 'master'
fix: avoid illegal instruction crash
See merge request famedly/conduit!38
|
2021-03-12 17:29:47 +00:00 |
|
Timo Kösters
|
7bc58461cd
|
fix: avoid illegal instruction crash
see https://github.com/spacejam/sled/issues/1232
|
2021-03-12 16:22:35 +01:00 |
|
Timo Kösters
|
6538d91567
|
Merge branch 'readme' into 'master'
docs: add icon and license to readme
See merge request famedly/conduit!37
|
2021-03-04 20:37:50 +00:00 |
|
Timo Kösters
|
96431069a9
|
docs: add icon and license to readme
|
2021-03-04 21:37:24 +01:00 |
|
Timo Kösters
|
3436e844c2
|
Merge branch 'valkum-master-patch-62987' into 'master'
Fix Complement CI paths
See merge request famedly/conduit!36
|
2021-03-04 17:51:52 +00:00 |
|
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
|
2021-03-04 14:38:07 +00:00 |
|
Timo Kösters
|
03440f4b15
|
Merge branch 'readme' into 'master'
docs: small readme changes
See merge request famedly/conduit!35
|
2021-03-04 14:35:12 +00:00 |
|
Timo Kösters
|
79c910efdf
|
Merge branch 'clippy_again' into 'master'
Fix more clippy errors in master
See merge request famedly/conduit!34
|
2021-03-04 14:30:28 +00:00 |
|
Timo Kösters
|
bb1064ce04
|
docs: small readme changes
|
2021-03-04 15:28:28 +01:00 |
|
Timo Kösters
|
1ce00f90fe
|
fix: don't accept incoming pdus if we know about them already
|
2021-03-04 13:37:16 +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
|
602edfd849
|
feature: push rule settings
|
2021-02-23 17:21:01 -05:00 |
|
Timo Kösters
|
835cf80acd
|
fix: pushers
|
2021-02-11 13:17:21 +01: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
|
a119d858f3
|
feature: push rule settings
|
2021-01-24 16:07:49 +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 |
|