Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | Merge pull request #5001 from matrix-org/rav/keyring_cleanups | Richard van der Hoff | 2019-04-08 | 2 | -33/+50 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Hoist server_name check out of process_v2_response | Richard van der Hoff | 2019-04-04 | 1 | -13/+7 | |
| | * | | | | | | Clean up Keyring.process_v2_response | Richard van der Hoff | 2019-04-04 | 1 | -23/+46 | |
| | * | | | | | | Fix docstring on get_server_keys_json | Richard van der Hoff | 2019-04-04 | 1 | -2/+2 | |
| * | | | | | | | Add config option to block users from looking up 3PIDs (#5010) | Brendan Abolivier | 2019-04-04 | 2 | -0/+10 | |
| | |_|/ / / / | |/| | | | | | ||||||
| * | | | | | | Clean up the database pagination code (#5007) | Amber Brown | 2019-04-05 | 2 | -67/+63 | |
| * | | | | | | Merge pull request #5002 from matrix-org/erikj/delete_group | Erik Johnston | 2019-04-04 | 3 | -0/+136 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Add admin API for group deletion | Erik Johnston | 2019-04-03 | 1 | -0/+26 | |
| | * | | | | | | Add functions to delete a group | Erik Johnston | 2019-04-03 | 2 | -0/+110 | |
| * | | | | | | | Prevent kicking users who aren't in the room (#4999) | Andrew Morgan | 2019-04-04 | 1 | -0/+9 | |
| * | | | | | | | Avoid redundant URL encoding (#4555) | Marcel Krüger | 2019-04-04 | 1 | -1/+1 | |
| |/ / / / / / | ||||||
| * / / / / / | Fix grammar and document get_current_users_in_room (#4998) | Andrew Morgan | 2019-04-03 | 11 | -18/+29 | |
| |/ / / / / | ||||||
| * | | | | | Remove presence lists (#4989) | Neil Johnson | 2019-04-03 | 7 | -338/+22 | |
| * | | | | | Merge pull request #4982 from matrix-org/erikj/msc1915 | Erik Johnston | 2019-04-03 | 6 | -17/+215 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Correctly handle id_server param | Erik Johnston | 2019-04-02 | 1 | -0/+1 | |
| | * | | | | | Remove threepid binding if id server returns 400/404/501 | Erik Johnston | 2019-04-02 | 1 | -9/+10 | |
| | * | | | | | Fixup docstrings | Erik Johnston | 2019-04-02 | 3 | -7/+9 | |
| | * | | | | | Add unbind API to /r0 as it is now stabalised | Erik Johnston | 2019-04-01 | 1 | -1/+1 | |
| | * | | | | | Grandfather in existing user threepids | Erik Johnston | 2019-04-01 | 2 | -0/+37 | |
| | * | | | | | Allowing specifying IS to use in unbind API. | Erik Johnston | 2019-04-01 | 4 | -8/+20 | |
| | * | | | | | For unbind poke IS used during binding of 3PID | Erik Johnston | 2019-04-01 | 1 | -9/+35 | |
| | * | | | | | Track IS used to bind 3PIDs | Erik Johnston | 2019-04-01 | 3 | -0/+119 | |
| * | | | | | | Run black on the rest of the storage module (#4996) | Amber Brown | 2019-04-03 | 41 | -2455/+2130 | |
| * | | | | | | Merge pull request #4991 from matrix-org/erikj/stagger_push_startup | Erik Johnston | 2019-04-02 | 4 | -8/+73 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Make starting pushers faster during start up | Erik Johnston | 2019-04-02 | 4 | -8/+73 | |
| * | | | | | | | Transfer related groups on room upgrade (#4990) | Andrew Morgan | 2019-04-02 | 2 | -0/+2 | |
| * | | | | | | | Add config.signing_key_path. (#4974) | Richard van der Hoff | 2019-04-02 | 1 | -1/+2 | |
| |/ / / / / / | ||||||
| * | | | | | | Fix sync bug when accepting invites (#4956) | Richard van der Hoff | 2019-04-02 | 3 | -20/+40 | |
| * | | | | | | Merge branch 'master' into develop | Neil Johnson | 2019-04-01 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | ||||||
| * | | | | | | Collect room-version variations into one place (#4969) | Richard van der Hoff | 2019-04-01 | 18 | -142/+188 | |
| | |/ / / / | |/| | | | | ||||||
| * | | | | | Merge pull request #4955 from matrix-org/rav/merge_state_into_events | Richard van der Hoff | 2019-03-28 | 8 | -49/+140 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Combine the CurrentStateDeltaStream into the EventStream | Richard van der Hoff | 2019-03-27 | 5 | -33/+43 | |
| | * | | | | | Make EventStream rows have a type | Richard van der Hoff | 2019-03-27 | 4 | -17/+98 | |
| * | | | | | | Merge pull request #4954 from matrix-org/rav/refactor_parse_row | Richard van der Hoff | 2019-03-28 | 3 | -5/+21 | |
| |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge remote-tracking branch 'origin/develop' into rav/refactor_parse_row | Richard van der Hoff | 2019-03-28 | 2 | -380/+335 | |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| | * | | | | | | Skip building a ROW_TYPE when building updates | Richard van der Hoff | 2019-03-27 | 1 | -2/+2 | |
| | * | | | | | | Add parse_row method to replication stream class | Richard van der Hoff | 2019-03-27 | 3 | -3/+19 | |
| * | | | | | | | remove log line for password (#4965) | Neil Johnson | 2019-03-28 | 1 | -2/+0 | |
| * | | | | | | | Allow password providers to bind emails (#4947) | Andrew Morgan | 2019-03-28 | 2 | -4/+22 | |
| * | | | | | | | Merge pull request #4942 from matrix-org/erikj/fix_presence | Erik Johnston | 2019-03-28 | 3 | -32/+236 | |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | ||||||
| | * | | | | | | Use an assert | Erik Johnston | 2019-03-28 | 1 | -2/+1 | |
| | * | | | | | | Review comments | Erik Johnston | 2019-03-28 | 1 | -44/+62 | |
| | * | | | | | | Use event streams to calculate presence | Erik Johnston | 2019-03-27 | 3 | -32/+219 | |
| * | | | | | | | Merge pull request #4953 from matrix-org/rav/refactor_replication_streams | Richard van der Hoff | 2019-03-28 | 6 | -76/+133 | |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| | * | | | | | | move FederationStream out to its own file | Richard van der Hoff | 2019-03-27 | 4 | -23/+43 | |
| | * | | | | | | move EventsStream out to its own file | Richard van der Hoff | 2019-03-27 | 3 | -23/+42 | |
| | * | | | | | | Move replication.tcp.streams into a package | Richard van der Hoff | 2019-03-27 | 3 | -34/+52 | |
| * | | | | | | | Run `black` on some storage modules that the stats branch touches (#4959) | Amber Brown | 2019-03-29 | 2 | -380/+335 | |
| |/ / / / / / | ||||||
| * / / / / / | Fix/improve some docstrings in the replication code. (#4949) | Richard van der Hoff | 2019-03-27 | 2 | -7/+19 | |
| |/ / / / / | ||||||
* | | | / / | Add management endpoints for account validity | Brendan Abolivier | 2019-04-17 | 5 | -18/+116 | |
| |_|_|/ / |/| | | | | ||||||
* | | | | | Send out emails with links to extend an account's validity period | Brendan Abolivier | 2019-04-17 | 14 | -39/+573 | |
| |_|/ / |/| | | | ||||||
* | | | | Add account expiration feature | Brendan Abolivier | 2019-04-09 | 6 | -1/+85 | |
| |/ / |/| | | ||||||
* | | | 0.99.3 v0.99.3 github/release-v0.99.3 release-v0.99.3 | Neil Johnson | 2019-04-01 | 1 | -1/+1 | |
* | | | bump version | Neil Johnson | 2019-03-27 | 1 | -1/+1 | |
|/ / | ||||||
* | | Support 3PID login in password providers (#4931) | Andrew Morgan | 2019-03-26 | 6 | -26/+122 | |
* | | Use the state event amount for userdir import batching, not room count (#4944) | Amber Brown | 2019-03-27 | 1 | -8/+20 | |
* | | Make federation endpoints more tolerant of trailing slashes v2 (#4935) | Andrew Morgan | 2019-03-26 | 3 | -8/+9 | |
* | | Fix ClientReplicationStreamProtocol.__str__ (#4929) | Richard van der Hoff | 2019-03-25 | 2 | -4/+5 | |
* | | Fix bug where read-receipts lost their timestamps (#4927) | Richard van der Hoff | 2019-03-25 | 3 | -12/+30 | |
* | | Refactor out state delta handling into its own class (#4917) | Amber Brown | 2019-03-25 | 4 | -110/+151 | |
* | | Merge pull request #4869 from matrix-org/erikj/yaml_load | Erik Johnston | 2019-03-22 | 3 | -5/+5 | |
|\ \ | ||||||
| * | | Use yaml safe_load | Erik Johnston | 2019-03-22 | 3 | -5/+5 | |
* | | | Remove trailing slashes from outbound federation requests and retry on 400 (#... | Andrew Morgan | 2019-03-21 | 2 | -17/+89 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Clean up backoff_on_404 and metehod calls | Andrew Morgan | 2019-03-21 | 1 | -9/+13 | |
| * | | kwargs doesn't like commas on calling funcs either. TIL | Andrew Morgan | 2019-03-20 | 1 | -2/+2 | |
| * | | lint | Andrew Morgan | 2019-03-20 | 1 | -2/+6 | |
| * | | New test, fix issues | Andrew Morgan | 2019-03-20 | 1 | -49/+28 | |
| * | | Fix comments. v0.99.2 -> v0.99.3 | Andrew Morgan | 2019-03-20 | 1 | -5/+5 | |
| * | | Just return if not doing any trailing slash shennanigans | Andrew Morgan | 2019-03-20 | 1 | -0/+2 | |
| * | | lint | Andrew Morgan | 2019-03-18 | 1 | -1/+1 | |
| * | | Better exception handling | Andrew Morgan | 2019-03-18 | 1 | -16/+17 | |
| * | | Correct var name | Andrew Morgan | 2019-03-13 | 1 | -2/+2 | |
| * | | receiving a 400 caused an exception. handle it | Andrew Morgan | 2019-03-13 | 1 | -5/+12 | |
| * | | is this what purgatory feels like | Andrew Morgan | 2019-03-13 | 1 | -3/+3 | |
| * | | i should have given up x2 | Andrew Morgan | 2019-03-13 | 1 | -18/+13 | |
| * | | i should have given up | Andrew Morgan | 2019-03-13 | 1 | -1/+1 | |
| * | | there comes a time when you should give up. but you dont | Andrew Morgan | 2019-03-13 | 1 | -1/+1 | |
| * | | as above | Andrew Morgan | 2019-03-13 | 1 | -2/+4 | |
| * | | no kwargs today | Andrew Morgan | 2019-03-13 | 1 | -7/+12 | |
| * | | Or perhaps I was the one who was drunk | Andrew Morgan | 2019-03-13 | 1 | -6/+3 | |
| * | | go home python, you're drunk | Andrew Morgan | 2019-03-13 | 1 | -4/+2 | |
| * | | Syntax checker is bork | Andrew Morgan | 2019-03-13 | 1 | -6/+5 | |
| * | | Destructure again | Andrew Morgan | 2019-03-13 | 1 | -7/+8 | |
| * | | Are you happy now | Andrew Morgan | 2019-03-13 | 1 | -2/+2 | |
| * | | Syntax test | Andrew Morgan | 2019-03-13 | 1 | -6/+5 | |
| * | | Remove testing code | Andrew Morgan | 2019-03-13 | 1 | -3/+0 | |
| * | | Add missing docstring detail | Andrew Morgan | 2019-03-13 | 1 | -1/+1 | |
| * | | Fix syntax issues | Andrew Morgan | 2019-03-13 | 1 | -7/+10 | |
| * | | Switch to wrapper function around _send_request | Andrew Morgan | 2019-03-13 | 2 | -37/+76 | |
| * | | Retry on 400:M_UNRECOGNIZED | Andrew Morgan | 2019-03-13 | 1 | -6/+10 | |
| * | | Fix paranthesis indent | Andrew Morgan | 2019-03-13 | 1 | -1/+2 | |
| * | | Add workaround note | Andrew Morgan | 2019-03-13 | 1 | -10/+4 | |
| * | | Cleaner way of implementing trailing slashes | Andrew Morgan | 2019-03-12 | 2 | -68/+62 | |
| * | | Merge branch 'develop' into anoa/trailing_slashes_client | Andrew Morgan | 2019-03-11 | 2 | -9/+9 | |
| |\ \ | ||||||
| * \ \ | Merge branch 'develop' into anoa/trailing_slashes_client | Andrew Morgan | 2019-03-11 | 4 | -19/+53 | |
| |\ \ \ | ||||||
| * | | | | lint | Andrew Morgan | 2019-03-08 | 1 | -1/+3 | |
| * | | | | Retry certain federation requests on 404 | Andrew Morgan | 2019-03-08 | 2 | -5/+50 | |
| * | | | | Remove trailing slashes from outbound federation requests | Andrew Morgan | 2019-03-08 | 1 | -7/+7 | |
* | | | | | Merge pull request #4908 from matrix-org/erikj/block_peek_on_blocked_rooms | Erik Johnston | 2019-03-21 | 2 | -2/+11 | |
|\ \ \ \ \ | ||||||
| * | | | | | Deny peeking into rooms that have been blocked | Erik Johnston | 2019-03-21 | 2 | -2/+11 | |
* | | | | | | Merge pull request #4904 from matrix-org/erikj/fix_shutdown | Erik Johnston | 2019-03-21 | 6 | -24/+62 | |
|\| | | | | | ||||||
| * | | | | | Fix upsert | Erik Johnston | 2019-03-21 | 1 | -0/+1 | |
| * | | | | | Revert spurious delete | Erik Johnston | 2019-03-20 | 1 | -0/+4 | |
| * | | | | | comment block_room | Erik Johnston | 2019-03-20 | 1 | -0/+9 | |
| * | | | | | Use flags | Erik Johnston | 2019-03-20 | 5 | -15/+17 | |
| * | | | | | Move requester check into assert_accepted_privacy_policy | Erik Johnston | 2019-03-20 | 1 | -5/+8 | |
| * | | | | | Gracefully handle failing to kick user | Erik Johnston | 2019-03-20 | 1 | -19/+27 | |
| * | | | | | Log new room ID | Erik Johnston | 2019-03-20 | 1 | -1/+6 | |
| * | | | | | Only require consent for events with an associated request | Erik Johnston | 2019-03-20 | 1 | -1/+5 | |
| * | | | | | Allow blocking a room multiple times | Erik Johnston | 2019-03-20 | 1 | -2/+4 | |
* | | | | | | Merge pull request #4896 from matrix-org/erikj/disable_room_directory | Erik Johnston | 2019-03-21 | 3 | -0/+32 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Disable publishing to room list when its disabled | Erik Johnston | 2019-03-20 | 1 | -0/+8 | |
| * | | | | | | Pull out config option | Erik Johnston | 2019-03-20 | 1 | -3/+3 | |
| * | | | | | | Return before we log | Erik Johnston | 2019-03-20 | 1 | -4/+5 | |
| * | | | | | | Fix up config comments | Erik Johnston | 2019-03-20 | 1 | -3/+4 | |
| * | | | | | | Add option to disable search room lists | Erik Johnston | 2019-03-19 | 2 | -0/+22 | |
* | | | | | | | Merge pull request #4895 from matrix-org/erikj/disable_user_search | Erik Johnston | 2019-03-20 | 2 | -0/+15 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Fix up sample config | Erik Johnston | 2019-03-20 | 1 | -2/+4 | |
| * | | | | | | Update synapse/config/user_directory.py | Richard van der Hoff | 2019-03-20 | 1 | -1/+1 | |
| * | | | | | | Add option to disable searching in the user dir | Erik Johnston | 2019-03-19 | 2 | -0/+13 | |
| |/ / / / / | ||||||
* | | | | | | Batching in the user directory import (#4900) | Amber Brown | 2019-03-21 | 1 | -0/+13 | |
* | | | | | | Add a config option for torture-testing worker replication. (#4902) | Richard van der Hoff | 2019-03-20 | 2 | -1/+22 | |
* | | | | | | Batch up outgoing read-receipts to reduce federation traffic. (#4890) | Richard van der Hoff | 2019-03-20 | 4 | -22/+171 | |
|/ / / / / | ||||||
* | | | | | Use a regular HomeServerConfig object for unit tests | Richard van der Hoff | 2019-03-19 | 2 | -2/+10 | |
* | | | | | Merge remote-tracking branch 'origin/develop' into HEAD | Richard van der Hoff | 2019-03-19 | 3 | -4/+16 | |
|\ \ \ \ \ | ||||||
| * | | | | | fix test_auto_create_auto_join_where_no_consent (#4886) | Neil Johnson | 2019-03-19 | 2 | -3/+15 | |
| * | | | | | Fix user directory background update (#4887) | Erik Johnston | 2019-03-19 | 1 | -1/+1 | |
* | | | | | | Enforce hs_disabled_message correctly | Richard van der Hoff | 2019-03-19 | 1 | -3/+5 | |
|/ / / / / | ||||||
* | | | | | Comment out most options in the generated config. (#4863) | Richard van der Hoff | 2019-03-19 | 14 | -98/+149 | |
* | | | | | Migrate the user directory initial population to a background task (#4864) | Amber Brown | 2019-03-19 | 4 | -256/+325 | |
* | | | | | Add ratelimiting on failed login attempts (#4865) | Brendan Abolivier | 2019-03-18 | 2 | -5/+32 | |
* | | | | | Add ratelimiting on login (#4821) | Brendan Abolivier | 2019-03-15 | 6 | -22/+102 | |
* | | | | | Merge pull request #4855 from matrix-org/rav/refactor_transaction_queue | Richard van der Hoff | 2019-03-15 | 7 | -761/+864 | |
|\ \ \ \ \ | ||||||
| * | | | | | Rename and move the classes | Richard van der Hoff | 2019-03-13 | 7 | -811/+864 | |
| * | | | | | Factor per-destination stuff out of TransactionQueue | Richard van der Hoff | 2019-03-13 | 1 | -132/+182 | |
* | | | | | | Merge pull request #4852 from matrix-org/rav/move_rr_sending_to_worker | Richard van der Hoff | 2019-03-15 | 5 | -55/+110 | |
|\| | | | | | ||||||
| * | | | | | Move client receipt processing to federation sender worker. | Richard van der Hoff | 2019-03-13 | 4 | -33/+78 | |
| * | | | | | declare a ReadReceipt class | Richard van der Hoff | 2019-03-13 | 2 | -24/+34 | |
* | | | | | | Merge pull request #4853 from matrix-org/erikj/worker_docker_ci | Erik Johnston | 2019-03-15 | 4 | -17/+53 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Correctly handle all command line options | Erik Johnston | 2019-03-14 | 3 | -16/+42 | |
| * | | | | | | Allow passing --daemonize to workers | Erik Johnston | 2019-03-13 | 2 | -1/+11 | |
* | | | | | | | Revert "Make federation endpoints more tolerant of trailing slashes for some ... | Erik Johnston | 2019-03-14 | 2 | -8/+8 | |
* | | | | | | | Merge pull request #4846 from matrix-org/hawkowl/userdir-search | Erik Johnston | 2019-03-14 | 7 | -123/+183 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | fixup | Amber Brown | 2019-03-13 | 2 | -2/+2 | |
| * | | | | | | fixup | Amber Brown | 2019-03-13 | 3 | -55/+16 | |
| * | | | | | | fixup | Amber Brown | 2019-03-12 | 1 | -1/+1 | |
| * | | | | | | fixup | Amber Brown | 2019-03-12 | 1 | -1/+2 | |
| * | | | | | | fixup | Amber Brown | 2019-03-12 | 3 | -160/+139 | |
| * | | | | | | fixup | Amber Brown | 2019-03-12 | 1 | -1/+1 | |
| * | | | | | | use the old method | Amber Brown | 2019-03-12 | 1 | -3/+2 | |
| * | | | | | | fix | Amber Brown | 2019-03-12 | 1 | -1/+1 | |
| * | | | | | | pep8 | Amber Brown | 2019-03-12 | 1 | -2/+1 | |
| * | | | | | | fixes | Amber Brown | 2019-03-12 | 3 | -48/+62 | |
| * | | | | | | master startup | Amber Brown | 2019-03-11 | 2 | -0/+9 | |
| * | | | | | | Merge remote-tracking branch 'origin/develop' into hawkowl/userdir-search | Amber Brown | 2019-03-11 | 4 | -19/+53 | |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | ||||||
| * | | | | | | initial | Amber Brown | 2019-03-11 | 4 | -4/+102 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Document using a certificate with a full chain (#4849) | Andrew Morgan | 2019-03-13 | 1 | -0/+5 | |
| |_|/ / / |/| | | | | ||||||
* | | | | | Transfer local user's push rules on room upgrade (#4838) | Andrew Morgan | 2019-03-12 | 2 | -0/+61 | |
* | | | | | Clarify what registration_shared_secret allows for (#2885) (#4844) | Aaron Raimist | 2019-03-11 | 1 | -2/+2 | |
| |_|/ / |/| | | | ||||||
* | | | | Make federation endpoints more tolerant of trailing slashes for some endpoint... | Andrew Morgan | 2019-03-11 | 2 | -8/+8 | |
* | | | | Correctly log expected errors when fetching server keys | Erik Johnston | 2019-03-11 | 1 | -2/+2 | |
| |/ / |/| | | ||||||
* | | | fix incorrect encoding of filenames with spaces in (#2090) | Matthew Hodgson | 2019-03-11 | 1 | -3/+51 | |
* | | | Add comment to schema | Erik Johnston | 2019-03-08 | 1 | -0/+2 | |
* | | | Make `prev_state` field optional | Erik Johnston | 2019-03-08 | 2 | -16/+0 | |
|/ / | ||||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/soft_fail_... | Erik Johnston | 2019-03-08 | 17 | -426/+384 | |
|\ \ | ||||||
| * \ | Merge pull request #4829 from matrix-org/erikj/device_list_seen_updates | Erik Johnston | 2019-03-08 | 1 | -3/+7 | |
| |\ \ | ||||||
| | * | | When re-syncing device lists reset the state | Erik Johnston | 2019-03-07 | 1 | -3/+7 | |
| * | | | Add some debug logging for device list handling | Erik Johnston | 2019-03-07 | 1 | -2/+38 | |
| |/ / | ||||||
| * | | Rewrite userdir to be faster (#4537) | Amber Brown | 2019-03-07 | 3 | -366/+174 | |
| * | | Merge pull request #4779 from matrix-org/travis/icons | Travis Ralston | 2019-03-06 | 3 | -7/+7 | |
| |\ \ | ||||||
| | * | | Use static locations for Riot icons | Travis Ralston | 2019-03-01 | 3 | -7/+7 | |
| * | | | Merge pull request #4818 from matrix-org/erikj/prefill_client_ips | Erik Johnston | 2019-03-06 | 1 | -0/+2 | |
| |\ \ \ | ||||||
| | * | | | Prefill client IPs cache on workers | Erik Johnston | 2019-03-06 | 1 | -0/+2 | |
| * | | | | Merge pull request #4815 from matrix-org/erikj/docstrings | Erik Johnston | 2019-03-06 | 2 | -7/+45 | |
| |\ \ \ \ | ||||||
| | * | | | | Add docstrings from matrix-org-hotfixes | Erik Johnston | 2019-03-06 | 2 | -7/+45 | |
| | |/ / / | ||||||
| * | | | | Merge pull request #4816 from matrix-org/erikj/4422_debug | Erik Johnston | 2019-03-06 | 1 | -7/+46 | |
| |\ \ \ \ | ||||||
| | * | | | | Port #4422 debug logging from hotfixes | Erik Johnston | 2019-03-06 | 1 | -7/+46 | |
| | |/ / / | ||||||
| * / / / | Send message after room has been shutdown | Erik Johnston | 2019-03-06 | 1 | -11/+11 | |
| |/ / / | ||||||
| * | | | Merge pull request #4792 from matrix-org/anoa/replication_tokens | Andrew Morgan | 2019-03-06 | 1 | -3/+28 | |
| |\ \ \ | ||||||
| | * | | | Simplify token replication logic | Andrew Morgan | 2019-03-05 | 1 | -23/+14 | |
| | * | | | Clean up logic and add comments | Andrew Morgan | 2019-03-04 | 1 | -11/+18 | |
| | * | | | Clearer branching, fix missing list clear | Andrew Morgan | 2019-03-04 | 1 | -4/+11 | |
| | * | | | Prevent replication wedging | Andrew Morgan | 2019-03-04 | 1 | -4/+24 | |
| * | | | | Make registration ratelimiter separate from the main events one | Brendan Abolivier | 2019-03-06 | 3 | -2/+6 | |
| * | | | | Revert "Split ratelimiters in two (one for events, one for registration)" | Brendan Abolivier | 2019-03-06 | 5 | -11/+7 | |
| * | | | | Split ratelimiters in two (one for events, one for registration) | Brendan Abolivier | 2019-03-05 | 5 | -7/+11 | |
| * | | | | Move settings from registration to ratelimiting in config file | Brendan Abolivier | 2019-03-05 | 2 | -18/+20 | |
* | | | | | Factor out soft fail checks | Erik Johnston | 2019-03-08 | 1 | -5/+22 | |
* | | | | | Implement soft fail | Erik Johnston | 2019-03-06 | 4 | -1/+95 | |
|/ / / / | ||||||
* | | | | Merge pull request #4772 from jbweston/jbweston/server-version-api | Erik Johnston | 2019-03-05 | 1 | -0/+23 | |
|\ \ \ \ | ||||||
| * | | | | Add 'server_version' endpoint to admin API | Joseph Weston | 2019-03-01 | 1 | -0/+23 | |
* | | | | | Add rate-limiting on registration (#4735) | Brendan Abolivier | 2019-03-05 | 6 | -31/+102 | |
* | | | | | Merge pull request #4794 from matrix-org/anoa/erroneous_dollahs | Andrew Morgan | 2019-03-05 | 1 | -22/+22 | |
|\ \ \ \ \ | ||||||
| * | | | | | Remove unnecessary dollar signs | Andrew Morgan | 2019-03-04 | 1 | -22/+22 | |
* | | | | | | Merge pull request #4699 from matrix-org/erikj/stop_fed_not_in_room | Erik Johnston | 2019-03-05 | 3 | -29/+126 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | clarify comments | Erik Johnston | 2019-03-05 | 2 | -9/+12 | |
| * | | | | | | Fix missing null guard | Erik Johnston | 2019-03-04 | 1 | -1/+1 | |
| * | | | | | | Only check history visibility when filtering | Erik Johnston | 2019-03-04 | 2 | -35/+46 | |
| * | | | | | | s/get_forward_events/get_successor_events/ | Erik Johnston | 2019-03-04 | 2 | -3/+3 | |
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/stop_fed_n... | Erik Johnston | 2019-03-04 | 36 | -191/+571 | |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | ||||||
| * | | | | | | Update comments | Erik Johnston | 2019-02-27 | 1 | -3/+13 | |
| * | | | | | | Stop backpaginating when events not visible | Erik Johnston | 2019-02-20 | 3 | -5/+78 | |
* | | | | | | | Merge pull request #4799 from matrix-org/rav/clean_up_replication_code | Erik Johnston | 2019-03-05 | 1 | -60/+5 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Remove redundant PreserveLoggingContext | Richard van der Hoff | 2019-03-04 | 1 | -10/+5 | |
| * | | | | | | | Remove unused `wait_for_replication` method | Richard van der Hoff | 2019-03-04 | 1 | -50/+0 | |
* | | | | | | | | Merge pull request #4796 from matrix-org/erikj/factor_out_e2e_keys | Erik Johnston | 2019-03-05 | 9 | -747/+762 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Allow /keys/{changes,query} API to run on worker | Erik Johnston | 2019-03-04 | 2 | -2/+13 | |
| * | | | | | | | | Split DeviceHandler into master and worker | Erik Johnston | 2019-03-04 | 2 | -170/+179 | |
| * | | | | | | | | Fixup slave stores | Erik Johnston | 2019-03-04 | 6 | -577/+572 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | Add some debug about processing read receipts. | Richard van der Hoff | 2019-03-04 | 1 | -6/+20 | |
* | | | | | | | | Clean up read-receipt handling. | Richard van der Hoff | 2019-03-04 | 1 | -59/+44 | |
| |/ / / / / / |/| | | | | | | ||||||
* | | | | | | | Include a default configuration file in the 'docs' directory. (#4791) | Richard van der Hoff | 2019-03-04 | 4 | -13/+25 | |
|/ / / / / / | ||||||
* | / / / / | Avoid rebuilding Edu objects in worker mode (#4770) | Richard van der Hoff | 2019-03-04 | 5 | -19/+36 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Fix incorrect log about not persisting duplicate state event. (#4776) | Richard van der Hoff | 2019-03-01 | 1 | -3/+4 | |
| |_|/ / |/| | | | ||||||
* | | | | Merge branch 'master' into develop | Richard van der Hoff | 2019-03-01 | 1 | -1/+1 | |
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | ||||||
| * | | 0.99.2 | Richard van der Hoff | 2019-03-01 | 1 | -1/+1 | |
* | | | Minor docstring fixes for MatrixFederationAgent (#4765) | Andrew Morgan | 2019-02-28 | 1 | -1/+5 | |
* | | | Make 'event_id' a required parameter in federated state requests (#4741) | Amber Brown | 2019-02-27 | 1 | -2/+2 | |
* | | | Fix parsing of Content-Disposition headers (#4763) | Richard van der Hoff | 2019-02-27 | 1 | -20/+65 | |
* | | | Move from TravisCI to BuildKite (#4752) | Amber Brown | 2019-02-27 | 1 | -1/+1 | |
* | | | Merge pull request #4759 from matrix-org/erikj/3pid_client_reader | Erik Johnston | 2019-02-27 | 2 | -33/+35 | |
|\ \ \ | ||||||
| * | | | Move /account/3pid to client_reader | Erik Johnston | 2019-02-27 | 2 | -33/+35 | |
* | | | | Merge pull request #4758 from matrix-org/erikj/use_presence_replication | Erik Johnston | 2019-02-27 | 2 | -2/+8 | |
|\ \ \ \ | ||||||
| * | | | | When presence is enabled don't send over replication | Erik Johnston | 2019-02-27 | 2 | -2/+8 | |
| |/ / / | ||||||
* / / / | Move server key queries to federation reader | Erik Johnston | 2019-02-27 | 1 | -1/+5 | |
|/ / / | ||||||
* | | | Merge pull request #4749 from matrix-org/erikj/replication_connection_backoff | Erik Johnston | 2019-02-27 | 3 | -5/+39 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Move connecting logic into ClientReplicationStreamProtocol | Erik Johnston | 2019-02-27 | 2 | -18/+17 | |
| * | | Increase the max delay between retry attempts | Erik Johnston | 2019-02-26 | 1 | -1/+1 | |
| * | | Fix tightloop over connecting to replication server | Erik Johnston | 2019-02-26 | 2 | -4/+39 | |
* | | | 0.99.2rc1 v0.99.2rc1 | Richard van der Hoff | 2019-02-27 | 1 | -1/+1 | |
* | | | Limit cache invalidation replication line length (#4748) | Erik Johnston | 2019-02-27 | 2 | -5/+27 | |
* | | | Add database version to phonehome stats. (#4753) | Richard van der Hoff | 2019-02-27 | 4 | -0/+45 | |
|/ / | ||||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/public_room... | Andrew Morgan | 2019-02-26 | 193 | -4548/+9279 | |
|\ \ | ||||||
| * | | Revert "Prevent showing non-fed rooms in fed /publicRooms" | Andrew Morgan | 2019-02-26 | 4 | -70/+17 | |
| * | | Merge pull request #4736 from matrix-org/anoa/public_rooms_federate | Andrew Morgan | 2019-02-26 | 4 | -17/+70 | |
| |\ \ | ||||||
| | * | | Cleaner chunk logic | Andrew Morgan | 2019-02-26 | 1 | -5/+4 | |
| | * | | Correct indent | Andrew Morgan | 2019-02-26 | 1 | -3/+3 | |
| | * | | Correct docstring types and chunk logic | Andrew Morgan | 2019-02-26 | 1 | -10/+11 | |
| | * | | Clean up room chunk logic | Andrew Morgan | 2019-02-26 | 1 | -6/+8 | |
| | * | | Make not showing non-federated rooms the default | Andrew Morgan | 2019-02-26 | 2 | -13/+1 | |
| | * | | Result may be None | Andrew Morgan | 2019-02-26 | 1 | -1/+1 | |
| | * | | Address rich comments | Andrew Morgan | 2019-02-26 | 2 | -7/+31 | |
| | * | | Fix group's call to generate_room_entry | Andrew Morgan | 2019-02-25 | 1 | -4/+2 | |
| | * | | elif not else if | Andrew Morgan | 2019-02-25 | 1 | -1/+1 | |
| | * | | syntax derp | Andrew Morgan | 2019-02-25 | 1 | -1/+1 | |
| | * | | Simplify call to generate_room_entry | Andrew Morgan | 2019-02-25 | 1 | -17/+13 | |
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/public_room... | Erik Johnston | 2019-02-25 | 192 | -4516/+9135 | |
| | |\ \ | ||||||
| | * | | | Docs and arg name clarification | Andrew Morgan | 2019-02-25 | 1 | -2/+15 | |
| | * | | | Don't restrict non-fed rooms over client APIs | Andrew Morgan | 2019-02-25 | 3 | -14/+22 | |
| | * | | | Config option to prevent showing non-fed rooms in fed /publicRooms | Andrew Morgan | 2019-02-25 | 2 | -2/+26 |