Brian Meek
|
d89f1aee85
|
Merge pull request #69 from HereNotThere/brian/merge_upstream
Brian/merge upstream
|
2023-02-07 17:18:57 -08:00 |
|
|
Brian Meek
|
706e81f512
|
Revert "Merge upstream latest"
This reverts commit 06c319d580.
|
2023-02-07 17:14:27 -08:00 |
|
|
Brian Meek
|
ff194d6610
|
Revert "Fix lint warning about ioutil deprecation"
This reverts commit 6225873d04.
|
2023-02-07 17:14:27 -08:00 |
|
|
Brian Meek
|
be1fd40275
|
Revert "Fix lint warning about ioutil deprecation"
This reverts commit 8610b4225e.
|
2023-02-07 17:14:27 -08:00 |
|
|
Brian Meek
|
92e468f352
|
Revert "Debug test failure"
This reverts commit 548029d6da.
|
2023-02-07 17:14:27 -08:00 |
|
|
Brian Meek
|
c47b088eda
|
Revert "Fix lint warning about ignored err assignment"
This reverts commit a4c410b81f.
|
2023-02-07 17:14:27 -08:00 |
|
|
Brian Meek
|
04d272d32a
|
Revert "Logging the config in the error to debug CI"
This reverts commit 9d8dfcabcf.
|
2023-02-07 17:14:27 -08:00 |
|
|
Brian Meek
|
7df85cde1d
|
Revert "Logging the config in the error to debug CI"
This reverts commit 39377bd048.
|
2023-02-07 17:14:27 -08:00 |
|
|
Brian Meek
|
13c221469b
|
Revert "Logging the config in the error to debug CI"
This reverts commit c8f8e90446.
|
2023-02-07 17:14:27 -08:00 |
|
|
Brian Meek
|
a610e6d043
|
Revert "HArdcoding the server_name while debugging while it isn't loading from the config"
This reverts commit d179b9f6f7.
|
2023-02-07 17:14:27 -08:00 |
|
|
Brian Meek
|
a21b421156
|
Revert "Set the test config server_name to localhost"
This reverts commit 7fa8ee0d1a.
|
2023-02-07 17:14:27 -08:00 |
|
|
Brian Meek
|
7fa8ee0d1a
|
Set the test config server_name to localhost
Signed-off-by: Brian Meek <brian@hntlabs.com>
|
2023-02-07 17:13:06 -08:00 |
|
|
Brian Meek
|
d179b9f6f7
|
HArdcoding the server_name while debugging while it isn't loading from the config
Signed-off-by: Brian Meek <brian@hntlabs.com>
|
2023-02-07 17:13:06 -08:00 |
|
|
Brian Meek
|
c8f8e90446
|
Logging the config in the error to debug CI
Signed-off-by: Brian Meek <brian@hntlabs.com>
|
2023-02-07 17:13:06 -08:00 |
|
|
Brian Meek
|
39377bd048
|
Logging the config in the error to debug CI
Signed-off-by: Brian Meek <brian@hntlabs.com>
|
2023-02-07 17:13:06 -08:00 |
|
|
Brian Meek
|
9d8dfcabcf
|
Logging the config in the error to debug CI
Signed-off-by: Brian Meek <brian@hntlabs.com>
|
2023-02-07 17:13:06 -08:00 |
|
|
Brian Meek
|
a4c410b81f
|
Fix lint warning about ignored err assignment
Signed-off-by: Brian Meek <brian@hntlabs.com>
|
2023-02-07 17:13:06 -08:00 |
|
|
Brian Meek
|
548029d6da
|
Debug test failure
Signed-off-by: Brian Meek <brian@hntlabs.com>
|
2023-02-07 17:13:06 -08:00 |
|
|
Brian Meek
|
8610b4225e
|
Fix lint warning about ioutil deprecation
Signed-off-by: Brian Meek <brian@hntlabs.com>
|
2023-02-07 17:13:06 -08:00 |
|
|
Brian Meek
|
6225873d04
|
Fix lint warning about ioutil deprecation
Signed-off-by: Brian Meek <brian@hntlabs.com>
|
2023-02-07 17:13:06 -08:00 |
|
|
Brian Meek
|
06c319d580
|
Merge upstream latest
Signed-off-by: Brian Meek <brian@hntlabs.com>
|
2023-02-07 17:13:06 -08:00 |
|
|
Brian Meek
|
34c62de3d6
|
Set the test config server_name to localhost
Signed-off-by: Brian Meek <brian@hntlabs.com>
|
2023-02-07 16:42:36 -08:00 |
|
|
Brian Meek
|
69d7eef327
|
HArdcoding the server_name while debugging while it isn't loading from the config
Signed-off-by: Brian Meek <brian@hntlabs.com>
|
2023-02-07 16:28:29 -08:00 |
|
|
Brian Meek
|
f23e0f5e06
|
Logging the config in the error to debug CI
Signed-off-by: Brian Meek <brian@hntlabs.com>
|
2023-02-07 15:53:58 -08:00 |
|
|
Brian Meek
|
cc5dab6828
|
Logging the config in the error to debug CI
Signed-off-by: Brian Meek <brian@hntlabs.com>
|
2023-02-07 14:51:02 -08:00 |
|
|
Brian Meek
|
e515dd4ccd
|
Logging the config in the error to debug CI
Signed-off-by: Brian Meek <brian@hntlabs.com>
|
2023-02-07 14:33:53 -08:00 |
|
|
Brian Meek
|
c0d986fdb1
|
Fix lint warning about ignored err assignment
Signed-off-by: Brian Meek <brian@hntlabs.com>
|
2023-02-07 09:17:09 -08:00 |
|
|
Brian Meek
|
b19342ecee
|
Debug test failure
Signed-off-by: Brian Meek <brian@hntlabs.com>
|
2023-02-07 09:13:26 -08:00 |
|
|
Brian Meek
|
5e556292c9
|
Fix lint warning about ioutil deprecation
Signed-off-by: Brian Meek <brian@hntlabs.com>
|
2023-02-07 08:24:08 -08:00 |
|
|
Brian Meek
|
b41d9915d7
|
Fix lint warning about ioutil deprecation
Signed-off-by: Brian Meek <brian@hntlabs.com>
|
2023-02-07 08:11:33 -08:00 |
|
|
Brian Meek
|
4f1c8983ad
|
Merge upstream latest
Signed-off-by: Brian Meek <brian@hntlabs.com>
|
2023-02-06 20:50:50 -08:00 |
|
Tak Wai Wong
|
15dd2011f1
|
Merge pull request #61 from HereNotThere/pr/dendrite-fork
sync upstream changes
|
2022-11-04 10:37:17 -07:00 |
|
|
Tak Wai Wong
|
a0df5f69fb
|
refresh contracts and addresses (#60)
|
2022-11-04 10:36:49 -07:00 |
|
|
Tak Wai Wong
|
341bfe4fdd
|
sync upstream changes
|
2022-11-04 09:40:48 -07:00 |
|
Neil Alexander
|
7c73b131f4
|
Version 0.10.7 (#2861)
Changelog and version bump.
|
2022-11-04 15:33:20 +00:00 |
|
Till
|
efe28db631
|
Update latestPosition when getting reversed room delta (#2860)
Regression test added in
https://github.com/matrix-org/complement/pull/551
Should fix https://github.com/matrix-org/dendrite/issues/2514?
|
2022-11-04 15:39:09 +01:00 |
|
|
Till
|
b13cb43785
|
Send presence to joined hosts only (#2858)
Send presence events only to rooms the user is participating, not all
servers we know about.
Should fix #2752
|
2022-11-04 13:23:00 +01:00 |
|
|
Till Faelligen
|
eeabe892a9
|
Cache go mod directory
|
2022-11-04 11:54:53 +01:00 |
|
|
Tak Wai Wong
|
2d6cd9148b
|
Merge pull request #59 from HereNotThere/tak/sync-upstream
sync upstream commit f5b11e30a4
|
2022-11-03 11:42:01 -07:00 |
|
|
Tak Wai Wong
|
1d633c0d5e
|
Force sync upstream commit 98d3f88bfb
|
2022-11-03 11:22:01 -07:00 |
|
|
Neil Alexander
|
98d3f88bfb
|
Move prev_batch calculation (#2856)
This might help #2847.
|
2022-11-03 16:56:21 +00:00 |
|
|
Neil Alexander
|
fb2e7d1b05
|
Put P2P Demos back into their own Dockerfiles
|
2022-11-03 13:57:44 +00:00 |
|
|
Neil Alexander
|
9625a79926
|
Update to matrix-org/pinecone@37f2e9b
|
2022-11-03 13:06:21 +00:00 |
|
gitlab-nickfreeman
|
23a25be904
|
Update README.md (#2855)
There only are 2, not 3 sample `docker-compose` files.
This is only a change to the README.md, no need for Go unit tests
### Pull Request Checklist
<!-- Please read
https://matrix-org.github.io/dendrite/development/contributing before
submitting your pull request -->
* [x] I have added Go unit tests or [Complement integration
tests](https://github.com/matrix-org/complement) for this PR _or_ I have
justified why this PR doesn't need tests
* [x] Pull request includes a [sign off below using a legally
identifiable
name](https://matrix-org.github.io/dendrite/development/contributing#sign-off)
_or_ I have already signed off privately
Signed-off-by: `Nick Freeman <nick@nickfreeman.de>`
|
2022-11-03 12:18:25 +00:00 |
|
|
Neil Alexander
|
8704e84898
|
Tweak removeDuplicates calls to use events instead of recentEvents (#2853)
... since `events` is *after* history visibility filtering, not before
it.
|
2022-11-03 10:19:37 +00:00 |
|
0x1a8510f2
|
1fcbb9b5e5
|
Fix workdir in Dockerfile (and make it a volume) (#2852)
|
2022-11-03 08:37:58 +00:00 |
|
|
Till Faelligen
|
85d740ea1b
|
Add GHA permission to upload security events
|
2022-11-03 08:26:46 +01:00 |
|
|
Till Faelligen
|
f5b11e30a4
|
Hopefully fix GHA sarif upload
|
2022-11-03 08:20:51 +01:00 |
|
|
Tak Wai Wong
|
a70e1de91a
|
Merge branch 'matrix-org:main' into main
|
2022-11-02 15:14:53 -07:00 |
|
|
Tak Wai Wong
|
5c64593dcb
|
Merge pull request #58 from HereNotThere/sync-upstream
Sync upstream changes to pick up fix for #2838
|
2022-11-02 15:13:46 -07:00 |
|