Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove redundant merged_keys dict | Richard van der Hoff | 2019-04-08 | 1 | -8/+5 |
* | Remove unused server_tls_certificates functions (#5028) | Richard van der Hoff | 2019-04-08 | 6 | -63/+7 |
* | add context to phonehome stats (#5020) | Neil Johnson | 2019-04-08 | 4 | -1/+9 |
* | Merge pull request #5024 from matrix-org/rav/record_correct_server_in_serverkeys | Richard van der Hoff | 2019-04-08 | 3 | -1/+3 |
|\ | |||||
| * | Fix from_server buglet in get_keys_from_perspectives | Richard van der Hoff | 2019-04-08 | 3 | -1/+3 |
* | | drop tables listed in #1830 (#4992) | Neil Johnson | 2019-04-08 | 26 | -757/+43 |
|/ | |||||
* | Merge pull request #5001 from matrix-org/rav/keyring_cleanups | Richard van der Hoff | 2019-04-08 | 4 | -33/+181 |
|\ | |||||
| * | changelog | Richard van der Hoff | 2019-04-04 | 1 | -0/+1 |
| * | 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 |
| * | test for get_keys_from_perspectives | Richard van der Hoff | 2019-04-04 | 1 | -0/+67 |
| * | add a test for get_keys_from_server | Richard van der Hoff | 2019-04-04 | 1 | -0/+63 |
| * | 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 | 6 | -1/+81 |
* | | Clean up the database pagination code (#5007) | Amber Brown | 2019-04-05 | 3 | -67/+64 |
* | | Merge pull request #5002 from matrix-org/erikj/delete_group | Erik Johnston | 2019-04-04 | 6 | -0/+275 |
|\ \ | |||||
| * | | Newsfile | Erik Johnston | 2019-04-03 | 1 | -0/+1 |
| * | | Add unit test for deleting groups | Erik Johnston | 2019-04-03 | 1 | -0/+124 |
| * | | Add admin API for group deletion | Erik Johnston | 2019-04-03 | 2 | -0/+40 |
| * | | 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 | 2 | -0/+10 |
* | | | Avoid redundant URL encoding (#4555) | Marcel Krüger | 2019-04-04 | 2 | -1/+2 |
* | | | Merge pull request #5004 from ajensenwaud/develop | Erik Johnston | 2019-04-04 | 2 | -1/+2 |
|\ \ \ | |||||
| * | | | Fix issue #4596 | Anders | 2019-04-03 | 2 | -1/+2 |
* | | | | Correct default POSTGRES_USER in Docker README (#4987) | *=0=1=4=* | 2019-04-04 | 2 | -2/+4 |
| |/ / |/| | | |||||
* | | | Fix grammar and document get_current_users_in_room (#4998) | Andrew Morgan | 2019-04-03 | 13 | -20/+32 |
| |/ |/| | |||||
* | | Rewrite KeyringTestCase as a HomeServerTestCase (#4986) | Richard van der Hoff | 2019-04-03 | 2 | -107/+105 |
* | | Remove presence lists (#4989) | Neil Johnson | 2019-04-03 | 9 | -456/+23 |
* | | Merge pull request #4982 from matrix-org/erikj/msc1915 | Erik Johnston | 2019-04-03 | 7 | -17/+216 |
|\ \ | |||||
| * | | 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 |
| * | | Newsfile | Erik Johnston | 2019-04-01 | 1 | -0/+1 |
| * | | 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 | 42 | -2455/+2131 |
* | | | Merge pull request #4991 from matrix-org/erikj/stagger_push_startup | Erik Johnston | 2019-04-02 | 5 | -8/+74 |
|\ \ \ | |||||
| * | | | s/misc/feature/ | Erik Johnston | 2019-04-02 | 1 | -0/+0 |
| * | | | Newsfile | Erik Johnston | 2019-04-02 | 1 | -0/+1 |
| * | | | 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 | 3 | -0/+3 |
* | | | | Add config.signing_key_path. (#4974) | Richard van der Hoff | 2019-04-02 | 2 | -1/+3 |
|/ / / | |||||
* | / | Fix sync bug when accepting invites (#4956) | Richard van der Hoff | 2019-04-02 | 7 | -69/+237 |
| |/ |/| | |||||
* | | Neilj/fix threepid auth check (with tests) (#4474) | Neil Johnson | 2019-04-01 | 2 | -0/+33 |
* | | Merge pull request #4981 from matrix-org/manuroe/demo_bypass_account_rate_lim... | manuroe | 2019-04-01 | 2 | -5/+16 |
|\ \ | |||||
| * | | start.sh: Fix the --no-rate-limit option for messages and make it bypass rate... | manuroe | 2019-04-01 | 2 | -5/+16 |
* | | | Merge branch 'master' into develop | Neil Johnson | 2019-04-01 | 88 | -89/+107 |
|\ \ \ | |/ / |/| | | |||||
| * | | 0.99.3 v0.99.3 github/release-v0.99.3 release-v0.99.3 | Neil Johnson | 2019-04-01 | 3 | -3/+13 |
| * | | convert rst link to md | Neil Johnson | 2019-04-01 | 1 | -1/+1 |
| * | | 0.99.3rc1 v0.99.3rc1 | Neil Johnson | 2019-03-27 | 85 | -85/+93 |
| * | | bump version | Neil Johnson | 2019-03-27 | 1 | -1/+1 |
* | | | Collect room-version variations into one place (#4969) | Richard van der Hoff | 2019-04-01 | 28 | -168/+222 |
| |/ |/| | |||||
* | | Merge pull request #4968 from Jurrie/feature/fix_small_stuff_in_Docker_README.md | Richard van der Hoff | 2019-03-29 | 2 | -2/+4 |
|\ \ | |||||
| * | | Add changelog.d entry | Jurrie Overgoor | 2019-03-29 | 1 | -0/+1 |
| * | | Add -p argument for docker run command example | Jurrie Overgoor | 2019-03-29 | 1 | -0/+1 |
| * | | Fix typo in TLS filenames | Jurrie Overgoor | 2019-03-29 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #4955 from matrix-org/rav/merge_state_into_events | Richard van der Hoff | 2019-03-28 | 9 | -49/+141 |
|\ \ | |||||
| * | | changelog | Richard van der Hoff | 2019-03-27 | 1 | -0/+1 |
| * | | 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 | 4 | -5/+22 |
|\ \ \ | |||||
| * \ \ | Merge remote-tracking branch 'origin/develop' into rav/refactor_parse_row | Richard van der Hoff | 2019-03-28 | 3 | -380/+336 |
| |\ \ \ | | |/ / | |/| | | |||||
| * | | | changelog | Richard van der Hoff | 2019-03-27 | 1 | -0/+1 |
| * | | | 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 | 2 | -2/+1 |
* | | | | Allow password providers to bind emails (#4947) | Andrew Morgan | 2019-03-28 | 3 | -4/+23 |
* | | | | Merge pull request #4942 from matrix-org/erikj/fix_presence | Erik Johnston | 2019-03-28 | 5 | -33/+412 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Use an assert | Erik Johnston | 2019-03-28 | 1 | -2/+1 |
| * | | | Review comments | Erik Johnston | 2019-03-28 | 2 | -49/+71 |
| * | | | Newsfile | Erik Johnston | 2019-03-27 | 1 | -0/+1 |
| * | | | Add unit tests | Erik Johnston | 2019-03-27 | 1 | -1/+171 |
| * | | | 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 | 8 | -77/+136 |
|\ \ \ | | |/ | |/| | |||||
| * | | changelog | Richard van der Hoff | 2019-03-27 | 1 | -0/+2 |
| * | | 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 | 4 | -35/+53 |
* | | | Run `black` on some storage modules that the stats branch touches (#4959) | Amber Brown | 2019-03-29 | 3 | -380/+336 |
|/ / | |||||
* / | Fix/improve some docstrings in the replication code. (#4949) | Richard van der Hoff | 2019-03-27 | 3 | -7/+20 |
|/ | |||||
* | Support 3PID login in password providers (#4931) | Andrew Morgan | 2019-03-26 | 8 | -26/+137 |
* | Use the state event amount for userdir import batching, not room count (#4944) | Amber Brown | 2019-03-27 | 2 | -8/+21 |
* | Make federation endpoints more tolerant of trailing slashes v2 (#4935) | Andrew Morgan | 2019-03-26 | 5 | -11/+13 |
* | Fix ClientReplicationStreamProtocol.__str__ (#4929) | Richard van der Hoff | 2019-03-25 | 3 | -4/+6 |
* | Fix bug where read-receipts lost their timestamps (#4927) | Richard van der Hoff | 2019-03-25 | 8 | -12/+179 |
* | Use an explicit dbname for postgres connections in the tests. (#4928) | Richard van der Hoff | 2019-03-25 | 2 | -18/+17 |
* | Fix nginx example in ACME doc. (#4923) | Richard van der Hoff | 2019-03-25 | 2 | -1/+2 |
* | Refactor out state delta handling into its own class (#4917) | Amber Brown | 2019-03-25 | 5 | -110/+152 |
* | Merge pull request #4869 from matrix-org/erikj/yaml_load | Erik Johnston | 2019-03-22 | 8 | -11/+12 |
|\ | |||||
| * | Newsfile | Erik Johnston | 2019-03-22 | 1 | -0/+1 |
| * | Use yaml safe_load | Erik Johnston | 2019-03-22 | 7 | -11/+11 |
* | | Allow newsfragments to end with exclamation marks! (#4912) | Richard van der Hoff | 2019-03-21 | 2 | -2/+3 |
* | | Some more porting to HomeserverTestCase and remove old RESTHelper (#4913) | Amber Brown | 2019-03-22 | 5 | -230/+124 |
* | | Remove trailing slashes from outbound federation requests and retry on 400 (#... | Andrew Morgan | 2019-03-21 | 5 | -17/+191 |
|\ \ | |/ |/| | |||||
| * | 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 | 2 | -3/+7 |
| * | New test, fix issues | Andrew Morgan | 2019-03-20 | 2 | -49/+73 |
| * | Fix comments. v0.99.2 -> v0.99.3 | Andrew Morgan | 2019-03-20 | 2 | -6/+6 |
| * | Just return if not doing any trailing slash shennanigans | Andrew Morgan | 2019-03-20 | 1 | -0/+2 |
| * | Federation test fixed! | Andrew Morgan | 2019-03-20 | 1 | -2/+5 |
| * | lint | Andrew Morgan | 2019-03-18 | 1 | -1/+1 |
| * | Better exception handling | Andrew Morgan | 2019-03-18 | 2 | -20/+18 |
| * | Correct var name | Andrew Morgan | 2019-03-13 | 2 | -2/+56 |
| * | 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 x3 | Andrew Morgan | 2019-03-13 | 1 | -39/+0 |
| * | i should have given up x2 | Andrew Morgan | 2019-03-13 | 2 | -18/+52 |
| * | 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 | 3 | -39/+78 |
| * | 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 |
| * | Correct argument name | Andrew Morgan | 2019-03-12 | 1 | -2/+2 |
| * | Cleaner way of implementing trailing slashes | Andrew Morgan | 2019-03-12 | 3 | -70/+66 |
| * | and again | Andrew Morgan | 2019-03-11 | 1 | -1/+1 |
| * | Fix syntax error | Andrew Morgan | 2019-03-11 | 1 | -1/+1 |
| * | We're calling different functions now | Andrew Morgan | 2019-03-11 | 1 | -2/+2 |
| * | Merge branch 'develop' into anoa/trailing_slashes_client | Andrew Morgan | 2019-03-11 | 5 | -12/+14 |
| |\ | |||||
| * \ | Merge branch 'develop' into anoa/trailing_slashes_client | Andrew Morgan | 2019-03-11 | 8 | -19/+57 |
| |\ \ | |||||
| * | | | lint | Andrew Morgan | 2019-03-08 | 1 | -1/+3 |
| * | | | Add changelog | Andrew Morgan | 2019-03-08 | 1 | -0/+1 |
| * | | | 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 | 4 | -3/+77 |
|\ \ \ \ | |||||
| * | | | | Update changelog.d/4908.bugfix | Richard van der Hoff | 2019-03-21 | 1 | -1/+1 |
| * | | | | isort | Erik Johnston | 2019-03-21 | 1 | -1/+1 |
| * | | | | Newsfile | Erik Johnston | 2019-03-21 | 1 | -0/+1 |
| * | | | | Deny peeking into rooms that have been blocked | Erik Johnston | 2019-03-21 | 3 | -3/+76 |
* | | | | | Update Apache Setup To Remove Location Syntax (#4870) | Colin W | 2019-03-21 | 2 | -9/+6 |
* | | | | | Merge pull request #4904 from matrix-org/erikj/fix_shutdown | Erik Johnston | 2019-03-21 | 8 | -25/+137 |
|\ \ \ \ \ | |||||
| * | | | | | Fix typo and add description | Erik Johnston | 2019-03-21 | 1 | -1/+5 |
| |/ / / / | |||||
| * | | | | Rejig testcase to make it more extensible | Erik Johnston | 2019-03-21 | 1 | -17/+22 |
| * | | | | Remove debug | Erik Johnston | 2019-03-21 | 1 | -1/+0 |
| * | | | | Add tests | Erik Johnston | 2019-03-21 | 1 | -1/+66 |
| * | | | | 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 |
| * | | | | Newsfile | Erik Johnston | 2019-03-20 | 1 | -0/+1 |
| * | | | | 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 | 7 | -3/+97 |
|\ \ \ \ \ | |||||
| * | | | | | Add test | Erik Johnston | 2019-03-20 | 2 | -3/+58 |
| * | | | | | 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 | 2 | -6/+8 |
| * | | | | | Newsfile | Erik Johnston | 2019-03-19 | 1 | -0/+1 |
| * | | | | | Add option to disable search room lists | Erik Johnston | 2019-03-19 | 3 | -0/+27 |
* | | | | | | Log requests which are simulated by the unit tests. (#4905) | Richard van der Hoff | 2019-03-20 | 2 | -8/+2 |
* | | | | | | Merge pull request #4895 from matrix-org/erikj/disable_user_search | Erik Johnston | 2019-03-20 | 5 | -0/+73 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Add test | Erik Johnston | 2019-03-20 | 1 | -0/+52 |
| * | | | | | Fix up sample config | Erik Johnston | 2019-03-20 | 2 | -4/+8 |
| * | | | | | Update synapse/config/user_directory.py | Richard van der Hoff | 2019-03-20 | 1 | -1/+1 |
| * | | | | | Update sample config | Erik Johnston | 2019-03-19 | 1 | -0/+3 |
| * | | | | | Newsfile | Erik Johnston | 2019-03-19 | 1 | -0/+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 | 2 | -0/+14 |
* | | | | | Add a config option for torture-testing worker replication. (#4902) | Richard van der Hoff | 2019-03-20 | 3 | -1/+23 |
* | | | | | Batch up outgoing read-receipts to reduce federation traffic. (#4890) | Richard van der Hoff | 2019-03-20 | 7 | -22/+308 |
|/ / / / | |||||
* | | | | Merge pull request #4894 from matrix-org/erikj/postgres_tuning | Erik Johnston | 2019-03-19 | 2 | -2/+21 |
|\ \ \ \ | |||||
| * | | | | Newsfile | Erik Johnston | 2019-03-19 | 1 | -0/+1 |
| * | | | | Add note on tuning postgres | Erik Johnston | 2019-03-19 | 1 | -2/+20 |
|/ / / / | |||||
* | | | | Merge pull request #4879 from matrix-org/erikj/test_old_deps | Erik Johnston | 2019-03-19 | 3 | -1/+21 |
|\ \ \ \ | |||||
| * | | | | Add comment back in | Erik Johnston | 2019-03-19 | 1 | -0/+1 |
| * | | | | Update newsfile | Erik Johnston | 2019-03-19 | 1 | -1/+1 |
| * | | | | Revert changes | Erik Johnston | 2019-03-19 | 1 | -12/+2 |
| * | | | | Bring py27-old into line with other test envs | Erik Johnston | 2019-03-18 | 1 | -0/+14 |
| * | | | | Add coverage to py27-old | Erik Johnston | 2019-03-18 | 1 | -3/+6 |
| * | | | | Newsfile | Erik Johnston | 2019-03-18 | 1 | -0/+1 |
| * | | | | Add py27-old test case to buildkite | Erik Johnston | 2019-03-18 | 1 | -0/+11 |
* | | | | | Merge pull request #4889 from matrix-org/rav/test_real_config | Richard van der Hoff | 2019-03-19 | 8 | -18/+44 |
|\ \ \ \ \ | |||||
| * | | | | | Fix RegistrationTestCase | Richard van der Hoff | 2019-03-19 | 1 | -2/+9 |
| * | | | | | changelog | Richard van der Hoff | 2019-03-19 | 1 | -0/+1 |
| * | | | | | Use a regular HomeServerConfig object for unit tests | Richard van der Hoff | 2019-03-19 | 3 | -13/+25 |
| * | | | | | Fix resource limits tests | Richard van der Hoff | 2019-03-19 | 1 | -2/+5 |
| * | | | | | Fix registration test | Richard van der Hoff | 2019-03-19 | 1 | -1/+2 |
| * | | | | | Fix email test | Richard van der Hoff | 2019-03-19 | 1 | -0/+2 |
| * | | | | | Merge remote-tracking branch 'origin/develop' into HEAD | Richard van der Hoff | 2019-03-19 | 10 | -11/+45 |
| |\ \ \ \ \ | |||||
* | | | | | | | Merge pull request #4888 from matrix-org/rav/fix_disabled_hs | Richard van der Hoff | 2019-03-19 | 3 | -3/+24 |
|\| | | | | | | |/ / / / / |/| | | | | | |||||
| * | | | | | Enforce hs_disabled_message correctly | Richard van der Hoff | 2019-03-19 | 3 | -3/+24 |
* | | | | | | fix test_auto_create_auto_join_where_no_consent (#4886) | Neil Johnson | 2019-03-19 | 5 | -5/+39 |
* | | | | | | Fix user directory background update (#4887) | Erik Johnston | 2019-03-19 | 2 | -1/+2 |
* | | | | | | Merge remote-tracking branch 'origin/master' into develop | Richard van der Hoff | 2019-03-19 | 3 | -5/+4 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Repoint docs for federation (#4881) | Michael Kaye | 2019-03-19 | 2 | -1/+2 |
| * | | | | | fix some typos in federate.md | Richard van der Hoff | 2019-03-15 | 1 | -4/+2 |
* | | | | | | Comment out most options in the generated config. (#4863) | Richard van der Hoff | 2019-03-19 | 16 | -171/+230 |
* | | | | | | Migrate the user directory initial population to a background task (#4864) | Amber Brown | 2019-03-19 | 8 | -301/+405 |
* | | | | | | Add ratelimiting on failed login attempts (#4865) | Brendan Abolivier | 2019-03-18 | 6 | -5/+86 |
| |/ / / / |/| | | | | |||||
* | | | | | Add ratelimiting on login (#4821) | Brendan Abolivier | 2019-03-15 | 11 | -37/+259 |
* | | | | | Merge pull request #4855 from matrix-org/rav/refactor_transaction_queue | Richard van der Hoff | 2019-03-15 | 8 | -761/+865 |
|\ \ \ \ \ | |||||
| * | | | | | changelog | Richard van der Hoff | 2019-03-13 | 1 | -0/+1 |
| * | | | | | 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 | 6 | -55/+111 |
|\| | | | | | |||||
| * | | | | | changelog | Richard van der Hoff | 2019-03-13 | 1 | -0/+1 |
| * | | | | | 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 | 5 | -17/+54 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Correctly handle all command line options | Erik Johnston | 2019-03-14 | 3 | -16/+42 |
| * | | | | | | Newsfile | Erik Johnston | 2019-03-13 | 1 | -0/+1 |
| * | | | | | | Allow passing --daemonize to workers | Erik Johnston | 2019-03-13 | 2 | -1/+11 |
* | | | | | | | Add systemd setup that supports workers (#4662) | Luca Corbatto | 2019-03-15 | 6 | -0/+205 |
* | | | | | | | Add some stuff back to the .gitignore (#4843) | Aaron Raimist | 2019-03-15 | 2 | -3/+8 |
* | | | | | | | Merge pull request #4859 from matrix-org/revert-4793-anoa/trailing_slashes | Erik Johnston | 2019-03-14 | 4 | -12/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Revert "Make federation endpoints more tolerant of trailing slashes for some ... | Erik Johnston | 2019-03-14 | 4 | -12/+11 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #4846 from matrix-org/hawkowl/userdir-search | Erik Johnston | 2019-03-14 | 11 | -138/+206 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | fixup | Amber Brown | 2019-03-13 | 2 | -2/+2 |
| * | | | | | | fixup | Amber Brown | 2019-03-13 | 4 | -75/+17 |
| * | | | | | | fixup | Amber Brown | 2019-03-12 | 1 | -2/+2 |
| * | | | | | | fixup | Amber Brown | 2019-03-12 | 1 | -1/+1 |
| * | | | | | | fixup | Amber Brown | 2019-03-12 | 1 | -1/+2 |
| * | | | | | | fixup | Amber Brown | 2019-03-12 | 4 | -176/+159 |
| * | | | | | | 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 |
| * | | | | | | changelog | Amber Brown | 2019-03-12 | 1 | -0/+1 |
| * | | | | | | fixes | Amber Brown | 2019-03-12 | 4 | -52/+74 |
| * | | | | | | setup master | Amber Brown | 2019-03-11 | 1 | -0/+2 |
| * | | | | | | 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 | 8 | -19/+57 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | initial | Amber Brown | 2019-03-11 | 5 | -4/+114 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Document using a certificate with a full chain (#4849) | Andrew Morgan | 2019-03-13 | 4 | -2/+17 |
* | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Neil Johnson | 2019-03-12 | 5 | -154/+207 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | | | |||||
| * | | | | fix orphaned sentence | Neil Johnson | 2019-03-12 | 1 | -1/+0 |
| * | | | | Neilj/improved delegation doc 2 (#4832) | Neil Johnson | 2019-03-12 | 4 | -148/+202 |
| * | | | | Add zwsp in bug report template (#4811) | Richard van der Hoff | 2019-03-06 | 1 | -6/+6 |
* | | | | | Transfer local user's push rules on room upgrade (#4838) | Andrew Morgan | 2019-03-12 | 3 | -0/+62 |
* | | | | | Clarify what registration_shared_secret allows for (#2885) (#4844) | Aaron Raimist | 2019-03-11 | 4 | -6/+7 |
| |_|_|/ |/| | | | |||||
* | | | | Make federation endpoints more tolerant of trailing slashes for some endpoint... | Andrew Morgan | 2019-03-11 | 4 | -11/+12 |