Commit graph

Select branches

Hide pull requests

master

Mono Color

• 75cdc3a1f6 Merge branch 'roomversionwarnings' into 'next' Timo Kösters 2023-08-11 09:27:23 +00:00
• 11103a92ed
  Do not show "Invalid room version" errors when server is not in room Timo Kösters 2023-08-11 10:48:48 +02:00
• ce2017a10e log handling previous event time as debug girlbossceo 2023-08-10 23:12:37 +00:00
• 0c2cfda3ae Merge branch 'next' into 'master' Timo Kösters 2023-08-10 17:01:56 +00:00
• 4bf8ee1f74 Merge branch 'nextversion' into 'next' Timo Kösters 2023-08-10 16:58:47 +00:00
• 5d16948030
  Bump version to v0.6.0 Timo Kösters 2023-08-10 18:57:25 +02:00
• b7b2eb9d05 Merge branch 'trust' into 'next' Timo Kösters 2023-08-10 15:50:16 +00:00
• 19bfee1835
  improvement: matrix.org is default trusted server if unspecified Timo Kösters 2023-08-10 17:45:58 +02:00
• 9db87550fd Merge branch 'admincommands' into 'next' Timo Kösters 2023-08-10 15:36:29 +00:00
• 606b25b9e7
  improvement: more forgiving admin command syntax Timo Kösters 2023-08-10 17:26:55 +02:00
• fd9e52a559
  More sanity checks Timo Kösters 2023-08-10 11:45:31 +02:00
• 0a0f227601 Merge branch 'registrationtokens' into 'next' Timo Kösters 2023-08-09 20:27:19 +00:00
• 183558150d
  fix: don't show removed rooms in space Timo Kösters 2023-08-09 22:21:21 +02:00
• c028e0553c
  feat: registration tokens Timo Kösters 2023-08-09 18:27:30 +02:00
• 2581f7a10b Merge branch 'fix-broken-links' into 'next' Timo Kösters 2023-08-09 07:55:49 +00:00
• 3e518773e2 Merge branch 'improvements' into 'next' Timo Kösters 2023-08-07 16:11:11 +00:00
• 888f7e4403 Merge branch 'more-logging-enrichment' into 'next' Timo Kösters 2023-08-07 16:04:12 +00:00
• d82c26f0a9
  Avatars for sliding sync DMs Timo Kösters 2023-08-07 17:54:08 +02:00
• c1e2ffc0cd
  improvement: maybe cross signing really works now Timo Kösters 2023-08-07 13:55:44 +02:00
• 06fccbc340 debug log before and after nofile soft limit increases June 2023-08-03 14:51:39 -10:00
• fbd8090b0b log room ID for invalid room topic event errors girlbossceo 2023-07-31 01:02:52 +00:00
• 06ab707c79 Merge branch 'rusqlite-update' into 'next' Timo Kösters 2023-08-02 05:06:54 +00:00
• 174a580319 Merge branch 'base64-update' into 'next' Timo Kösters 2023-08-02 05:06:24 +00:00
• fbb256dd91 bump rusqlite to 0.29.0 June 2023-08-01 15:09:55 -10:00
• 5a7bade476 update base64 to 0.21.2 June 2023-08-01 14:48:50 -10:00
• d2bfcb018e Merge branch 'error-leak-fix' into 'next' Timo Kösters 2023-08-01 11:25:06 +00:00
• 08f0f17ff7 Merge branch 'msteenhagen-next-patch-18830' into 'next' Timo Kösters 2023-08-01 11:23:47 +00:00
• 57b86f1130 Merge branch 'msteenhagen-next-patch-22350' into 'next' Timo Kösters 2023-08-01 11:23:28 +00:00
• 3a6eee7019 Correct option error adduser in DEPLOY.md Maarten Steenhagen 2023-08-01 11:03:31 +00:00
• 9ce1cad983 Changed 'right' to 'appropriate' to avoid ambiguity (original could be read as right-hand-side) Maarten Steenhagen 2023-08-01 10:58:07 +00:00
• 10da9485a5 Merge branch 'threads' into 'next' Timo Kösters 2023-07-31 14:24:11 +00:00
• acfe381dd3
  fix: threads get updated properly Timo Kösters 2023-07-31 16:18:23 +02:00
