Commit Graph

  • c9fb60035c Merge branch 'rocksdb' into 'master' Timo Kösters 2021-06-12 13:13:35 +0000
  • cd4bc520d8
    improvement: feature flags for sled, rocksdb Timo Kösters 2021-06-12 15:04:28 +0200
  • 2078af59d8
    fix fmt problems hamidreza kalbasi 2021-06-08 20:54:36 +0430
  • 2385bd1cfd
    add migrations hamidreza kalbasi 2021-06-08 20:53:24 +0430
  • affa124864
    create media folder in init hamidreza kalbasi 2021-06-08 17:50:06 +0430
  • ff841b73c5
    use .keys() and remove unneccery .to_vec() hamidreza kalbasi 2021-06-08 17:05:13 +0430
  • 804105479c
    fix fmt and clippy warnings hamidreza kalbasi 2021-06-06 16:58:32 +0430
  • 972caacdc2
    put media in filesystem hamidreza kalbasi 2021-06-04 08:06:12 +0430
  • d0ee823254
    feat: swappable database backend Timo Kösters 2021-06-08 18:10:00 +0200
  • 0194aa239e Merge branch 'master' into 'master' hamidreza kalbasi 2021-06-08 16:29:33 +0000
  • 6947dce02c fix fmt problems hamidreza kalbasi 2021-06-08 20:54:36 +0430
  • 9b11ec3dab add migrations hamidreza kalbasi 2021-06-08 20:53:24 +0430
  • 93d8205f31 create media folder in init hamidreza kalbasi 2021-06-08 17:50:06 +0430
  • f038422d69 use .keys() and remove unneccery .to_vec() hamidreza kalbasi 2021-06-08 17:05:13 +0430
  • de5381ddc5 Resolve conflicts with origin/master # Conflicts: # src/client_server/media.rs # src/database/media.rs hamidreza kalbasi 2021-06-08 12:21:08 +0000
  • 81715bd84d Merge branch 'account' into 'master' Timo Kösters 2021-06-08 07:22:32 +0000
  • 78f2442c1f Merge branch 'account' into 'master' Timo Kösters 2021-06-08 07:22:18 +0000
  • 13c6c5f2e6 fix fmt and clippy warnings hamidreza kalbasi 2021-06-06 16:58:32 +0430
  • ecfbf2b474 put media in filesystem hamidreza kalbasi 2021-06-04 08:06:12 +0430
  • b3cec1d20d Merge branch 'master' into 'master' Timo Kösters 2021-06-05 06:14:55 +0000
  • 6aa83fb803 Merge branch 'master' into 'master' Damian Poddebniak 2021-06-04 18:18:39 +0000
  • bb7a4220d3 Fix ruma dependency Damian Poddebniak 2021-06-04 19:42:08 +0200
  • b84c66daba Generate binaries for 3 architectures in the CI Jonas Fowl 2021-06-01 00:58:50 +0000
  • e1e529d818
    fix: don't apply push rules for users of other homeservers Timo Kösters 2021-05-30 22:01:12 +0200
  • 88cf043f94
    fix: deactivate accounts that should be deactivated Timo Kösters 2021-05-30 21:55:43 +0200
  • bff68e595b Merge branch 'account' into 'master' Timo Kösters 2021-05-29 09:14:47 +0000
  • f1de3fb4bf Merge branch 'account' into 'master' Timo Kösters 2021-05-29 08:53:55 +0000
  • 59dd3676d5
    fix: putting global account data works now Timo Kösters 2021-05-29 10:49:13 +0200
  • 1fa7ff2eb1 Merge branch 'claim' into 'master' Timo Kösters 2021-05-28 21:36:46 +0000
  • 581acd7564 Merge branch 'claim' into 'master' Timo Kösters 2021-05-28 21:36:15 +0000
  • deacdf6f58
    fix: is_direct for locally invited users Timo Kösters 2021-05-28 22:53:00 +0200
  • 5b5cc0574e
    feat: implement /claim, handle to-device events Timo Kösters 2021-05-28 13:44:40 +0200
  • 953f2b005f Merge branch 'specify-and-document-msrv' into 'master' Timo Kösters 2021-05-28 07:49:06 +0000
  • 16c84245ce Merge branch 'specify-and-document-msrv' into 'master' Vadim Zeitlin 2021-05-28 07:44:12 +0000
  • f199b51f97 Move the link to cross-compiling guide to DEPLOY.md Vadim Zeitlin 2021-05-28 09:42:59 +0200
  • 0f16a79888 Specify the minimum required Rust version in the manifest Vadim Zeitlin 2021-05-27 23:13:50 +0200
  • 6af942814f Fix some typos in the README Vadim Zeitlin 2021-05-27 23:14:32 +0200
  • 0805f4ac2a Merge branch 'pdu-success' into 'master' Timo Kösters 2021-05-27 21:24:43 +0000
  • 6323dc40e1 Merge branch 'pdu-success' into 'master' Gabriel Souza Franco 2021-05-27 21:15:08 +0000
  • 7db59c550f fix: also return successful PDUs in /send/:txnId Gabriel Souza Franco 2021-05-27 13:59:40 -0300
  • 25b1cd2683 Merge branch 'stateres' into 'master' Timo Kösters 2021-05-27 09:10:53 +0000
  • ad5445feb7 Merge branch 'stateres' into 'master' Timo Kösters 2021-05-27 08:49:23 +0000
  • daa1fc90a7
    fix: state resolution bugs Timo Kösters 2021-05-27 10:47:06 +0200
  • eeb0b59b76 Merge branch 'redaction_quotes' into 'master' Timo Kösters 2021-05-26 15:58:00 +0000
  • 26b16d0dc9 Merge branch 'redaction_quotes' into 'master' phesch 2021-05-26 15:38:53 +0000
  • ddcf1a715b Fix redacted_because field being sent as a string phesch 2021-05-26 17:16:40 +0200
  • d1c0eaf628 Merge branch 'master' into 'master' Timo Kösters 2021-05-26 07:03:51 +0000
  • 6e817da8c9 Merge branch 'master' into 'master' Weasy 2021-05-26 07:02:15 +0000
  • 8387ceacab Fix docker-compose trusted_servers env var Daniel Wiesenberg 2021-05-25 21:34:31 +0200
  • 1aec80c57c Merge branch 'logs' into 'master' Timo Kösters 2021-05-24 16:08:56 +0000
  • 85eb32db4a Merge branch 'logs' into 'master' Timo Kösters 2021-05-24 16:01:51 +0000
  • aacf6289db
    improvement: increase default max concurrent requests Timo Kösters 2021-05-24 17:59:06 +0200
  • 57ecd81534
    fix: logs for ruma crate Timo Kösters 2021-05-24 13:21:15 +0200
  • ceaeab6816 Merge branch 'federation-errors' into 'master' Timo Kösters 2021-05-23 18:27:05 +0000
  • ec64241809 Merge branch 'federation-errors' into 'master' Timo Kösters 2021-05-23 14:48:06 +0000
  • e5c7119516
    feat: forward federation errors to the client Timo Kösters 2021-05-23 16:45:32 +0200
  • 1939e62814
    fmt Timo Kösters 2021-05-23 11:11:20 +0200
  • 1ab209736a Merge branch 'forbidden' into 'master' Timo Kösters 2021-05-22 19:56:46 +0000
  • 7f007c51aa Merge branch 'forbidden' into 'master' Timo Kösters 2021-05-22 19:43:29 +0000
  • fd69ac621c
    fix: run ci with docker Timo Kösters 2021-05-22 21:41:08 +0200
  • c1b2b468b8
    fix: bad except in ruma wrapper Timo Kösters 2021-05-22 21:33:31 +0200
  • 7e4dc65747 Merge branch 'master' into 'master' Timo Kösters 2021-05-22 19:26:03 +0000
  • 630a0a29fb Merge branch 'master' into 'master' Weasy 2021-05-22 18:49:49 +0000
  • 634fe04c33 Fix wrong env var name in traefik compose Daniel Wiesenberg 2021-05-22 20:49:07 +0200
  • 90cd11d850
    fix: Forbidden instead of InvalidParam when joining Timo Kösters 2021-05-22 18:49:30 +0200
  • c6625d83e6 Add CONDUIT_TRUSTED_SERVERS config param Daniel Wiesenberg 2021-05-22 16:53:08 +0200
  • 5a7ccbdfab Add CONDUIT_CONFIG to all relevant docker files And mention that an empty string can be used to configure Conduit purely with env vars. Daniel Wiesenberg 2021-03-16 09:14:11 +0100
  • beb428d866 Update docker command in README Mention the need for a config. Daniel Wiesenberg 2021-03-12 21:07:43 +0100
  • 52a96b3d84 Update Dockerfile and docker-compose Daniel Wiesenberg 2021-03-12 18:26:23 +0100
  • 42c9ba2e5c Merge branch 'appservice-docs' into 'master' Timo Kösters 2021-05-22 13:13:54 +0000
  • 393f6fa657 Merge branch 'appservice-docs' into 'master' Timo Kösters 2021-05-22 11:56:12 +0000
  • 47160e9e06
    docs: APPSERVICES setup guide Timo Kösters 2021-05-22 13:39:31 +0200
  • 488581cc51 Merge branch 'fix-sync' into 'master' Timo Kösters 2021-05-22 09:39:14 +0000
  • 4ee701ccdc Merge branch 'fix-sync' into 'master' Timo Kösters 2021-05-22 09:32:11 +0000
  • 9b77eb7bb7
    fix: too many syncs Timo Kösters 2021-05-22 11:31:15 +0200
  • acfd0aef27 Merge branch 'cargo-deb-packaging-update' into 'master' Timo Kösters 2021-05-22 09:03:43 +0000
  • aee97125df Merge branch 'cargo-deb-packaging-update' into 'master' Paul van Tilburg 2021-05-22 09:01:45 +0000
  • 50348de1dd Merge branch 'improvements' into 'master' Timo Kösters 2021-05-22 08:49:18 +0000
  • dd712f55b9 Merge branch 'improvements' into 'master' Timo Kösters 2021-05-22 08:41:06 +0000
  • 1b42770ab5
    improvement: warning for small max_request_size values Timo Kösters 2021-05-22 10:34:19 +0200
  • 3e2f742f30
    fix: room version warnings and other bugs when joining rooms Timo Kösters 2021-05-21 22:22:05 +0200
  • 989d843c40
    fix: unauthorized pdus will be responded to with FORBIDDEN Timo Kösters 2021-05-21 18:12:02 +0200
  • 09157b2096
    improvement: federation get_keys and optimize signingkey storage Timo Kösters 2021-05-20 23:46:52 +0200
  • ae41bc5067
    fix: run state res with old current state again Timo Kösters 2021-05-17 10:58:44 +0200
  • 8f27e6123b
    feat: send read receipts over federation Timo Kösters 2021-05-17 10:25:27 +0200
  • 24793891e0
    feat: implement GET /presence Timo Kösters 2021-05-14 11:03:18 +0200
  • 767fe76d3e Merge branch 'jfowl-master-patch-93743' into 'master' Timo Kösters 2021-05-13 07:57:11 +0000
  • 3ea0d2b567 Try to improve CI build times by caching Jonas Fowl 2021-05-13 07:57:11 +0000
  • 8d98527138 Merge branch 'jfowl-master-patch-93743' into 'master' Jonas Fowl 2021-05-12 20:32:18 +0000
  • 6c4b82a321 Tell gitlab ci to zip caches faster (thanks @deepbluev7:neko.dev) Jonas Fowl 2021-05-12 20:31:21 +0000
  • ce5958363a Remove wrong and unnecesary CI_PROJECT_DIR, which cargo apparently does not need Jonas Fowl 2021-05-12 19:57:55 +0000
  • 6db046fc20 Also try to cache $CARGO_HOME Jonas Fowl 2021-05-12 19:50:48 +0000
  • c5dca69dcb Try to improve CI build times by caching Jonas Fowl 2021-05-12 19:43:41 +0000
  • f3e6311680 Merge branch 'clippy_ci' into 'master' Timo Kösters 2021-05-12 18:44:41 +0000
  • 8706629b9e Merge branch 'clippy_ci' into 'master' Jonathan de Jong 2021-05-12 18:44:08 +0000
  • 37b4a1cd0d Merge branch 'dbg_clippy' into 'master' Timo Kösters 2021-05-12 18:44:01 +0000
  • 92e38ec95f Merge branch 'dbg_clippy' into 'master' Jonathan de Jong 2021-05-12 18:43:35 +0000
  • 68c5c57486 Merge branch 'improvements' into 'master' Timo Kösters 2021-05-12 18:29:26 +0000
  • e099f38d15 Merge branch 'improvements' into 'master' Timo Kösters 2021-05-12 18:15:54 +0000
  • f62258ba35
    improvement: bug fixes and refactors Timo Kösters 2021-05-12 20:04:28 +0200