Commit Graph

  • 94df9cdbba Merge branch 'Nyaaori/prev_events-config-option' into 'next' Timo Kösters 2022-12-21 11:06:42 +00:00
  • b231d7f15c Merge branch 'Nyaaori/membership-events-reason' into 'next' Timo Kösters 2022-12-21 10:58:05 +00:00
  • 7cc346bc18 feat: Implement membership ban/join/leave/invite reason support Nyaaori 2022-12-21 11:45:12 +01:00
  • 48bc0db723 Merge branch 'Nyaaori/code-cleanup' into 'next' Timo Kösters 2022-12-21 10:00:40 +00:00
  • 7c196f4e00 feat: Add max prev events config option, allowing adjusting limit for prev_events fetching Nyaaori 2022-09-09 19:17:29 +02:00
  • c86313d4fa chore: code cleanup Nyaaori 2022-12-21 10:42:12 +01:00
  • 7b98741163 Merge branch 'restrictedjoinlocally' into 'next' Timo Kösters 2022-12-18 08:51:31 +00:00
  • 2a04c213f9 improvement: handle restricted joins locally Timo Kösters 2022-12-18 09:44:46 +01:00
  • d7eaa9c5cc Merge branch 'logging-cleanup' into 'next' Timo Kösters 2022-12-18 06:57:23 +00:00
  • 2a0515f528 Replace println/dbg calls with corresponding macros from tracing crate Timo Kösters 2022-12-18 07:47:18 +01:00
  • 3930fd08d7 Merge branch 'docs' into 'next' Timo Kösters 2022-12-18 06:06:26 +00:00
  • 683eefbd0b Update README Timo Kösters 2022-12-18 06:52:18 +01:00
  • d963ad8cc1 Merge branch 'jaegerfix' into 'next' Timo Kösters 2022-12-18 05:52:49 +00:00
  • 6d5e54a66b fix: jaeger support Timo Kösters 2022-12-18 06:37:03 +01:00
  • 2b2bfb91c2 Merge branch 'up-ruma' into 'next' Timo Kösters 2022-12-18 05:05:33 +00:00
  • f1d2574651 finish upgrade ruma Timo Kösters 2022-12-17 09:21:19 +01:00
  • d39ce1401d WIP: Upgrade Ruma Jonas Platte 2022-12-14 13:09:10 +01:00
  • 7fd5b22e3b The procMacro option has long been on by default Jonas Platte 2022-12-16 10:12:11 +01:00
  • db7a7085f4 Merge branch 'fix/pushrules_database' into 'next' Timo Kösters 2022-12-16 08:38:49 +00:00
  • 5894d35eb2 Merge branch 'fixrestrictedjoin' into 'next' Timo Kösters 2022-11-30 21:32:12 +00:00
  • b9fd6127e2 fix: rejoining restricted rooms over federation Timo Kösters 2022-11-27 23:25:42 +01:00
  • bb9bc0a001 Merge branch 'dockerdoc-nginx-content-type' into 'next' Jonas Zohren 2022-11-29 17:56:14 +00:00
  • f4dd051a1d Merge branch 'sd-notify' into 'next' Timo Kösters 2022-11-28 15:50:12 +00:00
  • 06d3efc4d0 feat(systemd): call sd-notify after init and before exit Vladan Popovic 2022-11-25 21:23:21 +01:00
  • 66ad114e19 feat: add systemd feature flag Vladan Popovic 2022-11-25 21:20:45 +01:00
  • 4b737b46ac Merge branch 'cross-compiling' into 'next' Jonas Zohren 2022-11-27 20:15:48 +00:00
  • bcd522e75f Added cross-compilation instructions to DEPLOY.md Orhideous 2022-11-27 20:15:47 +00:00
  • 249960b111 Merge branch 'fix-lock' into 'next' Jonas Zohren 2022-11-25 21:44:31 +00:00
  • 583aea187b Update Cargo.lock Andriy Kushnir (Orhideous) 2022-11-25 23:13:58 +02:00
  • 396dac6d82 Merge branch 'fixroomleave' into 'next' Timo Kösters 2022-11-21 20:04:27 +00:00
  • 9149be31af Merge branch 'logs-cleanup' into 'next' Timo Kösters 2022-11-21 20:03:17 +00:00
  • 32a4ded4a1 Merge branch 'Nyaaori/reduce-generated-token-length' into 'next' Timo Kösters 2022-11-21 20:02:20 +00:00
  • e3dabdf525 Merge branch 'Nyaaori/cleanup' into 'next' Timo Kösters 2022-11-21 19:59:45 +00:00
  • b59304a4df Reduce length of generated access tokens and session ids Nyaaori 2022-09-25 11:46:18 +02:00
  • 66bc41125c refactor: cleanup Nyaaori 2022-11-21 09:51:39 +01:00
  • 6786c44f4d chore: Fix MSRV Nyaaori 2022-11-21 09:39:17 +01:00
  • a3a1db124d Clean some noisy logs Andriy Kushnir (Orhideous) 2022-11-21 21:48:06 +02:00
  • 3b3c451c83 fix: unable to leave room Timo Kösters 2022-11-19 12:52:47 +01:00
  • cf99316082 Merge branch 'dendritefix' into 'next' Timo Kösters 2022-11-09 20:27:22 +00:00
  • c063700255 fix: invite dendrite users Timo Kösters 2022-11-09 21:14:17 +01:00
  • 7540227388 chore: bump dependencies Timo Kösters 2022-11-09 18:46:10 +01:00
  • 09015f113c Describe a better way to enforce Content-Type in nginx Ticho 34782694 2022-11-08 15:56:24 +00:00
  • a2d8aec1e3 Moving the unwraping of a variable Paul Beziau 2022-11-03 13:12:53 +00:00
  • ccdaaceb33 Merge branch 'ci-revamp-2022-10' into 'next' Timo Kösters 2022-11-02 16:47:48 +00:00
  • b37876f3b2 fix(ci): Only build in (remote host) docker and switch to glibc Jonas Zohren 2022-10-29 14:32:22 +02:00
  • e8e0a4dcc5 Merge branch 'Nyaaori/fix-trusted-server-panic' into 'next' Timo Kösters 2022-10-31 11:35:55 +00:00
  • 23cf39c525 Cleanly handle invalid response from trusted server instead of panicking Nyaaori 2022-10-31 12:08:01 +01:00
  • 00996dd834 Cargo Clippy Nyaaori 2022-10-31 09:31:17 +01:00
  • 2a52f666dc Merge branch 'fixtyping' into 'next' Timo Kösters 2022-10-30 20:25:45 +00:00
  • 0cf6545116 fix: not sending enough state on join Timo Kösters 2022-10-30 21:23:10 +01:00
  • 5d691f405e fix: stuck typing indicators Timo Kösters 2022-10-30 21:22:32 +01:00
  • c61914c8e1 Merge branch 'fixhead' into 'next' Timo Kösters 2022-10-30 19:45:58 +00:00
  • 9548c84d32 Merge branch 'fixnotifcount' into 'next' Timo Kösters 2022-10-30 19:43:39 +00:00
  • 02dd3d32f2 fix: element android did not reset notification counts Timo Kösters 2022-10-30 20:36:14 +01:00
  • 7c98ba64aa fix: HEAD requests should produce METHOD_NOT_ALLOWED Timo Kösters 2022-10-15 16:56:08 +02:00
  • 52018c3967 allow complement dockerfile to copy over target folder Jonathan de Jong 2022-10-28 21:04:05 +02:00
  • e86fb11512 Merge branch 'nabulator-next-patch-84388' into 'next' Timo Kösters 2022-10-28 13:32:02 +00:00
  • 20e3c42456 Merge branch 'add-nix-flake' into 'next' Timo Kösters 2022-10-28 13:31:21 +00:00
  • 1aff2a54ef comment typo Nabulator 2022-10-27 04:23:07 +00:00
  • 238ebcfcac Update nginx configuration to allow for larger uploads. Nabulator 2022-10-27 04:20:56 +00:00
  • 876fdf480d Merge branch '3pid_403_next' into 'next' Timo Kösters 2022-10-25 20:47:41 +00:00
  • 3bc0a1924b Return 403 to 3pid token routes to signal not implemented James Blachly 2022-10-25 20:47:41 +00:00
  • 4af998963b Merge branch 'fix-axum-request-size' into 'next' Timo Kösters 2022-10-25 20:34:33 +00:00
  • 10d2da3009 fix(main): fix request size limit to max_request_size (axum defaults 2MB) AndSDev 2022-10-25 12:53:58 +03:00
  • d47c1a8ba6 Fix database version check & code formating Paul Beziau 2022-10-21 12:27:11 +00:00
  • 9c0c74f547 Migrate database to use correct rule id in pushrules. Paul Beziau 2022-10-18 09:15:07 +00:00
  • 215d909e59 More debug info when try_from_http_request fails Jonathan de Jong 2022-10-17 18:41:59 +02:00
  • ada15ceacc Complement improvements Jonathan de Jong 2022-10-17 18:41:45 +02:00
  • 716f82db6d add nix/nixos deployment documentation Charles Hall 2022-10-15 15:21:04 -07:00
  • fe7d8c4f12 add nix flake Charles Hall 2022-10-15 13:02:13 -07:00
  • cb2b5beea8 Merge branch 'fix_persy' into 'next' Timo Kösters 2022-10-15 12:13:36 +00:00
  • 2231a69b4c fix: make previous MR compile Timo Kösters 2022-10-15 14:07:27 +02:00
  • 13052388a7 Merge branch 'conduit-next' into next Timo Kösters 2022-10-15 13:55:39 +02:00
  • 6fd39ae174 Raise 404 when room doesn't exist Max Cohen 2022-09-10 18:14:29 +02:00
  • 2627ca5e3d Merge branch 'update-rust' into 'next' Timo Kösters 2022-10-15 11:50:55 +00:00
  • ed5b8d6a46 Merge branch 'Nyaaori/fix-whoami-appservices' into 'next' Timo Kösters 2022-10-15 11:32:49 +00:00
  • 2d0fdddd34 Do not return true for is_guest on whoami for appservice users Nyaaori 2022-10-15 13:17:58 +02:00
  • 3054af41ba Merge branch 'Nyaaori/bump-default-room-version' into 'next' Timo Kösters 2022-10-15 11:02:44 +00:00
  • 1e1a144dfa Move room version 10 out of experimental/unstable Nyaaori 2022-10-15 12:16:32 +02:00
  • cc3e1f58cc Bump default room version to V9; per matrix spec recommendation Nyaaori 2022-10-15 10:42:14 +02:00
  • b1991c8f4f Merge branch 'Nyaaori/rejoin-fix' into 'next' Timo Kösters 2022-10-15 09:56:55 +00:00
  • 6f7f2820ce Merge branch 'Nyaaori/restricted-join-fix' into 'next' Timo Kösters 2022-10-15 09:50:25 +00:00
  • e9697f13d6 Handle initiating restricted joins over federation Nyaaori 2022-09-09 20:38:36 +02:00
  • 3b0aa23fdf Rejoin room over federation if we are not participating in it; do not include invited users in participating servers calculation Nyaaori 2022-02-13 22:00:36 +00:00
  • aca6218c0a Merge branch 'unrecognizedmethods' into 'next' Timo Kösters 2022-10-15 08:35:39 +00:00
  • 3a45628e1d fix: send unrecognized error on wrong http methods Timo Kösters 2022-10-15 00:28:43 +02:00
  • e923f63c49 fix(service/rooms/timeline): fix validating for non-joined members AndSDev 2022-10-14 14:45:05 +03:00
  • 842feabced fix: update persy implementation after refactor Tglman 2022-10-13 20:02:36 +01:00
  • 286936db32 msrv is 1.63 in Cargo.toml; use that Charles Hall 2022-10-13 08:26:41 -07:00
  • bf7c4b4001 update rust to avoid a cargo problem Charles Hall 2022-10-13 08:06:49 -07:00
  • d755a96c2c refactor(service/rooms/timeline): add cache for server_name AndSDev 2022-10-13 11:19:51 +00:00
  • c948324cf2 Merge branch 'fix-admin-help' into 'next' Timo Kösters 2022-10-13 11:15:49 +00:00
  • 76f81ac201 feat(db/rooms): disable banning for last user and conduit user in admins room AndSDev 2022-09-06 11:32:33 +00:00
  • ce188daccb Merge branch 'conduit-lower-default-log-level' into HEAD Timo Kösters 2022-10-13 13:13:03 +02:00
  • 98702da4e6 Lower default log level for docker exin 2022-06-26 09:26:04 -05:00
  • 92f7f0c849 Lower log level commented config options exin 2022-06-26 09:20:11 -05:00
  • 7451abe3ea Lower default log level for docker and debian exin 2022-06-25 15:58:50 -05:00
  • 3e6c66b899 Fix formatting exin 2022-06-25 15:29:05 -05:00
  • 3a40bf8ae0 Add error for invalid log config exin 2022-06-25 14:30:20 -05:00
  • 9c922db14b Lower default log level exin 2022-06-25 13:35:58 -05:00