summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* clean up impl, and import idna directlyRichard van der Hoff2019-06-102-15/+12
* Share an SSL context object between SSL connectionsRichard van der Hoff2019-06-091-60/+89
* 1.0.0rc1 v1.0.0rc1Neil Johnson2019-06-071-1/+1
* Prevent multiple device list updates from breaking a batch send (#5156)Andrew Morgan2019-06-062-31/+126
* Set default room version to v4. (#5379)Neil Johnson2019-06-061-1/+1
* Merge pull request #5320 from matrix-org/hawkowl/full-schema-v1Erik Johnston2019-06-065-2/+2352
|\
| * fix maybeAmber H. Brown2019-06-071-20/+2
| * just user dir?Amber H. Brown2019-06-071-1/+19
| * remove background updates that arent neededAmber H. Brown2019-06-071-33/+1
| * add more commentsAmber Brown2019-06-061-0/+5
| * Merge remote-tracking branch 'origin/develop' into hawkowl/full-schema-v1Amber Brown2019-06-0439-323/+294
| |\
| * | add stuff in bg updatesAmber Brown2019-06-041-10/+62
| * | WHY IS THIS CALLED A SLIGHTLY DIFFERENT THINGAmber Brown2019-06-031-0/+1
| * | more fixAmber Brown2019-06-031-0/+38
| * | fix schemasAmber Brown2019-06-034-61/+20
| * | full schemaAmber Brown2019-06-033-0/+2315
| * | prepareAmber Brown2019-06-031-2/+14
* | | Add ability to perform password reset via email without trusting the identity...Andrew Morgan2019-06-0617-60/+871
* | | Stop hardcoding trust of old matrix.org key (#5374)Richard van der Hoff2019-06-062-74/+226
* | | Fix missing logcontext for PresenceHandler.on_shutdown. (#5369)Richard van der Hoff2019-06-061-1/+7
* | | Merge pull request #5221 from matrix-org/erikj/fix_worker_sytestErik Johnston2019-06-061-1/+11
|\ \ \
| * | | Better wordsErik Johnston2019-06-061-1/+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-061-5/+4
|\ \ \ \
| * | | | 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-05136-1945/+5896
| |\ \ \ \
| * | | | | 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
| * | | | | 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-061-5/+5
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'rav/fix_custom_ca' into rav/enable_tls_verificationRichard van der Hoff2019-06-057-22/+121
| |\ \ \ \ \ \
| * | | | | | | Validate federation server TLS certificates by default.Richard van der Hoff2019-06-051-5/+5
* | | | | | | | Merge pull request #5355 from matrix-org/babolivier/heroes_left_membersBrendan Abolivier2019-06-061-15/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | 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-061-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Implement room v5 which enforces signing key validityRichard van der Hoff2019-06-051-5/+5
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #5353 from matrix-org/rav/verify_key_loggingRichard van der Hoff2019-06-064-46/+76
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Associate a request_name with each verify request, for loggingRichard van der Hoff2019-06-054-46/+76
| |/ / / / / /
* | | | | | | Fix `federation_custom_ca_list` configuration option.Richard van der Hoff2019-06-051-1/+1
* | | | | | | Neilj/add r0.5 to versions (#5360)Neil Johnson2019-06-051-0/+1
* | | | | | | Fix background updates to handle redactions/rejections (#5352)Erik Johnston2019-06-063-9/+57
* | | | | | | Merge pull request #5317 from matrix-org/erikj/make_do_auth_non_essentialErik Johnston2019-06-051-12/+46
|\ \ \ \ \ \ \
| * | | | | | | Add logging when request fails and clarify we ignore errors.Erik Johnston2019-06-051-4/+12
| * | | | | | | Fix handling of failures when calling /event_auth.Erik Johnston2019-06-031-12/+38
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Neilj/mau tracking config explainer (#5284)Neil Johnson2019-06-051-0/+16
| |/ / / / / |/| | | | |
* | | | | | Add a test room version where we enforce key validity (#5348)Richard van der Hoff2019-06-052-22/+37
| |/ / / / |/| | | |
* | | | | Clean up debug logging (#5347)Richard van der Hoff2019-06-053-8/+18
* | | | | Rename VerifyKeyRequest.deferred field (#5343)Richard van der Hoff2019-06-051-12/+12
* | | | | Call RetryLimiter correctly (#5340)Richard van der Hoff2019-06-041-1/+6
* | | | | Fix failure to fetch batches of PDUs (#5342)Richard van der Hoff2019-06-041-0/+1
* | | | | Rename get_events->get_events_from_store_or_dest (#5344)Richard van der Hoff2019-06-041-20/+13
* | | | | Merge pull request #5341 from matrix-org/babolivier/email_configBrendan Abolivier2019-06-041-42/+57
|\ \ \ \ \
| * | | | | 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-041-42/+57
* | | | | | Merge pull request #5324 from matrix-org/erikj/ignore_nullErik Johnston2019-06-041-0/+16
|\ \ \ \ \ \
| * | | | | | FixErik Johnston2019-06-031-1/+2
| * | | | | | 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-041-23/+37
|\ \ \ \ \ \
| * | | | | | Avoid rapidly backing-off a server if we ignore the retry intervalRichard van der Hoff2019-06-031-23/+37
* | | | | | | Don't do long retries when calling the key notary server. (#5334)Richard van der Hoff2019-06-041-1/+0
* | | | | | | Merge pull request #5333 from matrix-org/rav/server_keys/09_improve_notary_se...Richard van der Hoff2019-06-042-33/+60
|\ \ \ \ \ \ \
| * | | | | | | 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-041-22/+36
| * | | | | | | 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-041-16/+55
* | | | | | | Hawkowl/fix missing auth (#5328)Amber Brown2019-06-041-0/+1
|/ / / / / /
* / / / / / Enforce validity period on server_keys for fed requests. (#5321)Richard van der Hoff2019-06-034-61/+119
|/ / / / /
* | | | | Merge pull request #5307 from matrix-org/rav/server_keys/07-fix-notary-cache-...Richard van der Hoff2019-06-031-12/+2
|\ \ \ \ \
| * | | | | Stop overwriting server keys with other keysRichard van der Hoff2019-05-311-12/+2
* | | | | | Unify v1 and v2 REST client APIs (#5226)Amber Brown2019-06-0338-311/+292
| |_|/ / / |/| | | |
* | | | | Merge pull request #5309 from matrix-org/rav/limit_displayname_lengthRichard van der Hoff2019-06-012-0/+15
|\ \ \ \ \
| * | | | | Limit displaynames and avatar URLsRichard van der Hoff2019-06-012-0/+15
* | | | | | Merge pull request #5299 from matrix-org/rav/server_keys/05-rewrite-gsvk-againRichard van der Hoff2019-05-311-48/+53
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into rav/server_keys/05-rewrite...Richard van der Hoff2019-05-316-128/+141
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Rewrite get_server_verify_keys, again.Richard van der Hoff2019-05-301-48/+53
* | | | | | | Merge pull request #5276 from matrix-org/babolivier/account_validity_job_deltaErik Johnston2019-05-312-3/+25
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Move delta from +10% to -10%Brendan Abolivier2019-05-312-3/+3
| * | | | | | Gah pythonBrendan Abolivier2019-05-311-1/+1
| * | | | | | Make max_delta equal to period * 10%Brendan Abolivier2019-05-312-15/+7
| * | | | | | Allow configuring a range for the account validity startup jobBrendan Abolivier2019-05-282-2/+32
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #5300 from matrix-org/rav/server_keys/06-fix-serverkeys-ha...Richard van der Hoff2019-05-311-25/+8
|\ \ \ \ \ \
| * | | | | | Remove some pointless exception handlingRichard van der Hoff2019-05-301-25/+8
* | | | | | | Merge pull request #5296 from matrix-org/rav/server_keys/04-use-attrs-for_ver...Richard van der Hoff2019-05-311-17/+21
|\| | | | | |
| * | | | | | use attr.s for VerifyKeyRequestRichard van der Hoff2019-05-301-17/+21
* | | | | | | Merge pull request #5293 from Kagamihime/messages-federation-formatErik Johnston2019-05-311-0/+2
|\ \ \ \ \ \ \
| * | | | | | | 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-314-87/+111
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | 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
* | | | | | | | Merge branch 'master' into developErik Johnston2019-05-301-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | 0.99.5.2 v0.99.5.2 github/release-v0.99.5 release-v0.99.5Erik Johnston2019-05-301-1/+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
| * | | | | | | 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-301-3/+79
* | | | | | | | Add index to temp tableErik Johnston2019-05-301-0/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #5278 from matrix-org/erikj/cleanup_bad_extremitiesErik Johnston2019-05-305-181/+436
|\ \ \ \ \ \ \
| * | | | | | | 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
| * | | | | | | 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-301-18/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | LintAaron Raimist2019-05-291-2/+0
| * | | | | | | | Get rid of try exceptAaron Raimist2019-05-271-16/+9
| * | | | | | | | 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-291-4/+0
* | | | | | | | | Improve logging for logcontext leaks. (#5288)Richard van der Hoff2019-05-291-9/+13
* | | | | | | | | Implement the SHHS complexity API (#5216)Amber Brown2019-05-304-5/+89
* | | | | | | | | Serve CAS login over r0 (#5286)Amber Brown2019-05-301-2/+2
* | | | | | | | | Fix error when downloading thumbnail with width/height param missing (#5258)Aaron Raimist2019-05-291-2/+2
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Correctly filter out extremities with soft failed prevs (#5274)Erik Johnston2019-05-291-3/+79
| |_|/ / / / / |/| | | | | |
* | | | | | | Fix dropped logcontexts during high outbound traffic. (#5277)Richard van der Hoff2019-05-291-7/+13
* | | | | | | Fix docs on resetting the user directory (#5036)Aaron Raimist2019-05-281-3/+3
* | | | | | | Merge pull request #5251 from matrix-org/rav/server_keys/01-check_sigRichard van der Hoff2019-05-281-41/+92
|\ \ \ \ \ \ \
| * | | | | | | 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-231-13/+15
* | | | | | | | Fix "db txn 'update_presence' from sentinel context" log messages (#5275)Richard van der Hoff2019-05-281-52/+47
* | | | | | | | Merge pull request #5268 from matrix-org/babolivier/account_validity_fix_schemaBrendan Abolivier2019-05-281-0/+3
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | 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-251-1/+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-251-1/+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-241-7/+4
|/ / / / / / / /
* | | | | | | | Fix appservice timestamp massaging (#5233)Tulir Asokan2019-05-241-1/+6
* | | | | | | | Add missing blank line in config (#5249)Richard van der Hoff2019-05-241-0/+1
* | | | | | | | Merge pull request #5220 from matrix-org/erikj/dont_bundle_live_eventsErik Johnston2019-05-244-2/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Don't bundle aggs for /state and /members etc APIsErik Johnston2019-05-241-0/+3
| * | | | | | | 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-232-143/+178
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Fix remote_key_resourceRichard van der Hoff2019-05-231-3/+3
| * | | | | | Factor out KeyFetchers from KeyRingRichard van der Hoff2019-05-231-140/+175
* | | | | | | Add config option for setting homeserver's default room version (#5223)Andrew Morgan2019-05-234-8/+42
|/ / / / / /
* | | | | | Store key validity time in the storage layerRichard van der Hoff2019-05-233-24/+77
* | | | | | Simplify process_v2_response (#5236)Richard van der Hoff2019-05-231-21/+29
* | | | | | Remove unused VerifyKey.expired and .time_added fields (#5235)Richard van der Hoff2019-05-231-3/+0
* | | | | | Rewrite store_server_verify_key to store several keys at once (#5234)Richard van der Hoff2019-05-232-71/+53
* | | | | | Simplifications and comments in do_auth (#5227)Richard van der Hoff2019-05-232-121/+182
* | | | | | Run black on synapse.crypto.keyring (#5232)Richard van der Hoff2019-05-221-149/+137
* | | | | | Merge branch 'master' into developNeil Johnson2019-05-221-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | 0.99.5.1 v0.99.5.1Neil Johnson2019-05-221-1/+1
| * | | | | Revert "0.99.5"Neil Johnson2019-05-221-1/+1
| * | | | | 0.99.5Neil Johnson2019-05-221-1/+1
* | | | | | remove urllib3 pin (#5230)Marcus Hoffmann2019-05-221-8/+0
* | | | | | Merge branch 'master' into developNeil Johnson2019-05-221-1/+1
|\| | | | |
| * | | | | 0.99.5 v0.99.5Neil Johnson2019-05-221-1/+1
| | |_|/ / | |/| | |
* | | | | Neilj/ensure get profileinfo available in client reader slaved store (#5213)Neil Johnson2019-05-221-0/+2
* | | | | Merge branch 'master' into developRichard van der Hoff2019-05-221-1/+1
|\| | | |
| * | | | Merge commit 'f4c80d70f' into release-v0.99.5Richard van der Hoff2019-05-212-5/+61
| |\ \ \ \
| * | | | | 0.99.5rc1Richard van der Hoff2019-05-211-1/+1
* | | | | | Room Statistics (#4338)Amber Brown2019-05-2111-13/+1021
| |/ / / / |/| | | |
* | | | | Merge pull request #5203 from matrix-org/erikj/aggregate_by_senderErik Johnston2019-05-211-1/+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-212-4/+60
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix wordsErik Johnston2019-05-211-3/+3
| * | | | | Block attempts to annotate the same event twiceErik Johnston2019-05-202-4/+60
* | | | | | Introduce room v4 which updates event ID format. (#5217)Richard van der Hoff2019-05-211-4/+4
* | | | | | Exclude soft-failed events from fwd-extremity candidates. (#5146)Richard van der Hoff2019-05-212-3/+13
* | | | | | Pin eliot to <1.8 on python 3.5.2 (#5218)Richard van der Hoff2019-05-211-6/+34
* | | | | | Merge pull request #5204 from matrix-org/babolivier/account_validity_expirati...Brendan Abolivier2019-05-213-12/+70
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | |
| * | | | DocBrendan Abolivier2019-05-211-0/+8
| * | | | Do the select and insert in a single transactionBrendan Abolivier2019-05-211-10/+6
| * | | | Add startup background job for account validityBrendan Abolivier2019-05-172-12/+66
* | | | | Fix error handling for rooms whose versions are unknown. (#5219)Richard van der Hoff2019-05-214-7/+37
| |/ / / |/| | |
* | | | Revert "expose SlavedProfileStore to ClientReaderSlavedStore (#5200)"Richard van der Hoff2019-05-201-2/+0
* | | | Add a test room version which updates event ID format (#5210)Richard van der Hoff2019-05-202-3/+33
* | | | Rename relation types to match MSCErik Johnston2019-05-203-9/+9
* | | | Merge pull request #5209 from matrix-org/erikj/reactions_baseErik Johnston2019-05-2012-16/+899
|\ \ \ \
| * | | | Correctly update aggregation counts after redactionErik Johnston2019-05-202-0/+20
| | |/ / | |/| |
| * | | Fixup bsaed on review commentsErik Johnston2019-05-173-19/+19
| * | | Add basic editing supportErik Johnston2019-05-163-6/+85
| * | | 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-161-2/+15
| * | | Fix relations in worker modeErik Johnston2019-05-165-13/+28
| * | | Add cache to relationsErik Johnston2019-05-161-0/+8
| * | | Add aggregations APIErik Johnston2019-05-164-10/+395
| * | | Actually check for None rather falseyErik Johnston2019-05-151-2/+2
| * | | Actually implement idempotencyErik Johnston2019-05-151-1/+8
| * | | Add simple pagination APIErik Johnston2019-05-152-0/+130
| * | | Add simple send_relation API and track in DBErik Johnston2019-05-157-0/+213
* | | | Limit UserIds to a length that fits in a state key (#5198)ReidAnderson2019-05-202-1/+13
* | | | fix mapping of return values for get_or_register_3pid_guest (#5177)bytepoets-blo2019-05-171-1/+1
* | | | Merge pull request #5191 from matrix-org/erikj/refactor_pagination_boundsErik Johnston2019-05-171-61/+133
|\ \ \ \
| * | | | Spelling and clarificationsErik Johnston2019-05-171-5/+9
| * | | | Update docstringErik Johnston2019-05-161-1/+12
| |/ / /
| * | | Make generating SQL bounds for pagination genericErik Johnston2019-05-151-61/+118
* | | | expose SlavedProfileStore to ClientReaderSlavedStore (#5200)Neil Johnson2019-05-171-0/+2
* | | | Merge pull request #5196 from matrix-org/babolivier/per_room_profilesBrendan Abolivier2019-05-172-0/+20
|\ \ \ \ | | |/ / | |/| |
| * | | Add option to disable per-room profilesBrendan Abolivier2019-05-162-0/+20
* | | | Fix image orientation when generating thumbnail (#5039)PauRE2019-05-163-1/+45
* | | | Merge pull request #5174 from matrix-org/dbkr/add_dummy_flow_to_recaptcha_onlyDavid Baker2019-05-161-5/+17
|\ \ \ \ | |/ / / |/| | |
| * | | Merge remote-tracking branch 'origin/develop' into dbkr/add_dummy_flow_to_rec...David Baker2019-05-131-1/+0
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/develop' into dbkr/add_dummy_flow_to_rec...David Baker2019-05-132-20/+35
| |\ \ \ \
| * | | | | Re-order flows so that email auth is done lastDavid Baker2019-05-101-4/+12
| * | | | | CommentDavid Baker2019-05-101-0/+4
| * | | | | Add a DUMMY stage to captcha-only registration flowDavid Baker2019-05-101-1/+1
* | | | | | Make /sync attempt to return device updates for both joined and invited users...Matthew Hodgson2019-05-161-19/+25
* | | | | | Merge pull request #5187 from matrix-org/dbkr/only_check_threepid_not_in_use_...David Baker2019-05-161-18/+22
|\ \ \ \ \ \
| * | | | | | Only check 3pids not in use when registeringDavid Baker2019-05-141-18/+22
* | | | | | | Make all the rate limiting options more consistent (#5181)Amber Brown2019-05-155-91/+104
* | | | | | | Drop support for v2_alpha API prefix (#5190)Richard van der Hoff2019-05-157-26/+20
* | | | | | | Merge branch 'master' into developRichard van der Hoff2019-05-151-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | 0.99.4Richard van der Hoff2019-05-151-1/+1
* | | | | | | Merge pull request #5183 from matrix-org/erikj/async_serialize_eventErik Johnston2019-05-1512-101/+193
|\ \ \ \ \ \ \
| * | | | | | | Update docstring with correct return typeErik Johnston2019-05-151-1/+1
| * | | | | | | NewsfileErik Johnston2019-05-141-6/+6
| * | | | | | | Allow client event serialization to be asyncErik Johnston2019-05-1412-95/+187
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #5184 from matrix-org/erikj/expose_get_events_as_arrayErik Johnston2019-05-155-29/+53
|\ \ \ \ \ \ \
| * | | | | | | Update docstring with correct typeErik Johnston2019-05-151-1/+1
| * | | | | | | Expose DataStore._get_events as get_events_as_listErik Johnston2019-05-145-29/+53
| |/ / / / / /
* / / / / / / comment about user_joined_roomRichard van der Hoff2019-05-141-0/+1
|/ / / / / /
* | | | | | Migrate all tests to use the dict-based config format instead of hanging item...Amber Brown2019-05-131-0/+1
* | | | | | Add ability to blacklist ip ranges for federation traffic (#5043)Andrew Morgan2019-05-133-14/+78
|/ / / / /
* | | / / 0.99.4rc1 v0.99.4rc1Brendan Abolivier2019-05-131-1/+1
| |_|/ / |/| | |
* | | | Fix CI after new release of isortBrendan Abolivier2019-05-131-1/+0
| |/ / |/| |
* | | URL preview blacklisting fixes (#5155)Andrew Morgan2019-05-102-20/+35
|/ /
* | Revert 085ae346ace418e0fc043ac5f568f85ebf80038eDavid Baker2019-05-101-1/+1
* | Add a DUMMY stage to captcha-only registration flowDavid Baker2019-05-101-1/+1
* | Run `black` on per_destination_queueRichard van der Hoff2019-05-091-35/+39
* | Limit the number of EDUs in transactions to 100 as expected by receiver (#5138)Quentin Dufour2019-05-092-27/+31
* | add options to require an access_token to GET /profile and /publicRooms on CS...Matthew Hodgson2019-05-085-12/+114
* | Merge pull request #5037 from matrix-org/erikj/limit_inflight_dnsErik Johnston2019-05-081-1/+82
|\ \
| * | Limit in flight DNS requestsErik Johnston2019-04-091-1/+82
* | | Do checks on aliases for incoming m.room.aliases events (#5128)Brendan Abolivier2019-05-085-8/+55
* | | Merge pull request #5104 from matrix-org/erikj/ratelimit_3pid_inviteErik Johnston2019-05-071-0/+11
|\ \ \
| * | | Rate limit earlyErik Johnston2019-05-021-2/+3
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ratelimit_...Erik Johnston2019-04-2663-959/+1158
| |\ \ \
| * | | | Ratelimit 3pid invitesErik Johnston2019-04-261-0/+10
* | | | | Remove the requirement to authenticate for /admin/server_version. (#5122)Richard van der Hoff2019-05-071-10/+5
* | | | | Merge branch 'master' into developRichard van der Hoff2019-05-034-13/+37
|\ \ \ \ \
| * | | | | 0.99.3.2 v0.99.3.2 github/release-v0.99.3.2 release-v0.99.3.2Richard van der Hoff2019-05-031-1/+1
| * | | | | pin urllib3 to <1.25Richard van der Hoff2019-05-031-0/+8
| * | | | | 0.99.3.1Richard van der Hoff2019-05-031-1/+1
| * | | | | Merge pull request #5134 from matrix-org/rav/url_preview_blacklistRichard van der Hoff2019-05-031-10/+21
| |\ \ \ \ \
| | * | | | | more config comment updatesRichard van der Hoff2019-05-031-2/+5
| | * | | | | Blacklist 0.0.0.0 and :: by default for URL previewsRichard van der Hoff2019-05-031-10/+18
| * | | | | | Merge pull request #5133 from matrix-org/rav/systemrandomRichard van der Hoff2019-05-031-2/+7
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-03 05:16:16 +0000