Commit Graph

332 Commits (7c456a0390a5e14d8b758bc8f80c93a7c597f0ea)
 

Author SHA1 Message Date
Daniel Wiesenberg 0338053774 Add ability to switch between local and remote build with build arg a...
...nd add env vars to docker-compose
4 years ago
Daniel Wiesenberg ecb6416244 Image now builds and runs 🎉 Thx to the help of yzhr 4 years ago
Daniel Wiesenberg a21858758c Change labels from label-schema to opencontainer.image 4 years ago
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"
4 years ago
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>
4 years ago
Devin Ragotzy da1c53aaef Make State struct constructable by lib user 4 years ago
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>
4 years ago
Guillem Nieto b575593647 Do not ignore db errors 4 years ago
Guillem Nieto 47abe6686e Send invites only if invited during the sync request
Fixes: https://git.koesters.xyz/timo/conduit/issues/175
4 years ago
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
4 years ago
timokoesters 98f37302a6
feat: handle /publicRooms pagination 4 years ago
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
4 years ago
timokoesters 0616acbde6
feat: handle inhibit_login in /register 4 years ago
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
4 years ago
timokoesters c1c62b7eb4
refactor: put endpoints into modules 4 years ago
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>
4 years ago
Devin Ragotzy 7a70d8488f Rebase with master and update append_pdu call 4 years ago
Devin Ragotzy c8d7d80eb2 Fix start/end token swap left from dropped commits 4 years ago
Devin Ragotzy 99220565d4 Fix invite leave auth error by moving update_membership 4 years ago
Devin Ragotzy 25c0e75f29 Cargo fmt 4 years ago
Devin Ragotzy 8aac332b3a Move ignore invite logic into update_member 4 years ago
Devin Ragotzy f2fab27d81 Implement filtering invites if sender is ignored by receiver 4 years ago
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
4 years ago
timokoesters 52b1df6fd2
improvement: handle limit and set limited in /user_directory/search 4 years ago
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
4 years ago
timokoesters ce460ea159
fix: send device list updates when user is in no rooms 4 years ago
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>
4 years ago
timokoesters b67372b11b
refactor: make all mods in database pub
Now they can easily export their own structs
4 years ago
Devin Ragotzy d948f896c0
Turn append_pdu args into struct PduBuilder 4 years ago
Devin Ragotzy 1c6f211933
Create media::FileMeta to represent a file and meta data 4 years ago
Devin Ragotzy 2da48b941d
Convert all map_err -> expect when deserializing to Raw 4 years ago
Devin Ragotzy 62df9ca580
Fix all clippy warnings, shorten line len in client_server 4 years ago
Timo Kösters 3ccbd02081 Merge pull request 'Long polling and more' (#162) from longpoll into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/162
4 years ago
timokoesters e0d0fb4703
fix: only send device_one_time_keys_count when there are updates 4 years ago
timokoesters 66bc25fcd3
feat: implement /keys/changes 4 years ago
timokoesters 0693387769
improvement: more efficient /sync and only send device updates when sharing a room 4 years ago
timokoesters 310b0fcd86
fix ci 4 years ago
timokoesters d891bbb5dc
improve: presence 4 years ago
timokoesters 05f9d927b8
fix: account data 4 years ago
timokoesters 21eb8d4fe3
fix: problems with pdu serialization 4 years ago
timokoesters dd3dab39ae
feat: whoami route 4 years ago
timokoesters 489cbc0a93
refactor: use <_> instead of <_parameter_name> 4 years ago
gnieto cc411c530b Fix custom account data serialization (#165)
Stylistic change

Fix custom data serialization

Build a custom event before storing global account data

Co-authored-by: Guillem Nieto <gnieto.talo@gmail.com>
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/165
Reviewed-by: Timo Kösters <timo@koesters.xyz>
4 years ago
Timo Kösters c4260bde81 Merge pull request 'Timo's Conditionally emit rocket::http_verb attr macros if lib/bin' (#157) from timo-make-lib into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/157
4 years ago
Devin Ragotzy e6a1b0b66f
Add cfg_attr gate to server_server endpoints 4 years ago
Devin Ragotzy 42e0102a2a
Conditionally emit rocket::http_verb attr macros if lib/bin 4 years ago
Timo Kösters b82fd02ee3 Merge pull request 'Implement /rooms/<room_id>/joined_members' (#143) from joined_members into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/143
4 years ago
CapsizeGlimmer 4d4969862a
Implement /rooms/<room_id>/joined_members 4 years ago
Timo Kösters fdb7b8f0f1 Merge pull request 'Implement max_request_size config option' (#153) from media-size-config into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/153
Reviewed-by: Timo Kösters <timo@koesters.xyz>
4 years ago
timokoesters 5f47cbf7dc
improvement: documentation 4 years ago