summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | remove bloatNeil Johnson2019-06-061-10/+1
* | | | | | | Add ability to perform password reset via email without trusting the identity...Andrew Morgan2019-06-0620-71/+922
* | | | | | | Stop hardcoding trust of old matrix.org key (#5374)Richard van der Hoff2019-06-066-95/+293
* | | | | | | Neilj/1.0 upgrade notes (#5371)Neil Johnson2019-06-064-8/+79
* | | | | | | Regen sample config before kicking off agents (#5370)Andrew Morgan2019-06-062-2/+3
* | | | | | | Fix missing logcontext for PresenceHandler.on_shutdown. (#5369)Richard van der Hoff2019-06-062-1/+8
* | | | | | | Merge pull request #5221 from matrix-org/erikj/fix_worker_sytestErik Johnston2019-06-062-1/+12
|\ \ \ \ \ \ \
| * | | | | | | Better wordsErik Johnston2019-06-061-1/+1
| * | | | | | | NewsfileErik Johnston2019-05-211-0/+1
| * | | | | | | Fix get_max_topological_token to never return NoneErik Johnston2019-05-211-1/+11
* | | | | | | | Merge pull request #5089 from dnaf/m-heroes-empty-room-nameBrendan Abolivier2019-06-062-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Add credit in the changelogBrendan Abolivier2019-06-062-1/+1
| * | | | | | | | Simplify conditionBrendan Abolivier2019-06-061-2/+2
| * | | | | | | | Simplify conditionBrendan Abolivier2019-06-051-3/+2
| * | | | | | | | Merge branch 'develop' into m-heroes-empty-room-nameBrendan Abolivier2019-06-05350-3583/+9622
| |\ \ \ \ \ \ \ \
| * | | | | | | | | LintKatie Wolfe2019-04-241-1/+1
| * | | | | | | | | Clean up codeKatie Wolfe2019-04-241-2/+3
| * | | | | | | | | Show heroes if room name or canonical alias are emptyKatie Wolfe2019-04-241-3/+4
| * | | | | | | | | Add full stop to 5084.bugfixKatie Wolfe2019-04-241-1/+1
| * | | | | | | | | Add changelog.d/5084.bugfixKatie Wolfe2019-04-241-0/+1
| * | | | | | | | | Show heroes if room name or canonical alias are emptyKatie Wolfe2019-04-241-5/+3
* | | | | | | | | | Merge pull request #5359 from matrix-org/rav/enable_tls_verificationRichard van der Hoff2019-06-064-12/+19
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rav/fix_custom_ca' into rav/enable_tls_verificationRichard van der Hoff2019-06-0528-43/+219
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update sample configRichard van der Hoff2019-06-051-4/+4
| * | | | | | | | | | | Validate federation server TLS certificates by default.Richard van der Hoff2019-06-053-8/+15
* | | | | | | | | | | | Merge pull request #5361 from matrix-org/rav/generate_signing_keyRichard van der Hoff2019-06-062-0/+38
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | add a script to generate new signing_key filesRichard van der Hoff2019-06-052-0/+38
* | | | | | | | | | | | | Merge pull request #5355 from matrix-org/babolivier/heroes_left_membersBrendan Abolivier2019-06-062-15/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Properly format the changelogBrendan Abolivier2019-06-051-1/+1
| * | | | | | | | | | | | | ChangelogBrendan Abolivier2019-06-051-0/+1
| * | | | | | | | | | | | | Do user_id != me checks before deciding whether we should pick heroes from th...Brendan Abolivier2019-06-051-15/+19
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #5354 from matrix-org/rav/server_keys/99-room-v5Richard van der Hoff2019-06-062-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Implement room v5 which enforces signing key validityRichard van der Hoff2019-06-052-5/+7
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #5353 from matrix-org/rav/verify_key_loggingRichard van der Hoff2019-06-066-56/+86
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Associate a request_name with each verify request, for loggingRichard van der Hoff2019-06-056-56/+86
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #5362 from matrix-org/rav/fix_custom_caRichard van der Hoff2019-06-052-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Fix `federation_custom_ca_list` configuration option.Richard van der Hoff2019-06-052-1/+2
|/ / / / / / / / / / / /
* | | | | | | | | | | | Neilj/add r0.5 to versions (#5360)Neil Johnson2019-06-052-0/+2
* | | | | | | | | | | | Fix background updates to handle redactions/rejections (#5352)Erik Johnston2019-06-065-12/+117
| |_|/ / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Fix notes about well-known and acme (#5357)Richard van der Hoff2019-06-052-6/+6
* | | | | | | | | | | Merge pull request #5317 from matrix-org/erikj/make_do_auth_non_essentialErik Johnston2019-06-052-12/+47
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add logging when request fails and clarify we ignore errors.Erik Johnston2019-06-051-4/+12
| * | | | | | | | | | | NewsfileErik Johnston2019-06-031-0/+1
| * | | | | | | | | | | Fix handling of failures when calling /event_auth.Erik Johnston2019-06-031-12/+38
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Neilj/changelog clean up (#5356)Neil Johnson2019-06-0512-12/+12
* | | | | | | | | | | Neilj/mau tracking config explainer (#5284)Neil Johnson2019-06-053-0/+33
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Add a test room version where we enforce key validity (#5348)Richard van der Hoff2019-06-053-22/+38
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Clean up debug logging (#5347)Richard van der Hoff2019-06-054-8/+20
* | | | | | | | | Rename VerifyKeyRequest.deferred field (#5343)Richard van der Hoff2019-06-052-12/+13
* | | | | | | | | Call RetryLimiter correctly (#5340)Richard van der Hoff2019-06-042-1/+8
* | | | | | | | | Fix failure to fetch batches of PDUs (#5342)Richard van der Hoff2019-06-042-0/+2
* | | | | | | | | Rename get_events->get_events_from_store_or_dest (#5344)Richard van der Hoff2019-06-042-20/+14
* | | | | | | | | Merge pull request #5341 from matrix-org/babolivier/email_configBrendan Abolivier2019-06-042-42/+58
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Only parse from email if providedBrendan Abolivier2019-06-041-4/+5
| * | | | | | | | LintBrendan Abolivier2019-06-041-1/+0
| * | | | | | | | Make account validity renewal emails work when email notifs are disabledBrendan Abolivier2019-06-042-42/+58
* | | | | | | | | Merge pull request #5324 from matrix-org/erikj/ignore_nullErik Johnston2019-06-042-0/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | FixErik Johnston2019-06-031-1/+2
| * | | | | | | | | NewsfileErik Johnston2019-06-031-0/+1
| * | | | | | | | | Ignore room state with null bytes in for room statsErik Johnston2019-06-031-0/+15
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Avoid rapidly backing-off a server if we ignore the retry interval (#5335)Richard van der Hoff2019-06-042-23/+38
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Avoid rapidly backing-off a server if we ignore the retry intervalRichard van der Hoff2019-06-032-23/+38
* | | | | | | | | | Don't do long retries when calling the key notary server. (#5334)Richard van der Hoff2019-06-042-1/+1
* | | | | | | | | | Merge pull request #5333 from matrix-org/rav/server_keys/09_improve_notary_se...Richard van der Hoff2019-06-044-40/+66
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | changelogRichard van der Hoff2019-06-041-0/+1
| * | | | | | | | | | Notary server: make requests to origins in parallelRichard van der Hoff2019-06-042-11/+11
| * | | | | | | | | | Don't bomb out on direct key fetches as soon as one failsRichard van der Hoff2019-06-042-29/+41
| * | | | | | | | | | Reduce timeout for outbound /key/v2/server requests.Richard van der Hoff2019-06-031-0/+13
| |/ / / / / / / / /
* | | | | | | / / / Improve docstrings on MatrixFederationClient. (#5332)Richard van der Hoff2019-06-042-16/+56
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | Hawkowl/fix missing auth (#5328)Amber Brown2019-06-042-0/+2
|/ / / / / / / /
* | | | | | | | Enforce validity period on server_keys for fed requests. (#5321)Richard van der Hoff2019-06-036-88/+228
* | | | | | | | Revert "Newsfile"Erik Johnston2019-06-031-1/+0
* | | | | | | | NewsfileErik Johnston2019-06-031-0/+1
|/ / / / / / /
* | | | | | | Merge pull request #5307 from matrix-org/rav/server_keys/07-fix-notary-cache-...Richard van der Hoff2019-06-032-12/+3
|\ \ \ \ \ \ \
| * | | | | | | Stop overwriting server keys with other keysRichard van der Hoff2019-05-312-12/+3
* | | | | | | | Unify v1 and v2 REST client APIs (#5226)Amber Brown2019-06-0343-317/+296
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #5309 from matrix-org/rav/limit_displayname_lengthRichard van der Hoff2019-06-014-2/+76
|\ \ \ \ \ \ \
| * | | | | | | add some testsRichard van der Hoff2019-06-011-2/+60
| * | | | | | | Limit displaynames and avatar URLsRichard van der Hoff2019-06-013-0/+16
* | | | | | | | Merge pull request #5299 from matrix-org/rav/server_keys/05-rewrite-gsvk-againRichard van der Hoff2019-05-312-48/+54
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into rav/server_keys/05-rewrite...Richard van der Hoff2019-05-3112-129/+147
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Rewrite get_server_verify_keys, again.Richard van der Hoff2019-05-302-48/+54
* | | | | | | | | Merge pull request #5276 from matrix-org/babolivier/account_validity_job_deltaErik Johnston2019-05-315-9/+39
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Sample configBrendan Abolivier2019-05-311-1/+1
| * | | | | | | | Move delta from +10% to -10%Brendan Abolivier2019-05-313-5/+5
| * | | | | | | | Sample configBrendan Abolivier2019-05-311-8/+3
| * | | | | | | | Gah pythonBrendan Abolivier2019-05-311-1/+1
| * | | | | | | | Make max_delta equal to period * 10%Brendan Abolivier2019-05-313-32/+8
| * | | | | | | | TypoBrendan Abolivier2019-05-281-1/+1
| * | | | | | | | Config and changelogBrendan Abolivier2019-05-282-0/+8
| * | | | | | | | Allow configuring a range for the account validity startup jobBrendan Abolivier2019-05-283-2/+53
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #5300 from matrix-org/rav/server_keys/06-fix-serverkeys-ha...Richard van der Hoff2019-05-312-25/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove some pointless exception handlingRichard van der Hoff2019-05-302-25/+9
* | | | | | | | | Merge pull request #5296 from matrix-org/rav/server_keys/04-use-attrs-for_ver...Richard van der Hoff2019-05-312-17/+22
|\| | | | | | | |
| * | | | | | | | use attr.s for VerifyKeyRequestRichard van der Hoff2019-05-302-17/+22
* | | | | | | | | Merge pull request #5293 from Kagamihime/messages-federation-formatErik Johnston2019-05-312-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add changelogEisha Chen-yen-su2019-05-301-0/+1
| * | | | | | | | | Fix ignored filter field in `/messages` endpointEisha Chen-yen-su2019-05-301-0/+2
* | | | | | | | | | Merge pull request #5294 from matrix-org/erikj/speed_up_room_statsErik Johnston2019-05-315-87/+112
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | NewsfileErik Johnston2019-05-311-0/+1
| * | | | | | | | | | Add indices. Remove room_ids accidentally addedErik Johnston2019-05-312-13/+56
| * | | | | | | | | | Join against events to use its room_id indexErik Johnston2019-05-301-1/+6
| * | | | | | | | | | Move deletion from table inside txnErik Johnston2019-05-301-2/+5
| * | | | | | | | | | Fetch membership counts all at onceErik Johnston2019-05-302-38/+18
| * | | | | | | | | | Get events all at onceErik Johnston2019-05-301-33/+26
* | | | | | | | | | | Clarify that the admin change password endpoint logs them out (#5303)Travis Ralston2019-05-312-1/+2
| |_|_|_|/ / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'master' into developErik Johnston2019-05-303-3/+17
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | / / | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | 0.99.5.2 v0.99.5.2 github/release-v0.99.5 release-v0.99.5Erik Johnston2019-05-306-4/+16
| * | | | | | | | fix changelog for 0.99.5.1 (#5270)Richard van der Hoff2019-05-301-2/+1
| * | | | | | | | NewsfileErik Johnston2019-05-301-0/+1
| * | | | | | | | Add index to temp tableErik Johnston2019-05-301-0/+1
| * | | | | | | | Update synapse/storage/events_bg_updates.pyErik Johnston2019-05-301-1/+1
| * | | | | | | | Rename constantErik Johnston2019-05-301-3/+3
| * | | | | | | | Move event background updates to a separate fileErik Johnston2019-05-303-369/+405
| * | | | | | | | Fixup comments and loggingErik Johnston2019-05-302-9/+15
| * | | | | | | | NewsfileErik Johnston2019-05-301-0/+1
| * | | | | | | | Add testErik Johnston2019-05-301-0/+248
| * | | | | | | | Log actual number of entries deletedErik Johnston2019-05-302-5/+13
| * | | | | | | | Add DB bg update to cleanup extremities.Erik Johnston2019-05-302-0/+205
| * | | | | | | | Correctly filter out extremities with soft failed prevs (#5274)Erik Johnston2019-05-302-3/+80
* | | | | | | | | Merge pull request #5291 from matrix-org/erikj/add_indexErik Johnston2019-05-302-0/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | NewsfileErik Johnston2019-05-301-0/+1
| * | | | | | | | Add index to temp tableErik Johnston2019-05-301-0/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #5278 from matrix-org/erikj/cleanup_bad_extremitiesErik Johnston2019-05-307-181/+685
|\ \ \ \ \ \ \ \
| * | | | | | | | Update synapse/storage/events_bg_updates.pyErik Johnston2019-05-301-1/+1
| * | | | | | | | Rename constantErik Johnston2019-05-301-3/+3
| * | | | | | | | Move event background updates to a separate fileErik Johnston2019-05-303-369/+405
| * | | | | | | | Fixup comments and loggingErik Johnston2019-05-302-9/+15
| * | | | | | | | NewsfileErik Johnston2019-05-291-0/+1
| * | | | | | | | Add testErik Johnston2019-05-291-0/+248
| * | | | | | | | Log actual number of entries deletedErik Johnston2019-05-292-5/+13
| * | | | | | | | Add DB bg update to cleanup extremities.Erik Johnston2019-05-292-0/+205
* | | | | | | | | Merge pull request #5256 from aaronraimist/logout-correct-errorErik Johnston2019-05-302-18/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | LintAaron Raimist2019-05-291-2/+0
| * | | | | | | | | Get rid of try exceptAaron Raimist2019-05-271-16/+9
| * | | | | | | | | Add changelogAaron Raimist2019-05-251-0/+1
| * | | | | | | | | Show correct error when logging out and access token is missingAaron Raimist2019-05-241-4/+4
* | | | | | | | | | Remove spurious debug from MatrixFederationHttpClient.get_json (#5287) v0.99.5.1.dev0Richard van der Hoff2019-05-292-4/+1
* | | | | | | | | | Improve logging for logcontext leaks. (#5288)Richard van der Hoff2019-05-292-9/+14
* | | | | | | | | | Merge pull request #5283 from aaronraimist/captcha-docsErik Johnston2019-05-292-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add changelogAaron Raimist2019-05-281-0/+1
| * | | | | | | | | | Specify the type of reCAPTCHA key to use (#5013)Aaron Raimist2019-05-281-0/+1
* | | | | | | | | | | Implement the SHHS complexity API (#5216)Amber Brown2019-05-306-5/+180
* | | | | | | | | | | Serve CAS login over r0 (#5286)Amber Brown2019-05-302-2/+3
* | | | | | | | | | | Fix error when downloading thumbnail with width/height param missing (#5258)Aaron Raimist2019-05-292-2/+3
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Correctly filter out extremities with soft failed prevs (#5274)Erik Johnston2019-05-292-3/+80
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Fix dropped logcontexts during high outbound traffic. (#5277)Richard van der Hoff2019-05-292-7/+14
* | | | | | | | | Merge pull request #5282 from aaronraimist/user-directoryAmber Brown2019-05-294-13/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | regenerate sample configAmber Brown2019-05-291-3/+3
| * | | | | | | | Rename 5282.misc to 5282.docAmber Brown2019-05-291-0/+0
| * | | | | | | | Add changelogAaron Raimist2019-05-281-0/+1
| * | | | | | | | Fix docs on resetting the user directory (#5036)Aaron Raimist2019-05-282-10/+6
|/ / / / / / / /
* | | | | | | | Merge pull request #5251 from matrix-org/rav/server_keys/01-check_sigRichard van der Hoff2019-05-283-50/+168
|\ \ \ \ \ \ \ \
| * | | | | | | | changelogRichard van der Hoff2019-05-241-0/+1
| * | | | | | | | Improve error handling/logging for perspectives-key fetching.Richard van der Hoff2019-05-241-28/+77
| * | | | | | | | Require sig from origin server on perspectives responsesRichard van der Hoff2019-05-232-22/+90
* | | | | | | | | Fix "db txn 'update_presence' from sentinel context" log messages (#5275)Richard van der Hoff2019-05-282-52/+48
* | | | | | | | | Merge pull request #5268 from matrix-org/babolivier/account_validity_fix_schemaBrendan Abolivier2019-05-282-0/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | ChangelogBrendan Abolivier2019-05-281-0/+1
| * | | | | | | | Fix schema update for account validityBrendan Abolivier2019-05-281-0/+3
* | | | | | | | | Merge pull request #5260 from matrix-org/travis/fix-room-bg-taskErik Johnston2019-05-252-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ChangelogTravis Ralston2019-05-251-0/+1
| * | | | | | | | | Fix logging for room stats background updateTravis Ralston2019-05-251-1/+1
* | | | | | | | | | Merge pull request #5257 from aaronraimist/fix-error-code-publicroomsErik Johnston2019-05-252-1/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add changelogAaron Raimist2019-05-241-0/+1
| * | | | | | | | | | Fix error code for invalid parameterAaron Raimist2019-05-241-1/+1
| | |_|_|/ / / / / / | |/| | | | | | | |
* / | | | | | | | | Simplification to Keyring.wait_for_previous_lookups. (#5250)Richard van der Hoff2019-05-243-9/+7
|/ / / / / / / / /
* | | | | | | | | Fix appservice timestamp massaging (#5233)Tulir Asokan2019-05-242-1/+7
* | | | | | | | | Add missing blank line in config (#5249)Richard van der Hoff2019-05-243-0/+3
* | | | | | | | | Merge pull request #5220 from matrix-org/erikj/dont_bundle_live_eventsErik Johnston2019-05-245-2/+13
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Don't bundle aggs for /state and /members etc APIsErik Johnston2019-05-241-0/+3
| * | | | | | | | NewsfileErik Johnston2019-05-211-0/+1
| * | | | | | | | Don't bundle events in /sync or /eventsErik Johnston2019-05-213-2/+9
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #5244 from matrix-org/rav/server_keys/00-factor-out-fetchersErik Johnston2019-05-234-149/+207
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Fix remote_key_resourceRichard van der Hoff2019-05-231-3/+3
| * | | | | | | Factor out KeyFetchers from KeyRingRichard van der Hoff2019-05-233-146/+204
* | | | | | | | Add config option for setting homeserver's default room version (#5223)Andrew Morgan2019-05-237-10/+57
|/ / / / / / /
* | | | | | | Store key validity time in the storage layerRichard van der Hoff2019-05-236-46/+122
* | | | | | | Simplify process_v2_response (#5236)Richard van der Hoff2019-05-232-21/+30
* | | | | | | Remove unused VerifyKey.expired and .time_added fields (#5235)Richard van der Hoff2019-05-232-3/+1
* | | | | | | Rewrite store_server_verify_key to store several keys at once (#5234)Richard van der Hoff2019-05-235-87/+96
* | | | | | | Simplifications and comments in do_auth (#5227)Richard van der Hoff2019-05-233-121/+183
* | | | | | | Run black on synapse.crypto.keyring (#5232)Richard van der Hoff2019-05-222-149/+138
* | | | | | | Merge branch 'master' into developNeil Johnson2019-05-223-3/+11
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | 0.99.5.1 v0.99.5.1Neil Johnson2019-05-223-3/+11
| * | | | | | Revert "0.99.5"Neil Johnson2019-05-223-11/+3
| * | | | | | 0.99.5Neil Johnson2019-05-223-3/+11
* | | | | | | remove urllib3 pin (#5230)Marcus Hoffmann2019-05-222-8/+1
* | | | | | | Merge branch 'master' into developNeil Johnson2019-05-223-1/+11
|\| | | | | |
| * | | | | | 0.99.5 v0.99.5Neil Johnson2019-05-223-1/+11
| | |_|/ / / | |/| | | |
* | | | | | Neilj/ensure get profileinfo available in client reader slaved store (#5213)Neil Johnson2019-05-222-0/+3
* | | | | | Update README.md (#5222)Steffen2019-05-221-1/+1
* | | | | | Merge branch 'master' into developRichard van der Hoff2019-05-2228-27/+40
|\| | | | |
| * | | | | update changelog v0.99.5rc1Richard van der Hoff2019-05-213-3/+1
| * | | | | Merge commit 'f4c80d70f' into release-v0.99.5Richard van der Hoff2019-05-215-6/+89
| |\ \ \ \ \
| * | | | | | Fix spelling in changelogRichard van der Hoff2019-05-211-1/+1
| * | | | | | 0.99.5rc1Richard van der Hoff2019-05-2126-25/+40
* | | | | | | Room Statistics (#4338)Amber Brown2019-05-2115-13/+1306
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #5203 from matrix-org/erikj/aggregate_by_senderErik Johnston2019-05-212-1/+2
|\ \ \ \ \ \
| * | | | | | NewsfileErik Johnston2019-05-211-0/+1
| * | | | | | Only count aggregations from distinct sendersErik Johnston2019-05-171-1/+1
* | | | | | | Merge pull request #5212 from matrix-org/erikj/deny_multiple_reactionsErik Johnston2019-05-214-5/+87
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix wordsErik Johnston2019-05-211-3/+3
| * | | | | | NewsfileErik Johnston2019-05-201-0/+1
| * | | | | | Block attempts to annotate the same event twiceErik Johnston2019-05-203-5/+86
* | | | | | | Introduce room v4 which updates event ID format. (#5217)Richard van der Hoff2019-05-213-5/+6
* | | | | | | Exclude soft-failed events from fwd-extremity candidates. (#5146)Richard van der Hoff2019-05-213-3/+14
* | | | | | | Pin eliot to <1.8 on python 3.5.2 (#5218)Richard van der Hoff2019-05-213-7/+36
* | | | | | | Merge pull request #5204 from matrix-org/babolivier/account_validity_expirati...Brendan Abolivier2019-05-216-12/+134
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | DocBrendan Abolivier2019-05-212-0/+16
| * | | | | Do the select and insert in a single transactionBrendan Abolivier2019-05-211-10/+6
| * | | | | ChangelogBrendan Abolivier2019-05-171-0/+1
| * | | | | Add startup background job for account validityBrendan Abolivier2019-05-173-12/+121
* | | | | | Fix error handling for rooms whose versions are unknown. (#5219)Richard van der Hoff2019-05-215-7/+38
| |/ / / / |/| | | |
* | | | | Revert "expose SlavedProfileStore to ClientReaderSlavedStore (#5200)"Richard van der Hoff2019-05-202-3/+0
* | | | | Add a test room version which updates event ID format (#5210)Richard van der Hoff2019-05-203-3/+34
* | | | | Merge pull request #5211 from matrix-org/erikj/fixup_reaction_constantsErik Johnston2019-05-205-20/+21
|\ \ \ \ \
| * | | | | NewsfileErik Johnston2019-05-201-0/+1
| * | | | | Rename relation types to match MSCErik Johnston2019-05-204-20/+20
|/ / / / /
* | | | | Merge pull request #5209 from matrix-org/erikj/reactions_baseErik Johnston2019-05-2014-16/+1439
|\ \ \ \ \
| * | | | | NewsfileErik Johnston2019-05-202-1/+1
| * | | | | Merge pull request #5207 from matrix-org/erikj/reactions_redactionsErik Johnston2019-05-203-12/+125
| |\ \ \ \ \
| | * | | | | Fixup commentsErik Johnston2019-05-201-2/+2
| | * | | | | Correctly update aggregation counts after redactionErik Johnston2019-05-203-0/+57
| | | |/ / / | | |/| | |
| | * | | | Make tests use different user for each reaction it sendsErik Johnston2019-05-171-12/+68
| * | | | | Merge pull request #5195 from matrix-org/erikj/editsErik Johnston2019-05-204-14/+166
| |\| | | |
| | * | | | Fixup bsaed on review commentsErik Johnston2019-05-173-19/+19
| | * | | | Add basic editing supportErik Johnston2019-05-164-15/+167
| |/ / / /
| * | | | Merge pull request #5192 from matrix-org/erikj/relations_aggregationsErik Johnston2019-05-169-27/+706
| |\ \ \ \
| | * | | | Move parsing of tokens out of storage layerErik Johnston2019-05-162-14/+21
| | * | | | Indirect tuple conversionErik Johnston2019-05-161-0/+6
| | * | | | Check that event is visible in new APIsErik Johnston2019-05-162-3/+16
| | * | | | Fix relations in worker modeErik Johnston2019-05-165-13/+28
| | * | | | Add cache to relationsErik Johnston2019-05-161-0/+8
| | * | | | Add aggregations APIErik Johnston2019-05-165-13/+643
| * | | | | Merge pull request #5186 from matrix-org/erikj/simple_paginationErik Johnston2019-05-169-0/+479
| |\| | | |
| | * | | | Actually check for None rather falseyErik Johnston2019-05-151-2/+2
| | * | | | Actually implement idempotencyErik Johnston2019-05-151-1/+8
| | * | | | NewsfileErik Johnston2019-05-151-0/+1
| | * | | | Add simple pagination APIErik Johnston2019-05-153-0/+160
| | * | | | Add simple send_relation API and track in DBErik Johnston2019-05-158-0/+311
| |/ / / /
| * | | | Merge branch 'erikj/refactor_pagination_bounds' into erikj/reactions_baseErik Johnston2019-05-155-63/+122
| |\ \ \ \
| * \ \ \ \ Merge branch 'erikj/fix_config_ratelimiting' into erikj/testErik Johnston2019-05-142-1/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'erikj/async_serialize_event' into erikj/reactions_rebaseErik Johnston2019-05-1413-101/+194
| |\ \ \ \ \ \
* | | | | | | | Limit UserIds to a length that fits in a state key (#5198)ReidAnderson2019-05-204-1/+21
* | | | | | | | fix mapping of return values for get_or_register_3pid_guest (#5177)bytepoets-blo2019-05-172-1/+2
* | | | | | | | Merge pull request #5191 from matrix-org/erikj/refactor_pagination_boundsErik Johnston2019-05-172-61/+134
|\ \ \ \ \ \ \ \
| * | | | | | | | Spelling and clarificationsErik Johnston2019-05-171-5/+9
| * | | | | | | | Update docstringErik Johnston2019-05-161-1/+12
| | |_|_|/ / / / | |/| | | | | |
| * | | | | | | NewsfileErik Johnston2019-05-151-0/+1
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-16 12:25:31 +0000