• 83805c66e5 sanitise potentially sensitive errors girlbossceo 2023-07-30 17:30:16 +00:00
• afd8112e25 Merge branch 'spaces' into 'next' Timo Kösters 2023-07-29 19:55:51 +00:00
• b8c164dc60
  feat: version checker Timo Kösters 2023-07-29 20:01:38 +02:00
• 0453a72890 Merge branch 'patch-1' into 'next' Timo Kösters 2023-07-29 19:19:05 +00:00
• e2c914cc11 fix: s/ok_or/ok_or_else in relevant places girlbossceo 2023-07-29 19:17:12 +00:00
• da907451e7
  Admin commands to sign and verify jsons Timo Kösters 2023-07-23 14:52:11 +02:00
• 2b4a6c96ee Merge branch 'small-logging-improvements' into 'next' Timo Kösters 2023-07-29 15:00:42 +00:00
• d7061e6984 cargo fmt girlbossceo 2023-07-29 14:30:48 +00:00
• 3494d7759e Return "Hello from Conduit!" on the / route girlbossceo 2023-07-28 23:47:00 +00:00
• cc5dcceacc Log the room ID, event ID, PDU, and event type where possible girlbossceo 2023-07-28 23:40:10 +00:00
• 863103450c Log the unknown login type in warning level girlbossceo 2023-07-27 17:02:57 +00:00
• a0148a9996 Print relevant room ID and ACL'd server in informational level girlbossceo 2023-07-27 16:24:04 +00:00
• 1f867a2c86 Only print raw malformed JSON body in debug level girlbossceo 2023-07-27 16:23:24 +00:00
• c0a2acb869 Merge branch 'next' into 'fix-broken-links' purplemeteorite 2023-07-29 08:02:56 +00:00
• 97835541ce Merge branch 'uak-next-patch-77212' into 'next' Timo Kösters 2023-07-29 07:13:58 +00:00
• 081cc66eda fixed broken traefik links in docker README purplemeteorite 2023-07-29 08:26:34 +02:00
• 7489e2c4f6 moved docker-compose.yml into the docker folder purplemeteorite 2023-07-29 08:14:38 +02:00
• 1e675dbb68 Merge branch 'next' into 'next' Timo Kösters 2023-07-28 19:34:42 +00:00
• f4c1748ab1 Merge branch 'bugfix/well-known-missing' into 'next' Timo Kösters 2023-07-28 15:45:59 +00:00
• 7990822f72 It's ok not being able to find a .well-known response. Tobias Tom 2023-07-28 16:26:40 +01:00
• 2a100412fa Merge branch 'relax-rocksdb' into 'next' Timo Kösters 2023-07-27 06:12:31 +00:00
• 3e7652909b Merge branch 'maximize-fd-limit' into 'next' Timo Kösters 2023-07-27 06:11:05 +00:00
• 9fb8498067
  relax recovery mode Charles Hall 2023-07-26 15:32:36 -07:00
• 291290db92
  maximize fd limit Charles Hall 2023-07-26 13:24:44 -07:00
• 54a115caf3 Change link from docker-compose.override.traefik.yml to docker-compose.override.yml in README.md uak 2023-07-26 18:53:19 +00:00
• 81866170f0 Merge branch 'spaces' into 'next' Timo Kösters 2023-07-26 06:40:00 +00:00
• bf46829595
  fix: spaces with restricted rooms Timo Kösters 2023-07-26 08:33:27 +02:00
• 9f14ad7125 Merge branch 'sync-up-debian-packaging' into 'next' Timo Kösters 2023-07-24 17:10:45 +00:00
• 90a10c84ef Merge branch 'slidingfixes' into 'next' Timo Kösters 2023-07-24 08:48:27 +00:00
• d220641d64
  Sliding sync subscriptions, e2ee, to_device messages Timo Kösters 2023-07-24 10:41:50 +02:00
• caddc656fb
  slightly better sliding sync Timo Kösters 2023-07-23 21:57:11 +02:00
• b1a591a06c
  Also create the conduit (system) group Paul van Tilburg 2023-07-23 12:37:47 +02:00
• 3cd3d0e0ff
  Add section about how to download/install/deploy Paul van Tilburg 2023-07-23 12:34:48 +02:00
