Commit graph

  • 1e8fbd8d50
    Update ruma version Timo Kösters 2020-09-08 17:32:03 +0200
  • b5488f86b5 Merge pull request 'Add room upgrade.' (#182) from q-b/conduit-fork:rooms_upgrade into master Timo Kösters 2020-09-01 13:10:30 +0200
  • 698e44a732
    Fix /upgrade account data problems Timo Kösters 2020-09-01 13:07:32 +0200
  • 515465f900
    fix: make element not show "unknown user" warning Timo Kösters 2020-08-31 13:23:39 +0200
  • df55e8ed0b
    Add room upgrade. Faelar 2020-08-06 13:21:53 +0200
  • aef0c8563c Merge pull request 'improvement: add remaining key backup endpoints' (#201) from keybackup into master Timo Kösters 2020-08-31 11:24:11 +0200
  • 2a63d0955a Sort and authenticate the events from /send_join response Devin Ragotzy 2020-08-30 16:08:47 -0400
  • 3b40f3d60e Update state-res crate Devin Ragotzy 2020-08-27 16:10:20 -0400
  • f46c2d1eec Fix review issues, move state-res to spec-comp branch Devin Ragotzy 2020-08-26 11:15:52 -0400
  • 3f4cb753ee
    improvement: add remaining key backup endpoints Timo Kösters 2020-08-27 14:48:20 +0200
  • d15b8d7c4e Merge pull request 'feat: handle txn ids' (#198) from txnids into master Timo Kösters 2020-08-25 21:35:24 +0200
  • 4954df3cc3
    feat: handle txn ids Timo 2020-08-25 13:24:38 +0200
  • d9a29e3e5c Fix state for empty key route Devin Ragotzy 2020-08-25 15:30:25 -0400
  • 6343eea417 Merge pull request 'Docker add healthcheck and mention Docker Hub image' (#196) from Weasy666/conduit:master into master Timo Kösters 2020-08-25 09:40:08 +0200
  • 38ac3e42be Docker add healthcheck and mention Docker Hub image Daniel Wiesenberg 2020-08-24 23:30:39 +0200
  • 0f524955b2 Merge pull request 'fix: send notification count updates when private read receipts change' (#194) from fixrr into master Timo Kösters 2020-08-24 13:39:39 +0200
  • 0c1cc8d82b
    Fix CI Timo 2020-08-24 10:45:57 +0200
  • 33215d6099
    fix: send notification count updates when private read receipts change Timo 2020-08-23 17:29:39 +0200
  • 9aa5e99a0f Merge pull request 'fix: put reason of redaction in the redacted event' (#193) from redact into master Timo Kösters 2020-08-24 10:43:05 +0200
  • f0cb17d7a5 Merge branch 'master' into redact Timo Kösters 2020-08-24 10:42:00 +0200
  • 27ffe77823 Use helper instead of route for get_public_rooms_filtered Devin Ragotzy 2020-08-23 08:32:43 -0400
  • 1848f08292 Use full sorting algorithm on incoming PDU's in membership Devin Ragotzy 2020-08-21 21:44:55 -0400
  • 3c26166fb5 improvement: device list works better Timo 2020-08-21 21:22:59 +0200
  • 972babbc79 fix: set limited to true when skipping messages in /sync Timo 2020-08-19 18:26:39 +0200
  • 672bf4f473 Cargo lock update and a few doc additions Devin Ragotzy 2020-08-21 20:18:56 -0400
  • fe795d38ea Replace route calling routes with helpers Devin Ragotzy 2020-08-21 17:19:18 -0400
  • 5ccdd3694b Add helper function for get_alias route Devin Ragotzy 2020-08-20 12:12:02 -0400
  • ea20032404 Helper for join_room_by_id route so routes aren't calling routes Devin Ragotzy 2020-08-19 19:30:28 -0400
  • 64fb0374b6 Use Vec<u8> instead of string for digest bytes and add roomid_statehash Devin Ragotzy 2020-08-19 19:29:39 -0400
  • d73c6aa8ad Add roomid_statehash tree, clean up review issues Devin Ragotzy 2020-08-19 17:27:24 -0400
  • 846a0098c1 Split append_pdu -> append_pdu and build_and_append Devin Ragotzy 2020-08-18 16:26:03 -0400
  • cb68bf9e0c Use ring crate to generate StatHashes when saving stateid/statehash Devin Ragotzy 2020-08-18 14:32:38 -0400
  • c4f5a0a631 Keep track of State at event for state resolution Devin Ragotzy 2020-08-06 08:29:59 -0400
  • 38663228f5
    fix: put reason of redaction in the redacted event Timo 2020-08-23 16:47:27 +0200
  • 8e55623bde Merge pull request 'More Federation' (#181) from docs into master Timo Kösters 2020-08-23 16:15:01 +0200
  • 7ba9263cc6
    improvement: show most recent PDUs first when searching Timo 2020-08-22 23:09:53 +0200
  • 366554630a
    fix: account registration Timo 2020-08-22 22:49:19 +0200
  • 804d097a18
    fix: wake up /sync for typing events Timo 2020-08-22 22:02:32 +0200
  • c092f06068
    docs: /sync Timo 2020-08-22 21:38:01 +0200
  • df936e8e7e
    improvement: guests are more spec-conform Timo 2020-08-22 21:19:14 +0200
  • 64789537f5
    fix: device list when leaving rooms Timo 2020-08-22 21:00:38 +0200
  • 4323cf5fec
    improvement: device list works better Timo 2020-08-21 21:22:59 +0200
  • f23fb32e95
    fix: set limited to true when skipping messages in /sync Timo 2020-08-19 18:26:39 +0200
  • e457e19088
    feat: search pdus timokoesters 2020-08-18 12:15:27 +0200
  • 27d35f5ab4
    docs: fix /register method Timo 2020-08-18 12:43:27 +0200
  • 69a7cb5142
    fix dependency version Timo 2020-08-14 11:36:25 +0200
  • 3ff17f69ad
    fmt Timo 2020-08-14 11:34:15 +0200
  • 4be68eba76
    feat: allow querying conduit's room list over federation Timo 2020-08-14 11:29:32 +0200
  • 940f533d61
    refactor: avoid some allocations when redacting Timo 2020-08-12 15:33:45 +0200
  • 04eee089e0
    feat: first steps towards joining rooms over federation Timo 2020-08-14 11:31:31 +0200
  • f40f1d9f75
    docs: endpoint documentation timokoesters 2020-07-31 14:40:28 +0200
  • cfda76860b Merge pull request 'Make default server name more obvious' (#192) from spaetz/conduit:master into master Timo Kösters 2020-08-18 20:51:15 +0200
  • 6b7e92ccf5 Make default server name more obvious Sebastian Spaeth 2020-08-18 17:42:11 +0200
  • 6191c3bd00 Merge pull request 'Fix license.' (#190) from q-b/conduit-fork:license into master Timo Kösters 2020-08-17 14:13:19 +0200
  • 0fef955b28 Fix license. Faelar 2020-08-17 13:59:35 +0200
  • 2d96323d5f Merge pull request 'Update ruma' (#184) from jplatte/conduit:up-ruma into master Timo Kösters 2020-08-13 09:04:22 +0200
  • 75ea0b3163
    Update ruma Jonas Platte 2020-08-12 23:32:39 +0200
  • 4b3d6e736f Merge pull request 'Alpine based Docker image' (#152) from Weasy666/conduit:master into master Timo Kösters 2020-08-12 21:42:58 +0200
  • 2fc99c05e1
    docs: add documentation to the repo and improve layout Timo 2020-08-12 21:17:53 +0200
  • 87ed132ae4 Add README in docker folder and mention docker in Conduit's README Daniel Wiesenberg 2020-08-04 22:06:13 +0200
  • 7288010e55 Move additional files into dedicated folder and make build the def... Daniel Wiesenberg 2020-08-04 22:04:27 +0200
  • 31c725660f Add build option to compose file Daniel Wiesenberg 2020-08-02 16:29:50 +0200
  • 7456caeefd Add Element-Web to compose and provide extra compose files for using.. Daniel Wiesenberg 2020-08-02 15:55:40 +0200
  • 5f3cb3f926 Minor modifications to compose file and update Dockerfile comments Daniel Wiesenberg 2020-08-02 12:58:52 +0200
  • 0338053774 Add ability to switch between local and remote build with build arg a... Daniel Wiesenberg 2020-08-01 18:20:30 +0200
  • ecb6416244 Image now builds and runs 🎉 Thx to the help of yzhr Daniel Wiesenberg 2020-08-01 15:18:49 +0200
  • a21858758c Change labels from label-schema to opencontainer.image Daniel Wiesenberg 2020-07-27 18:10:34 +0200
  • 624ff08a07 Initial docker files trinity Daniel Wiesenberg 2020-07-23 23:58:08 +0200
  • 0f1e3d8214 Merge pull request 'Make State struct constructable by lib user' (#178) from DevinR528/conduit:library-mode into master Timo Kösters 2020-08-04 08:03:41 +0200
  • da1c53aaef Make State struct constructable by lib user Devin Ragotzy 2020-08-03 20:56:14 -0400
  • 4a8bc93b1a Merge pull request 'Send invites only if invited during the sync request' (#176) from gnieto/conduit:fix/send-invite-when-needed into master Timo Kösters 2020-08-02 10:41:05 +0200
  • b575593647 Do not ignore db errors Guillem Nieto 2020-08-02 09:38:20 +0200
  • 47abe6686e Send invites only if invited during the sync request Guillem Nieto 2020-08-02 09:24:47 +0200
  • 935f0e6185 Merge pull request 'feat: handle /publicRooms pagination' (#174) from publicrooms-pagination into master Timo Kösters 2020-07-30 22:52:23 +0200
  • 98f37302a6
    feat: handle /publicRooms pagination timokoesters 2020-07-30 22:09:11 +0200
  • 5cfda2f5d3 Merge pull request 'feat: handle inhibit_login in /register' (#173) from inhibit-login into master Timo Kösters 2020-07-30 22:21:09 +0200
  • 0616acbde6
    feat: handle inhibit_login in /register timokoesters 2020-07-30 20:49:29 +0200
  • acc7b15981 Merge pull request 'refactor: put endpoints into modules' (#172) from route-files into master Timo Kösters 2020-07-30 19:09:43 +0200
  • c1c62b7eb4
    refactor: put endpoints into modules timokoesters 2020-07-30 18:14:47 +0200
  • 485a24398b Merge pull request 'Implement ignore invite when inviting user is ignored' (#164) from DevinR528/conduit:ignored-list-invite into master Timo Kösters 2020-07-30 15:27:08 +0200
  • 7a70d8488f Rebase with master and update append_pdu call Devin Ragotzy 2020-07-30 08:43:51 -0400
  • c8d7d80eb2 Fix start/end token swap left from dropped commits Devin Ragotzy 2020-07-30 07:50:09 -0400
  • 99220565d4 Fix invite leave auth error by moving update_membership Devin Ragotzy 2020-07-29 17:07:12 -0400
  • 25c0e75f29 Cargo fmt Devin Ragotzy 2020-07-29 14:28:40 -0400
  • 8aac332b3a Move ignore invite logic into update_member Devin Ragotzy 2020-07-29 13:47:50 -0400
  • f2fab27d81 Implement filtering invites if sender is ignored by receiver Devin Ragotzy 2020-07-27 20:48:51 -0400
  • 100e3d6d6d Merge pull request 'improvement: handle limit and set limited in /user_directory/search' (#169) from user-dir-limit into master Timo Kösters 2020-07-30 15:19:21 +0200
  • 52b1df6fd2
    improvement: handle limit and set limited in /user_directory/search timokoesters 2020-07-30 11:12:49 +0200
  • 18dcf44aa4 Merge pull request 'fix: send device list updates when user is in no rooms' (#170) from fix-set-up-encryption into master Timo Kösters 2020-07-30 14:46:27 +0200
  • ce460ea159
    fix: send device list updates when user is in no rooms timokoesters 2020-07-30 14:05:08 +0200
  • c824652de6 Merge pull request 'Fix clippy warnings and run rustfmt' (#163) from DevinR528/conduit:clippy-fix2 into master Timo Kösters 2020-07-30 08:20:31 +0200
  • b67372b11b
    refactor: make all mods in database pub timokoesters 2020-07-29 21:27:49 +0200
  • d948f896c0
    Turn append_pdu args into struct PduBuilder Devin Ragotzy 2020-07-28 09:00:23 -0400
  • 1c6f211933
    Create media::FileMeta to represent a file and meta data Devin Ragotzy 2020-07-28 08:59:30 -0400
  • 2da48b941d
    Convert all map_err -> expect when deserializing to Raw Devin Ragotzy 2020-07-27 19:46:38 -0400
  • 62df9ca580
    Fix all clippy warnings, shorten line len in client_server Devin Ragotzy 2020-07-25 23:56:50 -0400
  • 3ccbd02081 Merge pull request 'Long polling and more' (#162) from longpoll into master Timo Kösters 2020-07-29 21:17:58 +0200
  • e0d0fb4703
    fix: only send device_one_time_keys_count when there are updates timokoesters 2020-07-29 20:44:06 +0200
  • 66bc25fcd3
    feat: implement /keys/changes timokoesters 2020-07-29 17:37:26 +0200
  • 0693387769
    improvement: more efficient /sync and only send device updates when sharing a room timokoesters 2020-07-29 17:03:04 +0200