0762196963
fix: don't send new events from left rooms
Timo Kösters
2020-10-27 20:25:43 +01:00
2f5df4aac9
improvement: more reliable federation sending
Timo Kösters
2020-10-21 16:08:54 +02:00
18f33b1ece
Merge pull request 'Frequent flushing, configurable cache capacity, welcome message' (#237) from small-improvements into master
Timo Kösters
2020-10-23 14:41:54 +02:00
df82314440
improvement: welcome message
Timo Kösters
2020-10-23 14:35:41 +02:00
6b3934e31d
feat: configurable cache capacity
Timo Kösters
2020-10-21 21:43:59 +02:00
6dbe195695
improvement: flush after every request that manipulates the db
Timo Kösters
2020-10-21 21:28:02 +02:00
b2a1505535
Merge pull request 'improvement: correct thumbnailing algorithm' (#233) from fix-thumbnailing into master
Timo Kösters
2020-10-19 17:46:22 +02:00
6bb8284fc0
improvement: correct thumbnailing algorithm
Timo Kösters
2020-10-19 15:29:36 +02:00
de8bba4b49
Merge pull request 'Fix order of docker command arguments' (#232) from Weasy666/conduit:master into master
Timo Kösters
2020-10-19 07:05:18 +02:00
2d6b7750fd
Fix order of docker command arguments and change repository link to...
Daniel Wiesenberg
2020-10-18 23:06:08 +02:00
cde4178f4a
Merge pull request 'fix: use device_id when registering' (#231) from fix-deviceid into master
Timo Kösters
2020-10-18 21:54:37 +02:00
f0a21b6165
fix: use device_id when registering
Timo Kösters
2020-10-18 20:33:12 +02:00
9936027e8f
Merge pull request 'Change license to Apache-2.0' (#195) from license into master
Timo Kösters
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
Timo Kösters
2020-10-18 16:45:17 +02:00
f6f15d9396
Use conduit.rs server in the README shield
Timo Kösters
2020-10-18 16:40:02 +02:00
243126d393
Allow reading state if history_visibility is world readable
Timo Kösters
2020-10-18 16:19:14 +02:00
a2dbc6fe6d
Change license to Apache-2.0
Timo
2020-08-24 11:32:15 +02:00
9f487dd93a
Merge pull request 'Update README.md' (#229) from update-readme into master
Timo Kösters
2020-10-18 13:35:01 +02:00
ce94ad05a7
Update README.md
Timo Kösters
2020-10-18 13:23:06 +02:00
fbbf9f8999
Merge pull request 'docs: cross compile' (#226) from cross-compile into master
Timo Kösters
2020-10-18 13:03:18 +02:00
935546b25b
Merge pull request 'fix: random timeline reloads' (#227) from fix-random-timeline-reloads into master
Timo Kösters
2020-10-18 09:56:28 +02:00
151ef07fb3
docs: cross compile
Timo Kösters
2020-10-18 08:48:31 +02:00
12b0efac8b
fix: random timeline reloads
Timo Kösters
2020-10-18 08:56:21 +02:00
f56b463278
Merge pull request 'fix: double join over federation' (#225) from join into master
Timo Kösters
2020-10-17 11:29:03 +02:00
9109cb492f
fix: double join over federation
Timo Kösters
2020-10-17 11:24:57 +02:00
a89f7eaf9f
Merge pull request 'Add complement support for CI' (#209) from valkum/complement into master
Timo Kösters
2020-10-16 14:34:08 +02:00
f7c2d23599
Merge branch 'master' into valkum/complement
Timo Kösters
2020-10-16 14:27:09 +02:00
294fae5cdb
Merge pull request 'Update dependencies, remove dbgs' (#222) from deps into master
Timo Kösters
2020-10-16 14:12:08 +02:00
dfcfab5b7e
Merge branch 'master' into deps
Timo Kösters
2020-10-16 14:06:14 +02:00
9d1387954f
Update dependencies, remove dbgs
Timo Kösters
2020-10-16 14:04:29 +02:00
15fa7fb1cc
Merge pull request 'Reduce media ID length from 256 to 32' (#216) from miruka/conduit:reduce-mxc-length into master
Timo Kösters
2020-10-16 13:24:52 +02:00
b6ed018d16
Merge branch 'master' into reduce-mxc-length
Timo Kösters
2020-10-14 11:48:25 +02:00
0e817f6951
Merge pull request 'Federation, Admin room and many fixes' (#221) from federation into master
Timo Kösters
2020-10-13 19:04:42 +02:00
304c53c4f5
style: make clippy happier
Timo Kösters
2020-10-07 12:29:19 +02:00
4964e21342
Merge remote-tracking branch 'origin/master' into federation
Timo Kösters
2020-10-07 12:02:36 +02:00