Commit graph

  • 26b07d632e
    Merge pull request #73 from matrix-org/main Brian Meek 2023-02-08 17:14:48 -0800
  • d9801a3dbf store channel network id in struct (#1447) Giuseppe Rodriguez 2023-02-08 17:13:08 -0800
  • 3fc97630ed
    Merge pull request #72 from HereNotThere/main-merge Brian Meek 2023-02-08 17:06:20 -0800
  • 88eb6af729
    Merge changes made in Harmony to get Dendrite to pass tests Brian Meek 2023-02-08 17:04:54 -0800
  • b90114cda3 Merge upstream Dendrite 0.11 changes, Dendrite and lib tests passing (#1440) Brian Meek 2023-02-08 16:58:48 -0800
  • 9a85e1b3c1 Audit Fixes 6 - Code quality checks (#1439) Giuseppe Rodriguez 2023-02-08 14:38:06 -0800
  • 6bdd949235 Audit Fixes 5 - Updates to channel based functionality (#1435) Giuseppe Rodriguez 2023-02-08 14:09:03 -0800
  • 72d43d8baa getter for channels (#1441) Giuseppe Rodriguez 2023-02-08 11:41:38 -0800
  • 823b675bce
    Merge pull request #71 from HereNotThere/main-merge Brian Meek 2023-02-08 08:25:21 -0800
  • c243677795
    Merge local harmony changes, Dendrite tests passing Brian Meek 2023-02-08 08:23:06 -0800
  • e64ed0934d
    Update coverage (#2964) ShalokShalom 2023-02-08 08:56:16 +0100
  • 3757e0f596 Audit Fixes 4 - Upgradeability of Entitlement Modules is controlled by OpenZeppelin owner() and not SpaceOwner NFT holder (#1431) Giuseppe Rodriguez 2023-02-07 19:43:32 -0800
  • cade6d1de3 Audit Fixes 3 - [M-1] More than one Role can contain the Permissions.Owner permission (#1429) Giuseppe Rodriguez 2023-02-07 19:23:07 -0800
  • 9cc55befe7
    Merge upstream Brian Meek 2023-02-07 17:31:43 -0800
  • ceff2ae574
    Merge upstream Brian Meek 2023-02-07 17:31:02 -0800
  • c74798b5ab
    Merge branch 'matrix-org-main' Brian Meek 2023-02-07 17:30:09 -0800
  • 34504e3cfe
    Merge upstream Brian Meek 2023-02-07 17:30:01 -0800
  • d89f1aee85
    Merge pull request #69 from HereNotThere/brian/merge_upstream Brian Meek 2023-02-07 17:18:57 -0800
  • 706e81f512 Revert "Merge upstream latest" Brian Meek 2023-02-07 17:14:16 -0800
  • ff194d6610 Revert "Fix lint warning about ioutil deprecation" Brian Meek 2023-02-07 17:14:16 -0800
  • be1fd40275 Revert "Fix lint warning about ioutil deprecation" Brian Meek 2023-02-07 17:14:16 -0800
  • 92e468f352 Revert "Debug test failure" Brian Meek 2023-02-07 17:14:16 -0800
  • c47b088eda Revert "Fix lint warning about ignored err assignment" Brian Meek 2023-02-07 17:14:16 -0800
  • 04d272d32a Revert "Logging the config in the error to debug CI" Brian Meek 2023-02-07 17:14:16 -0800
  • 7df85cde1d Revert "Logging the config in the error to debug CI" Brian Meek 2023-02-07 17:14:16 -0800
  • 13c221469b Revert "Logging the config in the error to debug CI" Brian Meek 2023-02-07 17:14:16 -0800
  • a610e6d043 Revert "HArdcoding the server_name while debugging while it isn't loading from the config" Brian Meek 2023-02-07 17:14:16 -0800
  • a21b421156 Revert "Set the test config server_name to localhost" Brian Meek 2023-02-07 17:14:16 -0800
  • 7fa8ee0d1a Set the test config server_name to localhost Brian Meek 2023-02-07 16:42:36 -0800
  • d179b9f6f7 HArdcoding the server_name while debugging while it isn't loading from the config Brian Meek 2023-02-07 16:28:29 -0800
  • c8f8e90446 Logging the config in the error to debug CI Brian Meek 2023-02-07 15:53:58 -0800
  • 39377bd048 Logging the config in the error to debug CI Brian Meek 2023-02-07 14:51:02 -0800
  • 9d8dfcabcf Logging the config in the error to debug CI Brian Meek 2023-02-07 14:33:53 -0800
  • a4c410b81f Fix lint warning about ignored err assignment Brian Meek 2023-02-07 09:17:09 -0800
  • 548029d6da Debug test failure Brian Meek 2023-02-07 09:13:26 -0800
  • 8610b4225e Fix lint warning about ioutil deprecation Brian Meek 2023-02-07 08:24:08 -0800
  • 6225873d04 Fix lint warning about ioutil deprecation Brian Meek 2023-02-07 08:11:33 -0800
  • 06c319d580 Merge upstream latest Brian Meek 2023-02-06 20:50:50 -0800
  • 34c62de3d6
    Set the test config server_name to localhost Brian Meek 2023-02-07 16:42:36 -0800
  • 69d7eef327
    HArdcoding the server_name while debugging while it isn't loading from the config Brian Meek 2023-02-07 16:28:29 -0800
  • 7d6ffad2de Audit Fixes 1 - Removes OZ Ownable from Space contract and makes checks for space token ownership to see if caller is space owner (#1424) Giuseppe Rodriguez 2023-02-07 15:57:39 -0800
  • f23e0f5e06
    Logging the config in the error to debug CI Brian Meek 2023-02-07 15:53:58 -0800
  • cc5dab6828
    Logging the config in the error to debug CI Brian Meek 2023-02-07 14:51:02 -0800
  • e515dd4ccd
    Logging the config in the error to debug CI Brian Meek 2023-02-07 14:33:53 -0800
  • 3b0e307878
    Update coverage ShalokShalom 2023-02-07 19:53:00 +0100
  • c0d986fdb1
    Fix lint warning about ignored err assignment Brian Meek 2023-02-07 09:17:09 -0800
  • b19342ecee
    Debug test failure Brian Meek 2023-02-07 09:13:26 -0800
  • 5e556292c9
    Fix lint warning about ioutil deprecation Brian Meek 2023-02-07 08:24:08 -0800
  • b41d9915d7
    Fix lint warning about ioutil deprecation Brian Meek 2023-02-07 08:11:33 -0800
  • eb29a31550
    Optimize /sync and history visibility (#2961) Till 2023-02-07 14:31:23 +0100
  • 3b58bddbd0
    Make linter happy Till Faelligen 2023-02-07 13:26:48 +0100
  • a5f08241a3
    Merge branch 's7evink/initsync' of github.com:matrix-org/dendrite into s7evink/initsync Till Faelligen 2023-02-07 13:26:42 +0100
  • 9c2482006e
    Merge branch 'main' of github.com:matrix-org/dendrite into s7evink/initsync Till Faelligen 2023-02-07 13:26:29 +0100
  • 8ca2f0a793
    PR comments; Add more comments Till Faelligen 2023-02-07 13:26:13 +0100
  • 4f1c8983ad
    Merge upstream latest Brian Meek 2023-02-06 20:50:50 -0800
  • 37ac6a70e2
    Merge branch 'main' into s7evink/initsync kegsay 2023-02-06 13:30:29 +0100
  • 50f8466290
    Wait a bit before closing Dendrite to let components process events Till Faelligen 2023-02-06 11:18:19 +0100
  • da2e184072
    Evacuate room sync Till Faelligen 2023-02-06 10:25:09 +0100
  • b2f177689b
    Evacuate room before purging Till Faelligen 2023-02-06 10:16:06 +0100
  • 753971dc9b
    Fix linter issue Till Faelligen 2023-02-06 09:30:27 +0100
  • 3a6ca74ff5
    Add docs about purge room endpoint Till Faelligen 2023-02-06 08:34:38 +0100
  • d55e384fdf
    Merge branch 'main' of github.com:matrix-org/dendrite into s7evink/docs Till Faelligen 2023-02-06 08:27:50 +0100
  • cf254ba044
    Add max frame size to pinecone bindings Devon Hudson 2023-02-04 06:05:39 -0700
  • 4ed61740ab
    Disable fulltext search in pinecone builds Devon Hudson 2023-02-04 05:55:59 -0700
  • 26f86a76b6
    Update dendrite-pinecone gobindings build script Devon Hudson 2023-02-03 09:05:57 -0700
  • 3a08948e15
    Merge branch 'main' of github.com:matrix-org/dendrite into s7evink/initsync Till Faelligen 2023-02-03 13:44:59 +0100
  • baf118b08c
    Add Sytest/Complement coverage to scheduled runs (#2962) Till 2023-02-03 13:42:35 +0100
  • 49805aabd3
    Enable Cypress again Till Faelligen 2023-02-03 13:02:14 +0100
  • 80d20a19d2
    Remove on push Till Faelligen 2023-02-03 12:54:36 +0100
  • afd94dce8b
    Fix bug in device list change tracking Till Faelligen 2023-02-03 12:27:02 +0100
  • 22bee54c19
    Fix registration in API mode Till Faelligen 2023-02-02 14:47:18 +0100
  • 9530c60ab0
    Fix API mode, fix servernotices Till Faelligen 2023-02-02 14:12:49 +0100
  • 949fc00b28
    Quote results before piping to gocovmerge Till Faelligen 2023-02-02 13:10:50 +0100
  • ca06c22355
    Debugging Till Faelligen 2023-02-02 12:47:41 +0100
  • 9781178a86
    Differentiate by filename Till Faelligen 2023-02-02 12:35:06 +0100
  • cf6a1558be
    Maybe try wildcards? Till Faelligen 2023-02-02 12:20:25 +0100
  • 740ba801f5
    Only run SQLite for now.. Till Faelligen 2023-02-02 11:59:49 +0100
  • 542c822623
    Maybe add complement as well Till Faelligen 2023-02-02 11:51:23 +0100
  • d255eb105d
    Always run.. Till Faelligen 2023-02-02 11:28:52 +0100
  • ebcba652ca
    Maybe add coverage reporting Till Faelligen 2023-02-02 11:08:44 +0100
  • bd99793888
    Enable coverage Till Faelligen 2023-02-02 10:34:04 +0100
  • 9c826d064d
    Bump activesupport from 6.0.5 to 6.0.6.1 in /docs (#2959) dependabot[bot] 2023-02-02 10:27:38 +0100
  • 6cc301f2a2
    Merge branch 'main' into s7evink/initsync Till 2023-02-02 10:25:30 +0100
  • b9f5164e64
    Add RecentEvents tests Till Faelligen 2023-02-02 09:54:21 +0100
  • 6e5ac7d3fe
    Add SelectCurrentState test Till Faelligen 2023-02-02 09:06:10 +0100
  • ccc89edf49
    Change lazy loading a bit Till Faelligen 2023-02-02 08:50:05 +0100
  • a666c06da1
    Consolidate pinecone demo http server variations Devon Hudson 2023-02-01 14:11:48 -0700
  • 048e35026c
    Refactor common pinecone demo code to remove major duplication Devon Hudson 2023-02-01 13:41:27 -0700
  • dbc2869cbd
    Refactor pinecone demo to remove duplicate pinecone setup Devon Hudson 2023-01-31 17:35:21 -0700
  • d4f64f91ca
    Refactor pinecone demo to remove duplicate key setup Devon Hudson 2023-01-31 16:27:51 -0700
  • 2f8377e94b
    Remove nolint: gocyclo from relayapi routing setup Devon Hudson 2023-01-31 16:13:59 -0700
  • 529feb07ee
    Refactor conduit type from pinecone demo into its own package Devon Hudson 2023-01-31 16:10:48 -0700
  • be43b9c0ea
    Refactor common relay sync struct to remove duplication Devon Hudson 2023-01-31 15:51:08 -0700
  • 4738fe656f
    Roomserver published pkey migration (#2960) devonh 2023-02-01 16:32:31 +0000
  • 6cf33f546a
    Add /context tests Till Faelligen 2023-02-01 17:13:32 +0100
  • b8ed5d42f2
    Merge branch 'main' into roomserver-pub-pkey-migration devonh 2023-02-01 16:08:57 +0000
  • d5f03c241b
    Group adding roomserver migrations to the same call Devon Hudson 2023-02-01 08:48:15 -0700
  • 977dc8f9a5
    Add isStateFilterEmpty tests Till Faelligen 2023-02-01 16:03:12 +0100
  • fc74946246
    Add migration to rename dupe index Till Faelligen 2023-02-01 15:43:02 +0100
  • 1af5c7e69a
    Fix UT, delete empty file Till Faelligen 2023-02-01 14:54:19 +0100