7fd5b22e3b
The procMacro option has long been on by default
...
… and it's good to let people have their own local configs that won't be
tracked by git.
2022-12-16 10:12:11 +01:00
db7a7085f4
Merge branch 'fix/pushrules_database' into 'next'
...
Migrate database to use correct rule id in pushrules.
See merge request famedly/conduit!405
2022-12-16 08:38:49 +00:00
5894d35eb2
Merge branch 'fixrestrictedjoin' into 'next'
...
fix: rejoining restricted rooms over federation
See merge request famedly/conduit!431
2022-11-30 21:32:12 +00:00
b9fd6127e2
fix: rejoining restricted rooms over federation
2022-11-30 22:30:55 +01:00
bb9bc0a001
Merge branch 'dockerdoc-nginx-content-type' into 'next'
...
Describe a better way to enforce Content-Type in nginx
See merge request famedly/conduit!415
2022-11-29 17:56:14 +00:00
f4dd051a1d
Merge branch 'sd-notify' into 'next'
...
call sd-notify after init and before exit
See merge request famedly/conduit!426
2022-11-28 15:50:12 +00:00
06d3efc4d0
feat(systemd): call sd-notify after init and before exit
2022-11-27 22:17:15 +01:00
66ad114e19
feat: add systemd feature flag
2022-11-27 22:17:15 +01:00
4b737b46ac
Merge branch 'cross-compiling' into 'next'
...
Added cross-compilation instructions
See merge request famedly/conduit!430
2022-11-27 20:15:48 +00:00
bcd522e75f
Added cross-compilation instructions to DEPLOY.md
2022-11-27 20:15:47 +00:00
249960b111
Merge branch 'fix-lock' into 'next'
...
Update Cargo.lock
See merge request famedly/conduit!427
2022-11-25 21:44:31 +00:00
583aea187b
Update Cargo.lock
2022-11-25 23:13:58 +02:00
396dac6d82
Merge branch 'fixroomleave' into 'next'
...
fix: unable to leave room
See merge request famedly/conduit!419
2022-11-21 20:04:27 +00:00
9149be31af
Merge branch 'logs-cleanup' into 'next'
...
Clean some noisy logs
See merge request famedly/conduit!423
2022-11-21 20:03:17 +00:00
32a4ded4a1
Merge branch 'Nyaaori/reduce-generated-token-length' into 'next'
...
Reduce length of generated access tokens and session ids
See merge request famedly/conduit!386
2022-11-21 20:02:20 +00:00
e3dabdf525
Merge branch 'Nyaaori/cleanup' into 'next'
...
misc. cleanup
See merge request famedly/conduit!420
2022-11-21 19:59:45 +00:00
b59304a4df
Reduce length of generated access tokens and session ids
...
Reduces generated tokens and session ids down to 32 characters (~190 bits of entropy) in length
2022-11-21 20:51:59 +01:00
66bc41125c
refactor: cleanup
2022-11-21 20:50:39 +01:00
6786c44f4d
chore: Fix MSRV
...
Ruma requires Rust 1.64
2022-11-21 20:50:30 +01:00
a3a1db124d
Clean some noisy logs
2022-11-21 21:48:06 +02:00
3b3c451c83
fix: unable to leave room
2022-11-21 19:50:48 +01:00
cf99316082
Merge branch 'dendritefix' into 'next'
...
Dendrite invite fix
See merge request famedly/conduit!416
2022-11-09 20:27:22 +00:00
c063700255
fix: invite dendrite users
2022-11-09 21:14:17 +01:00
7540227388
chore: bump dependencies
2022-11-09 18:46:10 +01:00
09015f113c
Describe a better way to enforce Content-Type in nginx
...
add_header will not override the Content-Type header set by the server,
but will instead add another header below, which is obviously not ideal.
The proposed change will instead tell nginx to set the correct value for
this header straight away.
2022-11-08 15:56:24 +00:00
a2d8aec1e3
Moving the unwraping of a variable
...
Moving the unwraping of the variable "rule" inside the condition instead of the if body, for the migration of the database from version 11 to 12.
2022-11-03 13:12:53 +00:00
ccdaaceb33
Merge branch 'ci-revamp-2022-10' into 'next'
...
Fix CI
See merge request famedly/conduit!414
2022-11-02 16:47:48 +00:00
b37876f3b2
fix(ci): Only build in (remote host) docker and switch to glibc
2022-11-02 12:12:48 +01:00
e8e0a4dcc5
Merge branch 'Nyaaori/fix-trusted-server-panic' into 'next'
...
Cleanly handle invalid response from trusted server instead of panicking
See merge request famedly/conduit!411
2022-10-31 11:35:55 +00:00
23cf39c525
Cleanly handle invalid response from trusted server instead of panicking
2022-10-31 12:28:30 +01:00
00996dd834
Cargo Clippy
2022-10-31 09:31:17 +01:00
2a52f666dc
Merge branch 'fixtyping' into 'next'
...
Fix typing indicators and unencrypted messages in encrypted rooms
See merge request famedly/conduit!409
2022-10-30 20:25:45 +00:00
0cf6545116
fix: not sending enough state on join
2022-10-30 21:23:43 +01:00
5d691f405e
fix: stuck typing indicators
2022-10-30 21:22:32 +01:00
c61914c8e1
Merge branch 'fixhead' into 'next'
...
fix: HEAD requests should continue to produce METHOD_NOT_ALLOWED
See merge request famedly/conduit!402
2022-10-30 19:45:58 +00:00
9548c84d32
Merge branch 'fixnotifcount' into 'next'
...
fix: element android did not reset notification counts
See merge request famedly/conduit!408
2022-10-30 19:43:39 +00:00
02dd3d32f2
fix: element android did not reset notification counts
2022-10-30 20:41:32 +01:00
7c98ba64aa
fix: HEAD requests should produce METHOD_NOT_ALLOWED
2022-10-30 19:53:05 +01:00
e86fb11512
Merge branch 'nabulator-next-patch-84388' into 'next'
...
Update nginx configuration to allow for larger uploads.
See merge request famedly/conduit!407
2022-10-28 13:32:02 +00:00
20e3c42456
Merge branch 'add-nix-flake' into 'next'
...
add nix flake
See merge request famedly/conduit!403
2022-10-28 13:31:21 +00:00
1aff2a54ef
comment typo
2022-10-27 04:23:07 +00:00
238ebcfcac
Update nginx configuration to allow for larger uploads.
2022-10-27 04:20:56 +00:00
876fdf480d
Merge branch '3pid_403_next' into 'next'
...
Return 403 to 3pid token routes to signal not implemented
See merge request famedly/conduit!375
2022-10-25 20:47:41 +00:00
3bc0a1924b
Return 403 to 3pid token routes to signal not implemented
2022-10-25 20:47:41 +00:00
4af998963b
Merge branch 'fix-axum-request-size' into 'next'
...
fix(main): fix request size limit to max_request_size (axum defaults 2MB)
See merge request famedly/conduit!406
2022-10-25 20:34:33 +00:00
10d2da3009
fix(main): fix request size limit to max_request_size (axum defaults 2MB)
2022-10-25 12:53:58 +03:00
d47c1a8ba6
Fix database version check & code formating
2022-10-21 12:27:11 +00:00
9c0c74f547
Migrate database to use correct rule id in pushrules.
...
it convert :
- ".m.rules.call" to ".m.rule.call"
- ".m.rules.room_one_to_one" to ".m.rule.room_one_to_one"
- ".m.rules.encrypted_room_one_to_one" to ".m.rule.encrypted_room_one_to_one"
- ".m.rules.message" to ".m.rule.message"
- ".m.rules.encrypted" to ".m.rule.encrypted"
related to issue #264
2022-10-18 09:15:07 +00:00
716f82db6d
add nix/nixos deployment documentation
2022-10-16 10:50:52 -07:00
fe7d8c4f12
add nix flake
...
Also add `.envrc` for direnv + Nix users. This makes developing locally
easier for us NixOS folks.
The flake itself will allow NixOS users to pull code directly from
Conduit's repository, making it completely trivial to stay up-to-date
with every commit.
I'd also like to add a NixOS module directly to this repository at some
point so that new configuration options will be available in the NixOS
module faster. But for now, NixOS users can simply override
`serivces.matrix-conduit.package` and get pretty much all the
functionality.
I've added myself to the `CODEOWNERS` file for the Nix files, since I am
willing to maintain this stuff. I use Conduit on NixOS so I'm personally
invested in having this work.
Lastly, `.gitignore` was updated to exclude symlinks created by `direnv`
and `nix build` and other such Nix commands.
This doesn't come without maintenance burden, however:
* The `sha256` in `flake.nix` will need to be updated whenever Conduit's
MSRV is updated, but that should be pretty infrequent.
* `nix flake update` should be run every so often to pull in updates to
`nixpkgs` and other flake inputs. I think downstream users can also
override this themselves with `inputs.<name>.inputs.<name>.follows`.
* `nix flake check` should be run in CI to ensure Nix builds keep
working.
* `nixpkgs-fmt --check $(fd '\.nix')` (or similar) should be run in CI
to ensure style uniformity.
2022-10-15 19:26:53 -07:00
Jonas Platte