1d7207b39e
Sync are-we-synapse with dendrite
2021-02-05 02:06:14 +01:00
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
ebb38cd330
improvement: respect logout_devices param on password change
...
Move logout devices comment next to relevant loop
remove unnecessary log
2021-01-16 15:14:50 -07:00
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
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
6e36081573
improvement: more logging
2020-12-05 17:35:00 +01:00
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
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
e691e880e0
fix: logging thread crash when admin room does not exist
2020-12-02 16:08:59 +01:00
1a341543ba
Lock down the Conduit process in the systemd unit
...
This will secure the service more and allow only what is necessary.
2020-11-24 14:42:20 +01:00
1b4a79d47c
Add and install README.Debian
...
This file documents how the packaging is organized and how to
configure and use it. It also details what the default deployment
is like.
2020-11-24 14:42:20 +01:00
f72554de10
Split config into a Debian and local part
...
* The Debian part will be generated and managed by Debconf and configure
homeserver name, address and port
* The local part will just be a config file that shows the other
configuration options
Added the address configuration and moved the config generation
from the config to the postinst script.
2020-11-24 14:42:18 +01:00
79692db45d
First version of cargo-deb packaging setup
2020-11-24 14:38:15 +01:00
7078443460
Merge branch 'fix_complement' into 'master'
...
Fix complement
See merge request famedly/conduit!7
2020-11-18 20:17:50 +00:00
998f9e2109
Merge branch 'sending' into 'master'
...
Sending improvements
See merge request famedly/conduit!2
2020-11-09 19:28:56 +00:00
fc08b13db1
Change CA to PKI per naming in Complement
2020-11-09 17:32:04 +01:00
e4c5ed96a9
Sync with newest complement changes
2020-11-09 17:21:35 +01:00
9f8cffcd22
Admin room improvements
2020-11-09 12:21:57 +01:00
16b22bb432
fix: don't allow more than 50 PDUs in a transaction
2020-11-03 21:53:57 +01:00
335a33c901
Fix and Improve Complement testing Dockerfile
2020-10-30 02:57:22 +01:00
0762196963
fix: don't send new events from left rooms
2020-10-27 20:26:28 +01:00
2f5df4aac9
improvement: more reliable federation sending
2020-10-27 20:26:27 +01:00
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
df82314440
improvement: welcome message
2020-10-23 14:38:12 +02:00
6b3934e31d
feat: configurable cache capacity
2020-10-23 14:38:12 +02:00
6dbe195695
improvement: flush after every request that manipulates the db
2020-10-23 14:38:07 +02:00
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
6bb8284fc0
improvement: correct thumbnailing algorithm
2020-10-19 17:21:28 +02:00
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
2d6b7750fd
Fix order of docker command arguments and change repository link to...
...
...github.com repo, to relieve some pressure from git.koesters.xyz.
2020-10-18 23:06:08 +02:00
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
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
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
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
f6f15d9396
Use conduit.rs server in the README shield
2020-10-18 16:44:18 +02:00
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
a2dbc6fe6d
Change license to Apache-2.0
2020-10-18 13:47:52 +02:00
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
ce94ad05a7
Update README.md
2020-10-18 13:23:06 +02:00
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
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
151ef07fb3
docs: cross compile
2020-10-18 09:04:11 +02:00
12b0efac8b
fix: random timeline reloads
2020-10-18 09:03:40 +02:00
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
9109cb492f
fix: double join over federation
2020-10-17 11:24:57 +02:00
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
f7c2d23599
Merge branch 'master' into valkum/complement
2020-10-16 14:27:09 +02:00
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
dfcfab5b7e
Merge branch 'master' into deps
2020-10-16 14:06:14 +02:00
9d1387954f
Update dependencies, remove dbgs
2020-10-16 14:04:29 +02:00
Valkum
Timo Kösters
Devon Hudson
Paul van Tilburg
Daniel Wiesenberg