Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | remove background updates that arent needed | Amber H. Brown | 2019-06-07 | 1 | -33/+1 | |
| * | | | | add more comments | Amber Brown | 2019-06-06 | 1 | -0/+5 | |
| * | | | | Merge remote-tracking branch 'origin/develop' into hawkowl/full-schema-v1 | Amber Brown | 2019-06-04 | 39 | -323/+294 | |
| |\ \ \ \ | ||||||
| * | | | | | add stuff in bg updates | Amber Brown | 2019-06-04 | 1 | -10/+62 | |
| * | | | | | WHY IS THIS CALLED A SLIGHTLY DIFFERENT THING | Amber Brown | 2019-06-03 | 1 | -0/+1 | |
| * | | | | | more fix | Amber Brown | 2019-06-03 | 1 | -0/+38 | |
| * | | | | | fix schemas | Amber Brown | 2019-06-03 | 4 | -61/+20 | |
| * | | | | | full schema | Amber Brown | 2019-06-03 | 3 | -0/+2315 | |
| * | | | | | prepare | Amber Brown | 2019-06-03 | 1 | -2/+14 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Add ability to perform password reset via email without trusting the identity... | Andrew Morgan | 2019-06-06 | 17 | -60/+871 | |
* | | | | | Stop hardcoding trust of old matrix.org key (#5374) | Richard van der Hoff | 2019-06-06 | 2 | -74/+226 | |
* | | | | | Fix missing logcontext for PresenceHandler.on_shutdown. (#5369) | Richard van der Hoff | 2019-06-06 | 1 | -1/+7 | |
* | | | | | Merge pull request #5221 from matrix-org/erikj/fix_worker_sytest | Erik Johnston | 2019-06-06 | 1 | -1/+11 | |
|\ \ \ \ \ | ||||||
| * | | | | | Better words | Erik Johnston | 2019-06-06 | 1 | -1/+1 | |
| * | | | | | Fix get_max_topological_token to never return None | Erik Johnston | 2019-05-21 | 1 | -1/+11 | |
* | | | | | | Merge pull request #5089 from dnaf/m-heroes-empty-room-name | Brendan Abolivier | 2019-06-06 | 1 | -5/+4 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Simplify condition | Brendan Abolivier | 2019-06-06 | 1 | -2/+2 | |
| * | | | | | | Simplify condition | Brendan Abolivier | 2019-06-05 | 1 | -3/+2 | |
| * | | | | | | Merge branch 'develop' into m-heroes-empty-room-name | Brendan Abolivier | 2019-06-05 | 136 | -1945/+5896 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | Lint | Katie Wolfe | 2019-04-24 | 1 | -1/+1 | |
| * | | | | | | | Clean up code | Katie Wolfe | 2019-04-24 | 1 | -2/+3 | |
| * | | | | | | | Show heroes if room name or canonical alias are empty | Katie Wolfe | 2019-04-24 | 1 | -3/+4 | |
| * | | | | | | | Show heroes if room name or canonical alias are empty | Katie Wolfe | 2019-04-24 | 1 | -5/+3 | |
* | | | | | | | | Merge pull request #5359 from matrix-org/rav/enable_tls_verification | Richard van der Hoff | 2019-06-06 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'rav/fix_custom_ca' into rav/enable_tls_verification | Richard van der Hoff | 2019-06-05 | 7 | -22/+121 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Validate federation server TLS certificates by default. | Richard van der Hoff | 2019-06-05 | 1 | -5/+5 | |
* | | | | | | | | | | Merge pull request #5355 from matrix-org/babolivier/heroes_left_members | Brendan Abolivier | 2019-06-06 | 1 | -15/+19 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Do user_id != me checks before deciding whether we should pick heroes from th... | Brendan Abolivier | 2019-06-05 | 1 | -15/+19 | |
| | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #5354 from matrix-org/rav/server_keys/99-room-v5 | Richard van der Hoff | 2019-06-06 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Implement room v5 which enforces signing key validity | Richard van der Hoff | 2019-06-05 | 1 | -5/+5 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #5353 from matrix-org/rav/verify_key_logging | Richard van der Hoff | 2019-06-06 | 4 | -46/+76 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Associate a request_name with each verify request, for logging | Richard van der Hoff | 2019-06-05 | 4 | -46/+76 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Fix `federation_custom_ca_list` configuration option. | Richard van der Hoff | 2019-06-05 | 1 | -1/+1 | |
* | | | | | | | | | Neilj/add r0.5 to versions (#5360) | Neil Johnson | 2019-06-05 | 1 | -0/+1 | |
* | | | | | | | | | Fix background updates to handle redactions/rejections (#5352) | Erik Johnston | 2019-06-06 | 3 | -9/+57 | |
* | | | | | | | | | Merge pull request #5317 from matrix-org/erikj/make_do_auth_non_essential | Erik Johnston | 2019-06-05 | 1 | -12/+46 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Add logging when request fails and clarify we ignore errors. | Erik Johnston | 2019-06-05 | 1 | -4/+12 | |
| * | | | | | | | | | Fix handling of failures when calling /event_auth. | Erik Johnston | 2019-06-03 | 1 | -12/+38 | |
| | |_|_|_|/ / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Neilj/mau tracking config explainer (#5284) | Neil Johnson | 2019-06-05 | 1 | -0/+16 | |
| |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Add a test room version where we enforce key validity (#5348) | Richard van der Hoff | 2019-06-05 | 2 | -22/+37 | |
| |/ / / / / / |/| | | | | | | ||||||
* | | | | | | | Clean up debug logging (#5347) | Richard van der Hoff | 2019-06-05 | 3 | -8/+18 | |
* | | | | | | | Rename VerifyKeyRequest.deferred field (#5343) | Richard van der Hoff | 2019-06-05 | 1 | -12/+12 | |
* | | | | | | | Call RetryLimiter correctly (#5340) | Richard van der Hoff | 2019-06-04 | 1 | -1/+6 | |
* | | | | | | | Fix failure to fetch batches of PDUs (#5342) | Richard van der Hoff | 2019-06-04 | 1 | -0/+1 | |
* | | | | | | | Rename get_events->get_events_from_store_or_dest (#5344) | Richard van der Hoff | 2019-06-04 | 1 | -20/+13 | |
* | | | | | | | Merge pull request #5341 from matrix-org/babolivier/email_config | Brendan Abolivier | 2019-06-04 | 1 | -42/+57 | |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | ||||||
| * | | | | | | Only parse from email if provided | Brendan Abolivier | 2019-06-04 | 1 | -4/+5 | |
| * | | | | | | Lint | Brendan Abolivier | 2019-06-04 | 1 | -1/+0 | |
| * | | | | | | Make account validity renewal emails work when email notifs are disabled | Brendan Abolivier | 2019-06-04 | 1 | -42/+57 | |
* | | | | | | | Merge pull request #5324 from matrix-org/erikj/ignore_null | Erik Johnston | 2019-06-04 | 1 | -0/+16 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix | Erik Johnston | 2019-06-03 | 1 | -1/+2 | |
| * | | | | | | | Ignore room state with null bytes in for room stats | Erik Johnston | 2019-06-03 | 1 | -0/+15 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* | | | | | | | Avoid rapidly backing-off a server if we ignore the retry interval (#5335) | Richard van der Hoff | 2019-06-04 | 1 | -23/+37 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Avoid rapidly backing-off a server if we ignore the retry interval | Richard van der Hoff | 2019-06-03 | 1 | -23/+37 | |
* | | | | | | | | Don't do long retries when calling the key notary server. (#5334) | Richard van der Hoff | 2019-06-04 | 1 | -1/+0 | |
* | | | | | | | | Merge pull request #5333 from matrix-org/rav/server_keys/09_improve_notary_se... | Richard van der Hoff | 2019-06-04 | 2 | -33/+60 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Notary server: make requests to origins in parallel | Richard van der Hoff | 2019-06-04 | 2 | -11/+11 | |
| * | | | | | | | | Don't bomb out on direct key fetches as soon as one fails | Richard van der Hoff | 2019-06-04 | 1 | -22/+36 | |
| * | | | | | | | | Reduce timeout for outbound /key/v2/server requests. | Richard van der Hoff | 2019-06-03 | 1 | -0/+13 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Improve docstrings on MatrixFederationClient. (#5332) | Richard van der Hoff | 2019-06-04 | 1 | -16/+55 | |
* | | | | | | | | Hawkowl/fix missing auth (#5328) | Amber Brown | 2019-06-04 | 1 | -0/+1 | |
|/ / / / / / / | ||||||
* / / / / / / | Enforce validity period on server_keys for fed requests. (#5321) | Richard van der Hoff | 2019-06-03 | 4 | -61/+119 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #5307 from matrix-org/rav/server_keys/07-fix-notary-cache-... | Richard van der Hoff | 2019-06-03 | 1 | -12/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Stop overwriting server keys with other keys | Richard van der Hoff | 2019-05-31 | 1 | -12/+2 | |
* | | | | | | | Unify v1 and v2 REST client APIs (#5226) | Amber Brown | 2019-06-03 | 38 | -311/+292 | |
| |_|/ / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #5309 from matrix-org/rav/limit_displayname_length | Richard van der Hoff | 2019-06-01 | 2 | -0/+15 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Limit displaynames and avatar URLs | Richard van der Hoff | 2019-06-01 | 2 | -0/+15 | |
* | | | | | | | Merge pull request #5299 from matrix-org/rav/server_keys/05-rewrite-gsvk-again | Richard van der Hoff | 2019-05-31 | 1 | -48/+53 | |
|\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'origin/develop' into rav/server_keys/05-rewrite... | Richard van der Hoff | 2019-05-31 | 6 | -128/+141 | |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| * | | | | | | | Rewrite get_server_verify_keys, again. | Richard van der Hoff | 2019-05-30 | 1 | -48/+53 | |
* | | | | | | | | Merge pull request #5276 from matrix-org/babolivier/account_validity_job_delta | Erik Johnston | 2019-05-31 | 2 | -3/+25 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Move delta from +10% to -10% | Brendan Abolivier | 2019-05-31 | 2 | -3/+3 | |
| * | | | | | | | Gah python | Brendan Abolivier | 2019-05-31 | 1 | -1/+1 | |
| * | | | | | | | Make max_delta equal to period * 10% | Brendan Abolivier | 2019-05-31 | 2 | -15/+7 | |
| * | | | | | | | Allow configuring a range for the account validity startup job | Brendan Abolivier | 2019-05-28 | 2 | -2/+32 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #5300 from matrix-org/rav/server_keys/06-fix-serverkeys-ha... | Richard van der Hoff | 2019-05-31 | 1 | -25/+8 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Remove some pointless exception handling | Richard van der Hoff | 2019-05-30 | 1 | -25/+8 | |
* | | | | | | | | Merge pull request #5296 from matrix-org/rav/server_keys/04-use-attrs-for_ver... | Richard van der Hoff | 2019-05-31 | 1 | -17/+21 | |
|\| | | | | | | | ||||||
| * | | | | | | | use attr.s for VerifyKeyRequest | Richard van der Hoff | 2019-05-30 | 1 | -17/+21 | |
* | | | | | | | | Merge pull request #5293 from Kagamihime/messages-federation-format | Erik Johnston | 2019-05-31 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix ignored filter field in `/messages` endpoint | Eisha Chen-yen-su | 2019-05-30 | 1 | -0/+2 | |
* | | | | | | | | | Merge pull request #5294 from matrix-org/erikj/speed_up_room_stats | Erik Johnston | 2019-05-31 | 4 | -87/+111 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Add indices. Remove room_ids accidentally added | Erik Johnston | 2019-05-31 | 2 | -13/+56 | |
| * | | | | | | | | Join against events to use its room_id index | Erik Johnston | 2019-05-30 | 1 | -1/+6 | |
| * | | | | | | | | Move deletion from table inside txn | Erik Johnston | 2019-05-30 | 1 | -2/+5 | |
| * | | | | | | | | Fetch membership counts all at once | Erik Johnston | 2019-05-30 | 2 | -38/+18 | |
| * | | | | | | | | Get events all at once | Erik Johnston | 2019-05-30 | 1 | -33/+26 | |
* | | | | | | | | | Merge branch 'master' into develop | Erik Johnston | 2019-05-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | 0.99.5.2 v0.99.5.2 github/release-v0.99.5 release-v0.99.5 | Erik Johnston | 2019-05-30 | 1 | -1/+1 | |
| * | | | | | | | | Add index to temp table | Erik Johnston | 2019-05-30 | 1 | -0/+1 | |
| * | | | | | | | | Update synapse/storage/events_bg_updates.py | Erik Johnston | 2019-05-30 | 1 | -1/+1 | |
| * | | | | | | | | Rename constant | Erik Johnston | 2019-05-30 | 1 | -3/+3 | |
| * | | | | | | | | Move event background updates to a separate file | Erik Johnston | 2019-05-30 | 3 | -369/+405 | |
| * | | | | | | | | Fixup comments and logging | Erik Johnston | 2019-05-30 | 2 | -9/+15 | |
| * | | | | | | | | Log actual number of entries deleted | Erik Johnston | 2019-05-30 | 2 | -5/+13 | |
| * | | | | | | | | Add DB bg update to cleanup extremities. | Erik Johnston | 2019-05-30 | 2 | -0/+205 | |
| * | | | | | | | | Correctly filter out extremities with soft failed prevs (#5274) | Erik Johnston | 2019-05-30 | 1 | -3/+79 | |
* | | | | | | | | | Add index to temp table | Erik Johnston | 2019-05-30 | 1 | -0/+1 | |
| |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #5278 from matrix-org/erikj/cleanup_bad_extremities | Erik Johnston | 2019-05-30 | 5 | -181/+436 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Update synapse/storage/events_bg_updates.py | Erik Johnston | 2019-05-30 | 1 | -1/+1 | |
| * | | | | | | | | Rename constant | Erik Johnston | 2019-05-30 | 1 | -3/+3 | |
| * | | | | | | | | Move event background updates to a separate file | Erik Johnston | 2019-05-30 | 3 | -369/+405 | |
| * | | | | | | | | Fixup comments and logging | Erik Johnston | 2019-05-30 | 2 | -9/+15 | |
| * | | | | | | | | Log actual number of entries deleted | Erik Johnston | 2019-05-29 | 2 | -5/+13 | |
| * | | | | | | | | Add DB bg update to cleanup extremities. | Erik Johnston | 2019-05-29 | 2 | -0/+205 | |
* | | | | | | | | | Merge pull request #5256 from aaronraimist/logout-correct-error | Erik Johnston | 2019-05-30 | 1 | -18/+9 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Lint | Aaron Raimist | 2019-05-29 | 1 | -2/+0 | |
| * | | | | | | | | | Get rid of try except | Aaron Raimist | 2019-05-27 | 1 | -16/+9 | |
| * | | | | | | | | | Show correct error when logging out and access token is missing | Aaron Raimist | 2019-05-24 | 1 | -4/+4 | |
* | | | | | | | | | | Remove spurious debug from MatrixFederationHttpClient.get_json (#5287) v0.99.5.1.dev0 | Richard van der Hoff | 2019-05-29 | 1 | -4/+0 | |
* | | | | | | | | | | Improve logging for logcontext leaks. (#5288) | Richard van der Hoff | 2019-05-29 | 1 | -9/+13 | |
* | | | | | | | | | | Implement the SHHS complexity API (#5216) | Amber Brown | 2019-05-30 | 4 | -5/+89 | |
* | | | | | | | | | | Serve CAS login over r0 (#5286) | Amber Brown | 2019-05-30 | 1 | -2/+2 | |
* | | | | | | | | | | Fix error when downloading thumbnail with width/height param missing (#5258) | Aaron Raimist | 2019-05-29 | 1 | -2/+2 | |
| |/ / / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Correctly filter out extremities with soft failed prevs (#5274) | Erik Johnston | 2019-05-29 | 1 | -3/+79 | |
| |_|/ / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Fix dropped logcontexts during high outbound traffic. (#5277) | Richard van der Hoff | 2019-05-29 | 1 | -7/+13 | |
* | | | | | | | | Fix docs on resetting the user directory (#5036) | Aaron Raimist | 2019-05-28 | 1 | -3/+3 | |
* | | | | | | | | Merge pull request #5251 from matrix-org/rav/server_keys/01-check_sig | Richard van der Hoff | 2019-05-28 | 1 | -41/+92 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Improve error handling/logging for perspectives-key fetching. | Richard van der Hoff | 2019-05-24 | 1 | -28/+77 | |
| * | | | | | | | | Require sig from origin server on perspectives responses | Richard van der Hoff | 2019-05-23 | 1 | -13/+15 | |
* | | | | | | | | | Fix "db txn 'update_presence' from sentinel context" log messages (#5275) | Richard van der Hoff | 2019-05-28 | 1 | -52/+47 | |
* | | | | | | | | | Merge pull request #5268 from matrix-org/babolivier/account_validity_fix_schema | Brendan Abolivier | 2019-05-28 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | Fix schema update for account validity | Brendan Abolivier | 2019-05-28 | 1 | -0/+3 | |
* | | | | | | | | | Merge pull request #5260 from matrix-org/travis/fix-room-bg-task | Erik Johnston | 2019-05-25 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix logging for room stats background update | Travis Ralston | 2019-05-25 | 1 | -1/+1 | |
* | | | | | | | | | | Merge pull request #5257 from aaronraimist/fix-error-code-publicrooms | Erik Johnston | 2019-05-25 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix error code for invalid parameter | Aaron Raimist | 2019-05-24 | 1 | -1/+1 | |
| | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
* / | | | | | | | | | Simplification to Keyring.wait_for_previous_lookups. (#5250) | Richard van der Hoff | 2019-05-24 | 1 | -7/+4 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Fix appservice timestamp massaging (#5233) | Tulir Asokan | 2019-05-24 | 1 | -1/+6 | |
* | | | | | | | | | Add missing blank line in config (#5249) | Richard van der Hoff | 2019-05-24 | 1 | -0/+1 | |
* | | | | | | | | | Merge pull request #5220 from matrix-org/erikj/dont_bundle_live_events | Erik Johnston | 2019-05-24 | 4 | -2/+12 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Don't bundle aggs for /state and /members etc APIs | Erik Johnston | 2019-05-24 | 1 | -0/+3 | |
| * | | | | | | | | Don't bundle events in /sync or /events | Erik Johnston | 2019-05-21 | 3 | -2/+9 | |
| | |_|_|_|_|/ / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #5244 from matrix-org/rav/server_keys/00-factor-out-fetchers | Erik Johnston | 2019-05-23 | 2 | -143/+178 | |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | ||||||
| * | | | | | | | Fix remote_key_resource | Richard van der Hoff | 2019-05-23 | 1 | -3/+3 | |
| * | | | | | | | Factor out KeyFetchers from KeyRing | Richard van der Hoff | 2019-05-23 | 1 | -140/+175 | |
* | | | | | | | | Add config option for setting homeserver's default room version (#5223) | Andrew Morgan | 2019-05-23 | 4 | -8/+42 | |
|/ / / / / / / | ||||||
* | | | | | | | Store key validity time in the storage layer | Richard van der Hoff | 2019-05-23 | 3 | -24/+77 | |
* | | | | | | | Simplify process_v2_response (#5236) | Richard van der Hoff | 2019-05-23 | 1 | -21/+29 | |
* | | | | | | | Remove unused VerifyKey.expired and .time_added fields (#5235) | Richard van der Hoff | 2019-05-23 | 1 | -3/+0 | |
* | | | | | | | Rewrite store_server_verify_key to store several keys at once (#5234) | Richard van der Hoff | 2019-05-23 | 2 | -71/+53 | |
* | | | | | | | Simplifications and comments in do_auth (#5227) | Richard van der Hoff | 2019-05-23 | 2 | -121/+182 | |
* | | | | | | | Run black on synapse.crypto.keyring (#5232) | Richard van der Hoff | 2019-05-22 | 1 | -149/+137 | |
* | | | | | | | Merge branch 'master' into develop | Neil Johnson | 2019-05-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | ||||||
| * | | | | | | 0.99.5.1 v0.99.5.1 | Neil Johnson | 2019-05-22 | 1 | -1/+1 | |
| * | | | | | | Revert "0.99.5" | Neil Johnson | 2019-05-22 | 1 | -1/+1 | |
| * | | | | | | 0.99.5 | Neil Johnson | 2019-05-22 | 1 | -1/+1 | |
* | | | | | | | remove urllib3 pin (#5230) | Marcus Hoffmann | 2019-05-22 | 1 | -8/+0 | |
* | | | | | | | Merge branch 'master' into develop | Neil Johnson | 2019-05-22 | 1 | -1/+1 | |
|\| | | | | | | ||||||
| * | | | | | | 0.99.5 v0.99.5 | Neil Johnson | 2019-05-22 | 1 | -1/+1 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Neilj/ensure get profileinfo available in client reader slaved store (#5213) | Neil Johnson | 2019-05-22 | 1 | -0/+2 | |
* | | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2019-05-22 | 1 | -1/+1 | |
|\| | | | | | ||||||
| * | | | | | Merge commit 'f4c80d70f' into release-v0.99.5 | Richard van der Hoff | 2019-05-21 | 2 | -5/+61 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | 0.99.5rc1 | Richard van der Hoff | 2019-05-21 | 1 | -1/+1 | |
* | | | | | | | Room Statistics (#4338) | Amber Brown | 2019-05-21 | 11 | -13/+1021 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #5203 from matrix-org/erikj/aggregate_by_sender | Erik Johnston | 2019-05-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Only count aggregations from distinct senders | Erik Johnston | 2019-05-17 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #5212 from matrix-org/erikj/deny_multiple_reactions | Erik Johnston | 2019-05-21 | 2 | -4/+60 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Fix words | Erik Johnston | 2019-05-21 | 1 | -3/+3 | |
| * | | | | | | Block attempts to annotate the same event twice | Erik Johnston | 2019-05-20 | 2 | -4/+60 | |
* | | | | | | | Introduce room v4 which updates event ID format. (#5217) | Richard van der Hoff | 2019-05-21 | 1 | -4/+4 | |
* | | | | | | | Exclude soft-failed events from fwd-extremity candidates. (#5146) | Richard van der Hoff | 2019-05-21 | 2 | -3/+13 | |
* | | | | | | | Pin eliot to <1.8 on python 3.5.2 (#5218) | Richard van der Hoff | 2019-05-21 | 1 | -6/+34 | |
* | | | | | | | Merge pull request #5204 from matrix-org/babolivier/account_validity_expirati... | Brendan Abolivier | 2019-05-21 | 3 | -12/+70 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | / / / | | |_|/ / / | |/| | | | | ||||||
| * | | | | | Doc | Brendan Abolivier | 2019-05-21 | 1 | -0/+8 | |
| * | | | | | Do the select and insert in a single transaction | Brendan Abolivier | 2019-05-21 | 1 | -10/+6 | |
| * | | | | | Add startup background job for account validity | Brendan Abolivier | 2019-05-17 | 2 | -12/+66 | |
* | | | | | | Fix error handling for rooms whose versions are unknown. (#5219) | Richard van der Hoff | 2019-05-21 | 4 | -7/+37 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Revert "expose SlavedProfileStore to ClientReaderSlavedStore (#5200)" | Richard van der Hoff | 2019-05-20 | 1 | -2/+0 | |
* | | | | | Add a test room version which updates event ID format (#5210) | Richard van der Hoff | 2019-05-20 | 2 | -3/+33 | |
* | | | | | Rename relation types to match MSC | Erik Johnston | 2019-05-20 | 3 | -9/+9 | |
* | | | | | Merge pull request #5209 from matrix-org/erikj/reactions_base | Erik Johnston | 2019-05-20 | 12 | -16/+899 | |
|\ \ \ \ \ | ||||||
| * | | | | | Correctly update aggregation counts after redaction | Erik Johnston | 2019-05-20 | 2 | -0/+20 | |
| | |/ / / | |/| | | | ||||||
| * | | | | Fixup bsaed on review comments | Erik Johnston | 2019-05-17 | 3 | -19/+19 | |
| * | | | | Add basic editing support | Erik Johnston | 2019-05-16 | 3 | -6/+85 | |
| * | | | | Move parsing of tokens out of storage layer | Erik Johnston | 2019-05-16 | 2 | -14/+21 | |
| * | | | | Indirect tuple conversion | Erik Johnston | 2019-05-16 | 1 | -0/+6 | |
| * | | | | Check that event is visible in new APIs | Erik Johnston | 2019-05-16 | 1 | -2/+15 | |
| * | | | | Fix relations in worker mode | Erik Johnston | 2019-05-16 | 5 | -13/+28 | |
| * | | | | Add cache to relations | Erik Johnston | 2019-05-16 | 1 | -0/+8 | |
| * | | | | Add aggregations API | Erik Johnston | 2019-05-16 | 4 | -10/+395 | |
| * | | | | Actually check for None rather falsey | Erik Johnston | 2019-05-15 | 1 | -2/+2 | |
| * | | | | Actually implement idempotency | Erik Johnston | 2019-05-15 | 1 | -1/+8 | |
| * | | | | Add simple pagination API | Erik Johnston | 2019-05-15 | 2 | -0/+130 | |
| * | | | | Add simple send_relation API and track in DB | Erik Johnston | 2019-05-15 | 7 | -0/+213 | |
* | | | | | Limit UserIds to a length that fits in a state key (#5198) | ReidAnderson | 2019-05-20 | 2 | -1/+13 | |
* | | | | | fix mapping of return values for get_or_register_3pid_guest (#5177) | bytepoets-blo | 2019-05-17 | 1 | -1/+1 | |
* | | | | | Merge pull request #5191 from matrix-org/erikj/refactor_pagination_bounds | Erik Johnston | 2019-05-17 | 1 | -61/+133 | |
|\ \ \ \ \ | ||||||
| * | | | | | Spelling and clarifications | Erik Johnston | 2019-05-17 | 1 | -5/+9 | |
| * | | | | | Update docstring | Erik Johnston | 2019-05-16 | 1 | -1/+12 | |
| |/ / / / | ||||||
| * | | | | Make generating SQL bounds for pagination generic | Erik Johnston | 2019-05-15 | 1 | -61/+118 | |
* | | | | | expose SlavedProfileStore to ClientReaderSlavedStore (#5200) | Neil Johnson | 2019-05-17 | 1 | -0/+2 | |
* | | | | | Merge pull request #5196 from matrix-org/babolivier/per_room_profiles | Brendan Abolivier | 2019-05-17 | 2 | -0/+20 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Add option to disable per-room profiles | Brendan Abolivier | 2019-05-16 | 2 | -0/+20 | |
* | | | | | Fix image orientation when generating thumbnail (#5039) | PauRE | 2019-05-16 | 3 | -1/+45 | |
* | | | | | Merge pull request #5174 from matrix-org/dbkr/add_dummy_flow_to_recaptcha_only | David Baker | 2019-05-16 | 1 | -5/+17 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Merge remote-tracking branch 'origin/develop' into dbkr/add_dummy_flow_to_rec... | David Baker | 2019-05-13 | 1 | -1/+0 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge remote-tracking branch 'origin/develop' into dbkr/add_dummy_flow_to_rec... | David Baker | 2019-05-13 | 2 | -20/+35 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Re-order flows so that email auth is done last | David Baker | 2019-05-10 | 1 | -4/+12 | |
| * | | | | | | Comment | David Baker | 2019-05-10 | 1 | -0/+4 | |
| * | | | | | | Add a DUMMY stage to captcha-only registration flow | David Baker | 2019-05-10 | 1 | -1/+1 | |
* | | | | | | | Make /sync attempt to return device updates for both joined and invited users... | Matthew Hodgson | 2019-05-16 | 1 | -19/+25 | |
* | | | | | | | Merge pull request #5187 from matrix-org/dbkr/only_check_threepid_not_in_use_... | David Baker | 2019-05-16 | 1 | -18/+22 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Only check 3pids not in use when registering | David Baker | 2019-05-14 | 1 | -18/+22 | |
* | | | | | | | | Make all the rate limiting options more consistent (#5181) | Amber Brown | 2019-05-15 | 5 | -91/+104 | |
* | | | | | | | | Drop support for v2_alpha API prefix (#5190) | Richard van der Hoff | 2019-05-15 | 7 | -26/+20 | |
* | | | | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2019-05-15 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | ||||||
| * | | | | | | | 0.99.4 | Richard van der Hoff | 2019-05-15 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #5183 from matrix-org/erikj/async_serialize_event | Erik Johnston | 2019-05-15 | 12 | -101/+193 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Update docstring with correct return type | Erik Johnston | 2019-05-15 | 1 | -1/+1 | |
| * | | | | | | | | Newsfile | Erik Johnston | 2019-05-14 | 1 | -6/+6 | |
| * | | | | | | | | Allow client event serialization to be async | Erik Johnston | 2019-05-14 | 12 | -95/+187 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #5184 from matrix-org/erikj/expose_get_events_as_array | Erik Johnston | 2019-05-15 | 5 | -29/+53 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Update docstring with correct type | Erik Johnston | 2019-05-15 | 1 | -1/+1 | |
| * | | | | | | | | Expose DataStore._get_events as get_events_as_list | Erik Johnston | 2019-05-14 | 5 | -29/+53 | |
| |/ / / / / / / | ||||||
* / / / / / / / | comment about user_joined_room | Richard van der Hoff | 2019-05-14 | 1 | -0/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Migrate all tests to use the dict-based config format instead of hanging item... | Amber Brown | 2019-05-13 | 1 | -0/+1 | |
* | | | | | | | Add ability to blacklist ip ranges for federation traffic (#5043) | Andrew Morgan | 2019-05-13 | 3 | -14/+78 | |
|/ / / / / / | ||||||
* | | / / / | 0.99.4rc1 v0.99.4rc1 | Brendan Abolivier | 2019-05-13 | 1 | -1/+1 | |
| |_|/ / / |/| | | | | ||||||
* | | | | | Fix CI after new release of isort | Brendan Abolivier | 2019-05-13 | 1 | -1/+0 | |
| |/ / / |/| | | | ||||||
* | | | | URL preview blacklisting fixes (#5155) | Andrew Morgan | 2019-05-10 | 2 | -20/+35 | |
|/ / / | ||||||
* | | | Revert 085ae346ace418e0fc043ac5f568f85ebf80038e | David Baker | 2019-05-10 | 1 | -1/+1 | |
* | | | Add a DUMMY stage to captcha-only registration flow | David Baker | 2019-05-10 | 1 | -1/+1 | |
* | | | Run `black` on per_destination_queue | Richard van der Hoff | 2019-05-09 | 1 | -35/+39 | |
* | | | Limit the number of EDUs in transactions to 100 as expected by receiver (#5138) | Quentin Dufour | 2019-05-09 | 2 | -27/+31 | |
* | | | add options to require an access_token to GET /profile and /publicRooms on CS... | Matthew Hodgson | 2019-05-08 | 5 | -12/+114 | |
* | | | Merge pull request #5037 from matrix-org/erikj/limit_inflight_dns | Erik Johnston | 2019-05-08 | 1 | -1/+82 | |
|\ \ \ | ||||||
| * | | | Limit in flight DNS requests | Erik Johnston | 2019-04-09 | 1 | -1/+82 | |
* | | | | Do checks on aliases for incoming m.room.aliases events (#5128) | Brendan Abolivier | 2019-05-08 | 5 | -8/+55 | |
* | | | | Merge pull request #5104 from matrix-org/erikj/ratelimit_3pid_invite | Erik Johnston | 2019-05-07 | 1 | -0/+11 | |
|\ \ \ \ | ||||||
| * | | | | Rate limit early | Erik Johnston | 2019-05-02 | 1 | -2/+3 | |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ratelimit_... | Erik Johnston | 2019-04-26 | 63 | -959/+1158 | |
| |\ \ \ \ | ||||||
| * | | | | | Ratelimit 3pid invites | Erik Johnston | 2019-04-26 | 1 | -0/+10 | |
* | | | | | | Remove the requirement to authenticate for /admin/server_version. (#5122) | Richard van der Hoff | 2019-05-07 | 1 | -10/+5 | |
* | | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2019-05-03 | 4 | -13/+37 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | 0.99.3.2 v0.99.3.2 github/release-v0.99.3.2 release-v0.99.3.2 | Richard van der Hoff | 2019-05-03 | 1 | -1/+1 | |
| * | | | | | | pin urllib3 to <1.25 | Richard van der Hoff | 2019-05-03 | 1 | -0/+8 | |
| * | | | | | | 0.99.3.1 | Richard van der Hoff | 2019-05-03 | 1 | -1/+1 | |
| * | | | | | | Merge pull request #5134 from matrix-org/rav/url_preview_blacklist | Richard van der Hoff | 2019-05-03 | 1 | -10/+21 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | more config comment updates | Richard van der Hoff | 2019-05-03 | 1 | -2/+5 | |
| | * | | | | | | Blacklist 0.0.0.0 and :: by default for URL previews | Richard van der Hoff | 2019-05-03 | 1 | -10/+18 | |
| * | | | | | | | Merge pull request #5133 from matrix-org/rav/systemrandom | Richard van der Hoff | 2019-05-03 | 1 | -2/+7 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| | * | | | | | | Use SystemRandom for token generation | Richard van der Hoff | 2019-05-03 | 1 | -2/+7 | |
* | | | | | | | | Add admin api for sending server_notices (#5121) | Richard van der Hoff | 2019-05-02 | 3 | -3/+118 | |
* | | | | | | | | Merge pull request #5124 from matrix-org/babolivier/aliases | Brendan Abolivier | 2019-05-02 | 3 | -2/+34 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add some limitations to alias creation | Brendan Abolivier | 2019-05-02 | 3 | -2/+34 | |
* | | | | | | | | | Factor out an "assert_requester_is_admin" function (#5120) | Richard van der Hoff | 2019-05-02 | 3 | -76/+80 | |
* | | | | | | | | | fix examples | Richard van der Hoff | 2019-05-01 | 1 | -4/+4 | |
* | | | | | | | | | Move admin api impl to its own package | Richard van der Hoff | 2019-05-01 | 3 | -5/+4 | |
* | | | | | | | | | Move admin API to a new prefix | Richard van der Hoff | 2019-05-01 | 4 | -24/+64 |