Commit graph

  • 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
  • 310b0fcd86
    fix ci timokoesters 2020-07-28 22:21:57 +0200
  • d891bbb5dc
    improve: presence timokoesters 2020-07-28 15:58:50 +0200
  • 05f9d927b8
    fix: account data timokoesters 2020-07-28 14:02:29 +0200
  • 21eb8d4fe3
    fix: problems with pdu serialization timokoesters 2020-07-27 21:53:28 +0200
  • dd3dab39ae
    feat: whoami route timokoesters 2020-07-27 17:38:00 +0200
  • 489cbc0a93
    refactor: use <_> instead of <_parameter_name> timokoesters 2020-07-27 17:36:54 +0200
  • cc411c530b Fix custom account data serialization (#165) gnieto 2020-07-29 07:48:34 +0200
  • c4260bde81 Merge pull request 'Timo's Conditionally emit rocket::http_verb attr macros if lib/bin' (#157) from timo-make-lib into master Timo Kösters 2020-07-27 20:40:30 +0200
  • e6a1b0b66f
    Add cfg_attr gate to server_server endpoints Devin Ragotzy 2020-07-26 09:39:57 -0400
  • 42e0102a2a
    Conditionally emit rocket::http_verb attr macros if lib/bin Devin Ragotzy 2020-07-25 23:08:00 -0400
  • b82fd02ee3 Merge pull request 'Implement /rooms/<room_id>/joined_members' (#143) from joined_members into master Timo Kösters 2020-07-27 18:22:04 +0200
  • 4d4969862a
    Implement /rooms/<room_id>/joined_members CapsizeGlimmer 2020-07-10 02:49:05 -0400
  • fdb7b8f0f1 Merge pull request 'Implement max_request_size config option' (#153) from media-size-config into master Timo Kösters 2020-07-27 18:08:50 +0200
  • 5f47cbf7dc
    improvement: documentation timokoesters 2020-07-27 18:06:27 +0200
  • 8fcf8e20b8
    fix MR 153 requests; cargo fmt CapsizeGlimmer 2020-07-24 16:04:01 -0400
  • fa2da9e048
    Implement max_request_size config option CapsizeGlimmer 2020-07-23 23:03:24 -0400
  • 3451b10a4b Merge pull request 'Fix CI' (#161) from fix-ci into master Timo Kösters 2020-07-27 08:21:34 +0200
  • 2765071201
    Fix CI timokoesters 2020-07-27 08:19:14 +0200
  • 75d91b9064 Merge pull request 'feat: encryption_disabled config option' (#160) from disable-encryption-config into master Timo Kösters 2020-07-27 08:15:04 +0200
  • 808a7deae3
    cargo fmt timokoesters 2020-07-26 22:45:10 +0200
  • dc5fb7e33a
    feat: encryption_disabled config option timokoesters 2020-07-26 20:41:10 +0200
  • 5a8705bd25 Add room tags (#140) gnieto 2020-07-26 22:33:20 +0200
  • c3d142ad28 Merge pull request 'fix: stop /messages at to' (#159) from fix-to into master Timo Kösters 2020-07-26 22:21:39 +0200
  • b7df8fe83c
    fix: stop /messages at to timokoesters 2020-07-26 17:34:12 +0200
  • 20ab19d828 Merge pull request 'Upgrade ruma' (#158) from jplatte/conduit:up-ruma into master Timo Kösters 2020-07-26 17:20:11 +0200
  • 09561ccea3
    Upgrade ruma Jonas Platte 2020-07-26 15:41:28 +0200
  • f8544bf6e3 Merge pull request 'improvement: only remove to-device events when sure the client received them' (#139) from improve-to-device-removal into master Timo Kösters 2020-07-26 14:14:08 +0200
  • 16576d19cd
    improvement: only remove to-device events when sure the client received them timokoesters 2020-07-03 11:24:23 +0200
  • 678f33acf9 Merge pull request 'Moving to ruma-monorepo' (#133) from DevinR528/conduit:ruma-mono into master Timo Kösters 2020-07-25 22:02:45 +0200
  • 87fd432527 Refactor account_data to be more similar to other endpoints Devin Ragotzy 2020-07-25 15:48:12 -0400
  • 60381ddcf4 Update to latest ruma/master rev Devin Ragotzy 2020-07-25 14:25:24 -0400
  • 61458536ab Merge branch 'master' of https://git.koesters.xyz/timo/conduit into ruma-mono Devin Ragotzy 2020-07-25 13:46:28 -0400
  • 630196f0a3 Implement get_joined_rooms (#155) aura 2020-07-25 18:35:22 +0200
  • be43b9557e Merge pull request 'improvement: switch to stable rust' (#151) from stable into master Timo Kösters 2020-07-23 10:23:01 +0200
  • d8e1248df6
    improvement: switch to stable rust timokoesters 2020-07-22 21:57:14 +0200
  • 84d47da392 Simplify deserialization and deconstruction for Responses Devin R 2020-07-21 16:26:01 -0400
  • 33bc666859 Use sync ephemeral events in sync Resposne (remove room_id) Devin R 2020-07-21 14:04:39 -0400
  • 9a993fa7c1 Convert Pdu to a validated ruma type when calling to_*_event Devin R 2020-07-18 08:22:30 -0400
  • 75959cdc10 Resolve stying review issues Devin R 2020-07-18 08:21:25 -0400
  • 029c60be78 Replace to_string into_boxed_str with into Devin R 2020-07-17 19:52:04 -0400
  • 59cbf202e4 Cargo.lock updated while rebasing Devin R 2020-07-17 16:05:53 -0400
  • d02685a4fd Update to latest ruma/ruma commit Devin R 2020-07-17 16:00:39 -0400
  • 63e23154f3 Rebase with key backups and cross signing Devin R 2020-06-26 18:34:11 -0400
  • 84dcb885a7 Return correct Errors and replace panic, fix misc review issues Devin R 2020-06-24 17:03:33 -0400
  • ddc7598870 Use ruma/ruma master Devin R 2020-06-23 18:58:39 -0400
  • 24b6702047 Add to_*_event_stub methods to pdu, filter for correct event kind Devin R 2020-06-22 07:26:09 -0400
  • 7c38e53839 Move to depend on ruma monorepo and ruma-events0.22 Devin R 2020-06-21 15:58:42 -0400
  • 9c095f1538 Update README, fix CI (#148) Timo Kösters 2020-07-16 07:50:11 +0200
  • b9de21949d Update to rocket master (#147) Timo Kösters 2020-07-14 18:23:26 +0200
  • 469071e105 feat: implement /event (#144) the0 2020-07-11 14:08:37 +0200
  • b03d030b71 Merge pull request 'Improve README' (#145) from readme into master Timo Kösters 2020-07-11 09:57:43 +0200
  • f361cb3d39
    Improve README timokoesters 2020-07-11 09:51:58 +0200
  • 8409146415 Merge pull request 'Implement /logout/all' (#141) from CapsizeGlimmer/conduit:logout-all into master Timo Kösters 2020-07-09 19:21:12 +0200
  • 3a8efaeafa Whitelist logout all CapsizeGlimmer 2020-07-07 23:09:29 -0400
  • 76aa44ead3 Add logout/all route to main CapsizeGlimmer 2020-07-05 02:35:19 -0400
  • 7c2144c6d7 Implement /logout/all CapsizeGlimmer 2020-07-04 16:41:05 -0400
  • b81939841b feat: account deactivation (#137) the0 2020-07-05 07:48:19 +0200
  • 67a1f21f5d feat: implement password changing (#138) the0 2020-07-02 20:38:25 +0200
  • e809d819ac Merge pull request 'Key backups and cross signing' (#132) from cross-signing into master Timo Kösters 2020-06-26 19:01:32 +0200
  • b83fba5c44
    chore: update dependencies timokoesters 2020-06-26 18:04:08 +0200
  • 54ad1fbed9
    fix: CI timokoesters 2020-06-26 16:15:18 +0200
  • 05f1f73e10
    improvement: upgrade to sled 0.32 timokoesters 2020-06-26 16:10:56 +0200
  • 24c544f650
    fix: DMs show up as rooms timokoesters 2020-06-26 10:07:02 +0200
  • 8f06d0258a
    Remove is_direct flag from Join event Guillem Nieto 2020-06-19 12:19:07 +0200
  • a49a572d76
    feat: cross-signing timokoesters 2020-06-16 12:11:38 +0200
  • 7031240af3
    improvement: /members route timokoesters 2020-06-14 08:57:47 +0200
  • 02fe030b2a
    improvement: better default push rules timokoesters 2020-06-12 13:18:25 +0200
  • e7803e310a Merge pull request 'fix: update rocket version' (#127) from fix into master Timo Kösters 2020-06-16 13:55:20 +0200
  • db685e0cf7
    fix: update rocket version timokoesters 2020-06-16 13:53:15 +0200
  • 0f72bd9f32 Merge pull request 'fix: update ruma version' (#125) from fix into master Timo Kösters 2020-06-16 12:21:12 +0200
  • 13d474f6ee
    fix: update ruma version timokoesters 2020-06-16 12:19:58 +0200
  • bc959f7634 Merge pull request 'Update 'README.md'' (#123) from timo-patch-1 into master Timo Kösters 2020-06-16 08:44:24 +0200
  • 853ccd6fbf Update 'README.md' Timo Kösters 2020-06-16 08:43:46 +0200
  • b0bbc049fa Merge pull request 'Update 'README.md'' (#122) from timo-bitcoin into master Timo Kösters 2020-06-16 08:42:13 +0200
  • c6194b27a3 Update 'README.md' Timo Kösters 2020-06-16 08:21:06 +0200
  • 7b23069943 Merge pull request 'Remove unused imports' (#119) from PublicByte/conduit:remove-unused-imports into master Timo Kösters 2020-06-11 22:34:49 +0200
  • fa7612f069 refactor: remove unused imports PublicByte 2020-06-11 21:06:43 +0200
  • 4c98079c4c Merge pull request 'refactor: better error handling' (#116) from error-handling into master Timo Kösters 2020-06-11 15:21:23 +0200
  • 56d4742201
    improvement: log bad database errors automatically timokoesters 2020-06-11 10:03:08 +0200
  • 2368a90584
    refactor: better error handling timokoesters 2020-06-09 15:13:17 +0200
  • 80935c5826 Merge pull request 'fix' (#115) from uiaa into master Timo Kösters 2020-06-08 15:19:48 +0200