char
/
conduit
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
431 Commits
1 Branch
0 Tags
2.6 MiB
Commit Graph

431 Commits (49f6ab503a152072c3935c16e67097c8f7f073a9)

Author SHA1 Message Date
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
Rudi Floren fc08b13db1 Change CA to PKI per naming in Complement 2020-11-09 17:32:04 +01:00
Rudi Floren e4c5ed96a9 Sync with newest complement changes 2020-11-09 17:21:35 +01: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
Rudi Floren 335a33c901 Fix and Improve Complement testing Dockerfile 2020-10-30 02:57:22 +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
Daniel Wiesenberg 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
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