Commit graph

  • c70c0129f8 Merge branch 'proxy-config-examples' into 'next' Timo Kösters 2022-03-14 14:26:28 +00:00
  • b5b8181851 Notify admin room for user registrations, deactivations and password changes Andrej Kacian 2022-02-22 00:02:01 +01:00
  • 194a85d4c5 Use native root CA certificates for reqwest Andrej Kacian 2022-03-12 15:42:18 +01:00
  • a6edf00810 Merge remote-tracking branch 'origin/next' into insensitive-login pulling next into dev branch kk 2022-03-09 19:12:02 -08:00
  • 738f5e8f68 Merge branch 'ci-fix-cross-musl-builds' into 'next' Jonas Zohren 2022-03-08 22:13:31 +00:00
  • 5a9462c9ab fix(ci): Fix musl builds Jonas Zohren 2022-03-08 21:31:54 +00:00
  • 5695121f38 Fix wrong associated type in OutgoingKind::Appservice chenyuqide 2022-03-02 23:48:01 +08:00
  • 8bafdc4623 fixed location of lowercase fn reti4 2022-03-02 02:25:15 +00:00
  • 36a6d724fe Merge branch 'writable' into 'next' Jonas Zohren 2022-03-01 23:55:10 +00:00
  • 9385ea0e7c fmt fix reti4 2022-03-01 21:23:34 +00:00
  • 9f059ad4c3 make username login case insensitive reti4 2022-03-01 21:03:55 +00:00
  • 5c6c6f272c Fix security issue. TomZ 2022-02-21 22:28:13 +01:00
  • 65fa4b2ca4 Fix proxy config examples in config/proxy.rs Andrej Kacian 2022-02-22 22:31:34 +01:00
  • 6788225cac Merge branch 'fix-docker-db-dir-permissions' into 'next' Jonas Zohren 2022-02-22 15:34:14 +00:00
  • a5bb6786c8
    fix(docker): Make conduit own default db path Jonas Zohren 2022-02-22 15:22:53 +00:00
  • 3b2b35aab7 Log caught Ctrl+C or SIGTERM for operator feedback Andrej Kacian 2022-02-22 00:26:53 +01:00
  • 949f2523f9 Fix permissions TomZ 2022-02-21 22:35:08 +01:00
  • 196c83939c Add show-config admin room command Andrej Kacian 2022-02-06 20:23:22 +01:00
  • 237645e975 Merge branch 'docs' into 'next' Jonas Zohren 2022-02-20 10:59:56 +00:00
  • 86162c2c20
    Merge branch 'next' into docs Jonas Zohren 2022-02-20 11:43:50 +01:00
  • 199c84195a Merge branch 'improve-docker-documentation' into 'next' Jonas Zohren 2022-02-20 10:43:05 +00:00
  • 57ac4160b7
    Merge branch 'next' into docs Jonas Zohren 2022-02-20 11:42:19 +01:00
  • 91c648253a Merge branch 'docs-remove-obsolete-cross-readme' into 'next' Jonas Zohren 2022-02-20 10:22:47 +00:00
  • 5a80507006
    chore(docs): Remove the now obsolete cross readme Jonas Zohren 2022-02-20 11:12:49 +01:00
  • cc14727888 revert reflow Jonathan de Jong 2022-02-20 10:55:17 +01:00
  • 94573a3a61 improve docker documentation some Jonathan de Jong 2022-02-19 17:06:06 +01:00
  • 0ba0fa5f6c Merge branch 'ci-audit-dependencies' into 'next' Jonas Zohren 2022-02-19 11:25:30 +00:00
  • ad6eb92bbd
    feat(ci): Add dependency audit to CI tests Jonas Zohren 2022-02-18 22:30:02 +01:00
  • ce76041c03 Merge branch 'up-ruma' into 'next' Timo Kösters 2022-02-19 09:46:56 +00:00
  • 8f063c99d5
    chore(ci): Split up tests Jonas Zohren 2022-02-18 22:29:55 +01:00
  • 557d119bee change search_events_v3 to search_events::v3 Jonathan de Jong 2022-02-18 19:54:26 +01:00
  • e9f87e1952 update ruma Jonathan de Jong 2022-02-18 15:33:14 +01:00
  • f3795846b5 Merge branch 'readme' into 'next' Jonas Zohren 2022-02-18 12:19:51 +00:00
  • b8eaa3be85 Merge branch 'redactfix' into 'next' Timo Kösters 2022-02-18 12:00:40 +00:00
  • c496e599ef Merge branch 'serde-cleanup' into 'next' Timo Kösters 2022-02-18 11:07:59 +00:00
  • 27692a2f14
    Remove useless serde roundtrips Jonas Platte 2022-02-18 11:52:00 +01:00
  • e57cd437d4 Slight clarification TomZ 2022-02-17 21:59:55 +01:00
  • 5a99460a4c Merge branch 'not-found' into 'next' Timo Kösters 2022-02-17 15:43:08 +00:00
  • ba83d0ac68 Merge branch 'more-vscode-defaults' into 'next' Jonas Zohren 2022-02-17 15:33:03 +00:00
  • bcd6c0bf53 feat: Provide sane defaults for vscode developing Jonas Zohren 2022-02-17 11:14:50 +00:00
  • b4225cb0fc
    fix(docker): use user 1000 and standard db path Jonas Zohren 2022-02-16 15:04:32 +01:00
  • 98b67da649
    fix: Docker syntax Jonas Zohren 2022-02-16 13:04:45 +00:00
  • 0be8500c4f
    Set all env vars in docker README Jonas Zohren 2022-02-13 12:38:13 +00:00
  • 97507d2880
    Remove most env vars from Dockerfile Jonas Zohren 2022-02-13 12:25:19 +00:00
  • c4353405a5
    Suggestions from Jonas Zohren Jonas Zohren 2022-02-13 12:15:40 +00:00
  • de6c3312ce
    docs: make all configs match Timo Kösters 2022-02-12 10:29:04 +01:00
  • c66866d890 Merge branch 'ci-lint-dockerfiles-with-hadolint' into 'next' Jonas Zohren 2022-02-15 19:10:12 +00:00
  • b21a44ca4c
    feat(ci): Lint dockerfiles with hadolint Jonas Zohren 2022-02-15 18:33:20 +01:00
  • e04d4ff150 Merge branch 'ci-fix-tag-pipelines' into 'next' Jonas Zohren 2022-02-15 10:56:25 +00:00
  • 2645494582
    fix(ci): Also run CI for git tags Jonas Zohren 2022-02-15 11:17:46 +01:00
  • 77f4b68c8e
    fix(ci): Also create versioned docker image Jonas Zohren 2022-02-15 11:17:32 +01:00
  • 6602f6114c
    fix: redacts can't error anymore Timo Kösters 2022-02-10 20:59:11 +01:00
  • 3aece38e9d
    Add a not-found route Jonas Platte 2022-02-13 13:59:27 +01:00
  • 9cfef51af3 Merge branch 'more-paths' into 'next' Timo Kösters 2022-02-13 12:13:22 +00:00
  • aee6bf7e7a Change this to handler Jonas Platte 2022-02-13 11:30:04 +00:00
  • b8d92d3cec take advantage of multiple paths Jonathan de Jong 2022-02-13 12:07:00 +01:00
  • 0c4b42ac13 Merge branch 'parse-pdu-command-panic' into 'next' Timo Kösters 2022-02-12 21:22:37 +00:00
  • 91d5fbd56c Merge branch 'up-ruma' into 'next' Timo Kösters 2022-02-12 20:59:07 +00:00
  • d4217007fe
    fix: do not panic on a JSON not containing the PDU M0dEx 2022-02-12 21:40:07 +01:00
  • 35b82d51cf fix compilations Jonathan de Jong 2022-02-12 21:04:38 +01:00
  • 0ed1e42aed update ruma Jonathan de Jong 2022-02-12 21:01:53 +01:00
  • 2b644ef7b7 Merge branch 'tracing-cleanup' into 'next' Timo Kösters 2022-02-12 15:50:24 +00:00
  • 0ad6eac4f8
    Remove all tracing::instrument attributes from database::abstraction::* Jonas Platte 2022-02-12 16:28:43 +01:00
  • accdb77315
    Clean up tracing::instrument attributes Jonas Platte 2022-02-12 15:03:30 +01:00
  • 914152fcbd Merge branch 'syncfast' into 'next' Timo Kösters 2022-02-12 15:11:03 +00:00
  • 2a00c547a1
    improvement: faster /syncs Timo Kösters 2022-02-08 09:25:44 +01:00
  • adeb8ee425
    Remove no-op conversions Jonas Platte 2022-02-12 15:03:07 +01:00
  • d74074ad53
    Remove tracing::instrument attribute from util functions Jonas Platte 2022-02-12 15:01:28 +01:00
  • 41d3da245e Merge branch 'update_turn_readme' into 'next' Timo Kösters 2022-02-12 13:04:07 +00:00
  • 0565b5a6c8 Merge branch 'show-dns-setup-error' into 'next' Timo Kösters 2022-02-12 13:01:41 +00:00
  • f3502beb94 Merge branch 'welcome-message-command-hint' into 'next' Timo Kösters 2022-02-12 12:28:53 +00:00
  • d6b9874b35 Merge branch 'fix-admin-self-commands' into 'next' Timo Kösters 2022-02-12 12:27:57 +00:00
  • 1d01e2a077 Merge branch 'axum' into 'next' Timo Kösters 2022-02-12 12:22:41 +00:00
  • ce714cfd07
    Bump version Jonas Platte 2022-02-12 13:20:55 +01:00
  • 50b24b37c2
    Upgrade Ruma Jonas Platte 2022-02-12 02:06:30 +01:00
  • 9db0473ed5
    Improve error messages in Ruma wrapper FromRequest impl Jonas Platte 2022-02-09 14:03:38 +01:00
  • 5d8c80b170
    Strip quotes from X-Matrix fields Jonas Platte 2022-02-09 14:01:44 +01:00
  • 21ae63d46b
    Rewrite query parameter parsing Jonas Platte 2022-02-09 12:32:18 +01:00
  • c8951a1d9c
    Use axum-server for direct TLS support Jonas Platte 2022-01-22 18:38:39 +01:00
  • 5fa9190117
    Simplify return type of most route handlers Jonas Platte 2022-01-22 16:58:32 +01:00
  • 77a87881c9
    Add message to unsupported HTTP method panic Jonas Platte 2022-01-22 15:03:58 +01:00
  • 7bf538f549
    Fix axum route conflicts Jonas Platte 2022-01-22 14:45:12 +01:00
  • a5757ab195
    Generalize RumaHandler Jonas Platte 2022-01-22 13:51:55 +01:00
  • d1d2217019
    Clean up error handling for server_server::get_server_keys_route Jonas Platte 2022-01-22 13:32:21 +01:00
  • 1f7b3fa4ac
    Port from Rocket to axum Jonas Platte 2022-01-20 11:51:31 +01:00
  • 8709c3ae7b Merge branch 'refactor2' into 'next' Timo Kösters 2022-02-12 11:50:23 +00:00
  • 5db4c001d1
    Remove another unnecessary use of an event enum Jonas Platte 2022-02-12 01:58:36 +01:00
  • 583ec51f9f
    Remove unnecessary use of event enum Jonas Platte 2022-02-12 01:55:53 +01:00
  • f602d32aaa
    feat: add the actual server name to the welcome message M0dEx 2022-02-11 18:51:28 +01:00
  • a6976e6d2d
    feat: add 'available' to the help command line in the welcome message M0dEx 2022-02-11 18:40:51 +01:00
  • f2b8aa28f3
    feat: add a line with the help command to the welcome message M0dEx 2022-02-11 18:26:56 +01:00
  • bfbefb0cd2 Display actual error message from TokioAsyncResolver, if any Andrej Kacian 2022-02-07 12:55:21 +01:00
  • 31918bb990 Fix admin room processing commands from its own messages Andrei Vasiliu 2022-02-05 08:57:15 +02:00
  • f110b5710a Move appservice howto into whats-next; again, rename placeholder TURN url Torsten Flammiger 2022-02-04 21:11:50 +01:00
  • 1cc0b55650 Resolve merge conflict Torsten Flammiger 2022-02-04 19:28:57 +01:00
  • 63a2c6cce5 Add new TURN Readme and reference it from DEPLOY.md Torsten Flammiger 2022-02-04 19:11:29 +01:00
  • faa0cdb595 Merge branch 'next' into 'master' Jonas Zohren 2022-02-04 18:00:01 +00:00
  • 0cec421930 Merge branch 'ci-hotfix-sytest-on-master' into 'next' Jonas Zohren 2022-02-04 17:51:57 +00:00
  • 826b077e21
    fix(ci): Always build debug version for sytest Jonas Zohren 2022-02-04 18:43:13 +01:00
  • 9c8c784fe7 Merge branch 'next' into 'master' Timo Kösters 2022-02-04 17:37:26 +00:00