• 433dad6ac2
  Turn README.Debian into a markdown file Paul van Tilburg 2023-07-23 12:24:37 +02:00
• 8cf408e966
  Fix up permissions of the database path Paul van Tilburg 2023-07-23 12:14:59 +02:00
• 1e560529d8 Merge branch 'nix-upkeep' into 'next' Timo Kösters 2023-07-23 09:23:41 +00:00
• ff98444d03 Merge branch 'nogroup' into 'next' Timo Kösters 2023-07-23 09:22:39 +00:00
• 82f31d6b72 Replace nogroup with dedicated user group x4u 2023-07-23 14:21:36 +08:00
• 6ae5143ff5
  only listen on IPv6 since that's what conduit does Charles Hall 2023-07-21 12:12:37 -07:00
• bd8fec3836 changed registry options purplemeteorite 2023-07-21 20:33:32 +02:00
• 742331e054
  Revert "only use musl on x86_64" Charles Hall 2023-07-16 13:39:13 -07:00
• abd8e1bf54
  nixpkgs' rocksdb is now new enough :) Charles Hall 2023-07-16 13:38:33 -07:00
• fa3b1fd9bd
  update flake.lock Charles Hall 2023-07-16 13:37:40 -07:00
• e9946f81a0 Merge branch 'e2eefed' into 'next' Timo Kösters 2023-07-16 14:54:44 +00:00
• a9ba067e77
  fix: e2ee over federation Timo Kösters 2023-07-16 16:50:03 +02:00
• 706148f941 Merge branch 'nhekobug' into 'next' Timo Kösters 2023-07-15 21:46:12 +00:00
• 24402312c5
  fix: could not verify own events Timo Kösters 2023-07-15 23:43:25 +02:00
• 17180a3e08 capitalize names Jonas Zohren 2023-07-13 16:54:56 +00:00
• 3c6ffd88bf Merge branch 'unbreak-aarch64-nix' into 'next' Timo Kösters 2023-07-11 14:11:45 +00:00
• c3966f501c
  fix: nheko e2ee verification bug Timo Kösters 2023-07-10 23:10:27 +02:00
• 56f0f3dfa4
  only use musl on x86_64 Charles Hall 2023-07-10 11:03:20 -07:00
• ad06d475de Merge branch 'sliding' into 'next' Timo Kösters 2023-07-10 14:35:35 +00:00
• 0b4e3de9c0
  fix: spaces with restricted rooms Timo Kösters 2023-07-10 16:28:08 +02:00
• edd4a3733f
  fix: actually clear memory in the admin commands Timo Kösters 2023-07-10 16:27:42 +02:00
• c17187777f
  fix: never try federation with self Timo Kösters 2023-07-10 16:26:36 +02:00
• 78e7b711df
  fix: better sliding sync Timo Kösters 2023-07-10 16:25:33 +02:00
• 4b7d3e24dd
  bump ruma Timo Kösters 2023-07-10 16:24:57 +02:00
• e4f769963f
  feat: very simple sliding sync implementation Timo Kösters 2023-07-06 10:32:25 +02:00
• eab5dac6e8 Merge branch 'fix-docker-build-image-size' into 'next' Jonas Zohren 2023-07-04 21:18:25 +00:00
• c4824a6ebc ci: Fix "0 B" image size display Jonas Zohren 2023-07-04 21:13:11 +00:00
• f8a36e7554 Merge branch 'memory' into 'next' Timo Kösters 2023-07-03 17:43:27 +00:00
• a2c3256ced
  improvement: better memory usage and admin commands to analyze it Timo Kösters 2023-07-03 19:37:54 +02:00
• 833c1505f1 Merge branch 'hierarchy' into 'next' Timo Kösters 2023-07-03 13:56:47 +00:00
• bac13d08ae
  fix: cache invalidation Timo Kösters 2023-07-02 22:50:50 +02:00
• f0a27dcb00 Merge branch 'next' into 'next' Timo Kösters 2023-07-02 20:20:31 +00:00
• 9d49d599f3
  feat: space hierarchies Timo Kösters 2023-07-02 16:06:54 +02:00
• 2640f67e4b remove comments Jacob Taylor 2023-07-02 18:00:30 +00:00
• eb8bc1af8d Merge branch 'jplatte/axum06' into 'next' Timo Kösters 2023-07-02 07:02:04 +00:00