char/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
300 commits 1 branch 0 tags 2.6 MiB
Commit graph

300 commits

This branch
This branch
All branches
Author SHA1 Message Date
Timo
3ff17f69ad
fmt 2020-08-23 16:14:07 +02:00
Timo
4be68eba76
feat: allow querying conduit's room list over federation 2020-08-23 16:14:07 +02:00
Timo
940f533d61
refactor: avoid some allocations when redacting 2020-08-23 16:14:06 +02:00
Timo
04eee089e0
feat: first steps towards joining rooms over federation 2020-08-23 16:14:06 +02:00
timokoesters
f40f1d9f75
docs: endpoint documentation 2020-08-23 16:14:06 +02:00
Timo Kösters
cfda76860b Merge pull request 'Make default server name more obvious' (#192) from spaetz/conduit:master into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/192
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-08-18 20:51:15 +02:00
Sebastian Spaeth
6b7e92ccf5 Make default server name more obvious 
Too many people fell into the trap and left conduit.rs in the deployment
configuration, wondering why users are all listed as @conduit.rs.

Make the default server name really easy to identify and make it obvious
that this needs to be changed.
 2020-08-18 19:18:10 +02:00
Timo Kösters
6191c3bd00 Merge pull request 'Fix license.' (#190) from q-b/conduit-fork:license into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/190
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-08-17 14:13:19 +02:00
Faelar
0fef955b28 Fix license. 2020-08-17 13:59:35 +02:00
Timo Kösters
2d96323d5f Merge pull request 'Update ruma' (#184) from jplatte/conduit:up-ruma into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/184
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-08-13 09:04:22 +02:00
Jonas Platte
75ea0b3163
Update ruma 2020-08-12 23:42:17 +02:00
Timo Kösters
4b3d6e736f Merge pull request 'Alpine based Docker image' (#152) from Weasy666/conduit:master into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/152
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-08-12 21:42:58 +02:00
Timo
2fc99c05e1
docs: add documentation to the repo and improve layout 2020-08-12 21:17:53 +02:00
Daniel Wiesenberg
87ed132ae4 Add README in docker folder and mention docker in Conduit's README 2020-08-11 15:38:24 +02:00
Daniel Wiesenberg
7288010e55 Move additional files into dedicated folder and make build the def... 
...fault in the compose files.
 2020-08-11 15:38:24 +02:00
Daniel Wiesenberg
31c725660f Add build option to compose file 2020-08-11 15:38:24 +02:00
Daniel Wiesenberg
7456caeefd Add Element-Web to compose and provide extra compose files for using.. 
..Conduit behind Traefik Reverse Proxy
 2020-08-11 15:38:24 +02:00
Daniel Wiesenberg
5f3cb3f926 Minor modifications to compose file and update Dockerfile comments 2020-08-11 15:38:24 +02:00
Daniel Wiesenberg
0338053774 Add ability to switch between local and remote build with build arg a... 
...nd add env vars to docker-compose
 2020-08-11 15:38:24 +02:00
Daniel Wiesenberg
ecb6416244 Image now builds and runs 🎉 Thx to the help of yzhr 2020-08-11 15:38:24 +02:00
Daniel Wiesenberg
a21858758c Change labels from label-schema to opencontainer.image 2020-08-11 15:38:24 +02:00
Daniel Wiesenberg
624ff08a07 Initial docker files trinity 
The image builds as is, but running it exits with: standard_init_linux.go:211: exec user process caused "no such file or directory"
 2020-08-11 15:38:23 +02:00
Timo Kösters
0f1e3d8214 Merge pull request 'Make State struct constructable by lib user' (#178) from DevinR528/conduit:library-mode into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/178
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-08-04 08:03:41 +02:00
Devin Ragotzy
da1c53aaef Make State struct constructable by lib user 2020-08-03 20:56:14 -04:00
Timo Kösters
4a8bc93b1a Merge pull request 'Send invites only if invited during the sync request' (#176) from gnieto/conduit:fix/send-invite-when-needed into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/176
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-08-02 10:41:05 +02:00
Guillem Nieto
b575593647 Do not ignore db errors 2020-08-02 09:38:20 +02:00
Guillem Nieto
47abe6686e Send invites only if invited during the sync request 
Fixes: https://git.koesters.xyz/timo/conduit/issues/175
 2020-08-02 09:24:47 +02:00
Timo Kösters
935f0e6185 Merge pull request 'feat: handle /publicRooms pagination' (#174) from publicrooms-pagination into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/174
 2020-07-30 22:52:23 +02:00
timokoesters
98f37302a6
feat: handle /publicRooms pagination 2020-07-30 22:51:02 +02:00
Timo Kösters
5cfda2f5d3 Merge pull request 'feat: handle inhibit_login in /register' (#173) from inhibit-login into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/173
 2020-07-30 22:21:09 +02:00
timokoesters
0616acbde6
feat: handle inhibit_login in /register 2020-07-30 20:52:37 +02:00
Timo Kösters
acc7b15981 Merge pull request 'refactor: put endpoints into modules' (#172) from route-files into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/172
 2020-07-30 19:09:43 +02:00
timokoesters
c1c62b7eb4
refactor: put endpoints into modules 2020-07-30 18:34:03 +02:00
Timo Kösters
485a24398b Merge pull request 'Implement ignore invite when inviting user is ignored' (#164) from DevinR528/conduit:ignored-list-invite into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/164
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-07-30 15:27:08 +02:00
Devin Ragotzy
7a70d8488f Rebase with master and update append_pdu call 2020-07-30 09:22:51 -04:00
Devin Ragotzy
c8d7d80eb2 Fix start/end token swap left from dropped commits 2020-07-30 09:22:51 -04:00
Devin Ragotzy
99220565d4 Fix invite leave auth error by moving update_membership 2020-07-30 09:22:51 -04:00
Devin Ragotzy
25c0e75f29 Cargo fmt 2020-07-30 09:22:51 -04:00
Devin Ragotzy
8aac332b3a Move ignore invite logic into update_member 2020-07-30 09:22:51 -04:00
Devin Ragotzy
f2fab27d81 Implement filtering invites if sender is ignored by receiver 2020-07-30 09:22:51 -04:00
Timo Kösters
100e3d6d6d Merge pull request 'improvement: handle limit and set limited in /user_directory/search' (#169) from user-dir-limit into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/169
 2020-07-30 15:19:21 +02:00
timokoesters
52b1df6fd2
improvement: handle limit and set limited in /user_directory/search 2020-07-30 15:17:34 +02:00
Timo Kösters
18dcf44aa4 Merge pull request 'fix: send device list updates when user is in no rooms' (#170) from fix-set-up-encryption into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/170
 2020-07-30 14:46:27 +02:00
timokoesters
ce460ea159
fix: send device list updates when user is in no rooms 2020-07-30 14:09:05 +02:00
Timo Kösters
c824652de6 Merge pull request 'Fix clippy warnings and run rustfmt' (#163) from DevinR528/conduit:clippy-fix2 into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/163
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-07-30 08:20:31 +02:00
timokoesters
b67372b11b
refactor: make all mods in database pub 
Now they can easily export their own structs
 2020-07-29 21:48:31 +02:00
Devin Ragotzy
d948f896c0
Turn append_pdu args into struct PduBuilder 2020-07-29 21:47:09 +02:00
Devin Ragotzy
1c6f211933
Create media::FileMeta to represent a file and meta data 2020-07-29 21:33:48 +02:00
Devin Ragotzy
2da48b941d
Convert all map_err -> expect when deserializing to Raw 2020-07-29 21:33:47 +02:00
Devin Ragotzy
62df9ca580
Fix all clippy warnings, shorten line len in client_server 2020-07-29 21:32:35 +02:00