| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disa... | Erik Johnston | 2018-10-25 | 8 | -43/+79 |
|\ |
|
| * | Merge branch 'develop' of github.com:matrix-org/synapse into matthew/autocrea... | Neil Johnson | 2018-10-25 | 13 | -103/+440 |
| |\ |
|
| | * | Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebase | Erik Johnston | 2018-10-24 | 1 | -15/+15 |
| | |\ |
|
| | | * | Comment | Erik Johnston | 2018-10-24 | 1 | -2/+5 |
| | | * | Rename resolve_events_with_factory | Erik Johnston | 2018-10-24 | 1 | -2/+2 |
| | | * | Fix up use of resolve_events_with_factory | Erik Johnston | 2018-10-16 | 1 | -13/+10 |
| | * | | Merge pull request #4075 from matrix-org/rav/fix_pusher_logcontexts | Richard van der Hoff | 2018-10-24 | 3 | -4/+4 |
| | |\ \ |
|
| | | * | | Remove redundant run_as_background_process() from pusherpool | Richard van der Hoff | 2018-10-22 | 3 | -4/+4 |
| | * | | | Merge pull request #4063 from matrix-org/erikj/cleaup_alias_creation | Erik Johnston | 2018-10-24 | 2 | -32/+50 |
| | |\ \ \ |
|
| | * \ \ \ | Merge pull request #3969 from turt2live/travis/fix-federated-group-requests | Travis Ralston | 2018-10-23 | 1 | -2/+16 |
| | |\ \ \ \ |
|
| | | * | | | | Comments help | Travis Ralston | 2018-10-23 | 1 | -0/+5 |
| | | * | | | | isort | Travis Ralston | 2018-10-12 | 1 | -1/+1 |
| | | * | | | | More sane handling of group errors and pep8 | Travis Ralston | 2018-10-12 | 1 | -4/+5 |
| | | * | | | | Merge branch 'develop' into travis/fix-federated-group-requests | Travis Ralston | 2018-10-12 | 7 | -91/+181 |
| | | |\ \ \ \ |
|
| | | * | | | | | Remove debugging statement | Travis Ralston | 2018-09-26 | 1 | -1/+0 |
| | | * | | | | | Handle HttpResponseException more safely for federated groups | Travis Ralston | 2018-09-26 | 1 | -2/+11 |
| | * | | | | | | Give some more things logcontexts (#4077) | Richard van der Hoff | 2018-10-23 | 2 | -7/+11 |
| | * | | | | | | Correctly account for cpu usage by background threads (#4074) | Richard van der Hoff | 2018-10-23 | 1 | -14/+4 |
| | | |_|_|/ /
| | |/| | | | |
|
| * | | | | | | remove trailing whiter space | Neil Johnson | 2018-10-24 | 1 | -1/+1 |
| * | | | | | | fix tuple | Richard van der Hoff | 2018-10-24 | 1 | -1/+2 |
| * | | | | | | remove errant exception and style | Neil Johnson | 2018-10-23 | 1 | -5/+5 |
| * | | | | | | clean up config error logic and imports | Neil Johnson | 2018-10-17 | 1 | -14/+16 |
| * | | | | | | no need to join room if creator | Neil Johnson | 2018-10-13 | 1 | -1/+2 |
| * | | | | | | improve auto room join logic, comments and tests | Neil Johnson | 2018-10-12 | 1 | -3/+8 |
| * | | | | | | Merge branch 'develop' into matthew/autocreate_autojoin | Neil Johnson | 2018-10-04 | 5 | -42/+74 |
| |\ \ \ \ \ \ |
|
| * | | | | | | | move logic into register, fix room alias localpart bug, tests | Neil Johnson | 2018-10-04 | 1 | -27/+18 |
| * | | | | | | | emit room aliases event | Matthew Hodgson | 2018-09-29 | 1 | -3/+8 |
| * | | | | | | | fix thinkos | Matthew Hodgson | 2018-09-29 | 1 | -6/+6 |
| * | | | | | | | fix UTs | Matthew Hodgson | 2018-09-28 | 1 | -4/+9 |
| * | | | | | | | untested stab at autocreating autojoin rooms | Matthew Hodgson | 2018-09-28 | 1 | -0/+18 |
* | | | | | | | | Add config option to control alias creation | Erik Johnston | 2018-10-19 | 1 | -0/+9 |
| |_|_|_|_|/ /
|/| | | | | | |
|
* | | | | | | | Clean up room alias creation | Erik Johnston | 2018-10-19 | 2 | -32/+50 |
| |_|/ / / /
|/| | | | | |
|
* | | | | | | Fix roomlist since tokens on Python 3 (#4046) | Will Hunt | 2018-10-17 | 1 | -2/+9 |
* | | | | | | Fix incorrect truncation in get_missing_events | Richard van der Hoff | 2018-10-16 | 1 | -7/+5 |
| |_|_|_|/
|/| | | | |
|
* | | | | | Merge pull request #4019 from matrix-org/dbkr/e2e_backups | David Baker | 2018-10-15 | 1 | -0/+289 |
|\ \ \ \ \
| |_|_|_|/
|/| | | | |
|
| * | | | | Linting soothes the savage PEP8 monster | David Baker | 2018-10-12 | 1 | -4/+9 |
| * | | | | PR feedback pt. 1 | David Baker | 2018-10-12 | 1 | -20/+21 |
| * | | | | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups | David Baker | 2018-10-09 | 13 | -205/+498 |
| |\ \ \ \
| | | |/ /
| | |/| | |
|
| * | | | | Apparently this blank line is Very Important | David Baker | 2018-10-09 | 1 | -0/+1 |
| * | | | | be python3 compatible | David Baker | 2018-10-09 | 1 | -2/+3 |
| * | | | | try to make flake8 and isort happy | Hubert Chathi | 2018-09-06 | 1 | -1/+1 |
| * | | | | update to newer Synapse APIs | Hubert Chathi | 2018-08-24 | 1 | -1/+1 |
| * | | | | Merge branch 'develop' into e2e_backups | Hubert Chathi | 2018-08-24 | 20 | -168/+546 |
| |\ \ \ \ |
|
| * | | | | | support DELETE /version with no args | Matthew Hodgson | 2018-08-12 | 1 | -1/+1 |
| * | | | | | implement remaining tests and make them work | Matthew Hodgson | 2018-08-12 | 1 | -7/+28 |
| * | | | | | switch get_current_version_info back to being get_version_info | Matthew Hodgson | 2018-08-12 | 1 | -4/+7 |
| * | | | | | fix flakes | Matthew Hodgson | 2018-08-12 | 1 | -2/+2 |
| * | | | | | fix typos | Matthew Hodgson | 2018-08-12 | 1 | -1/+2 |
| * | | | | | add a tonne of docstring; make upload_room_keys properly assert version | Matthew Hodgson | 2018-08-12 | 1 | -8/+103 |
| * | | | | | more docstring for the e2e_room_keys rest | Matthew Hodgson | 2018-08-12 | 1 | -2/+0 |
| * | | | | | fix factoring out of _should_replace_room_key | Matthew Hodgson | 2018-08-12 | 1 | -3/+4 |
| * | | | | | rename room_key_version table correctly, and fix opt args | Matthew Hodgson | 2018-08-12 | 1 | -3/+3 |
| * | | | | | blindly incorporate PR review - needs testing & fixing | Matthew Hodgson | 2018-08-12 | 1 | -30/+58 |
| * | | | | | make /room_keys/version work | Matthew Hodgson | 2018-08-12 | 1 | -7/+11 |
| * | | | | | implement /room_keys/version too (untested) | Matthew Hodgson | 2018-08-12 | 1 | -5/+42 |
| * | | | | | make it work and fix pep8 | Matthew Hodgson | 2018-08-12 | 1 | -26/+43 |
| * | | | | | interim WIP checkin; doesn't build yet | Matthew Hodgson | 2018-08-12 | 1 | -15/+31 |
| * | | | | | total WIP skeleton for /room_keys API | Matthew Hodgson | 2018-08-12 | 1 | -0/+60 |
* | | | | | | Add description to counter metric | Erik Johnston | 2018-10-10 | 1 | -1/+5 |
* | | | | | | Track number of non-empty sync responses instead | Erik Johnston | 2018-10-10 | 1 | -9/+15 |
* | | | | | | Append _total to metric and fix up spelling | Erik Johnston | 2018-10-10 | 1 | -2/+2 |
* | | | | | | Add metric to count lazy member sync requests | Erik Johnston | 2018-10-09 | 1 | -6/+20 |
* | | | | | | Remove unnecessary extra function call layer | Erik Johnston | 2018-10-08 | 1 | -15/+3 |
* | | | | | | Use errback pattern and catch async failures | Erik Johnston | 2018-10-08 | 1 | -1/+6 |
| |_|/ / /
|/| | | | |
|
* | | | | | Fix exception handling in fetching remote profiles | Erik Johnston | 2018-10-03 | 1 | -6/+2 |
* | | | | | Merge pull request #3989 from matrix-org/rav/better_stacktraces | Richard van der Hoff | 2018-10-02 | 2 | -22/+23 |
|\ \ \ \ \ |
|
| * | | | | | Avoid reraise, to improve stacktraces | Richard van der Hoff | 2018-10-01 | 2 | -22/+23 |
* | | | | | | Merge pull request #3986 from matrix-org/erikj/fix_sync_with_redacted_state | Erik Johnston | 2018-10-02 | 1 | -2/+2 |
|\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| * | | | | | Fix lazy loaded sync with rejected state events | Erik Johnston | 2018-10-01 | 1 | -2/+2 |
* | | | | | | Merge pull request #3968 from matrix-org/rav/fix_federation_errors | Richard van der Hoff | 2018-10-01 | 1 | -12/+46 |
|\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| * | | | | | Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errors | Richard van der Hoff | 2018-09-27 | 3 | -5/+21 |
| |\ \ \ \ \
| | | |_|/ /
| | |/| | | |
|
| * | | | | | Include event when resolving state for missing prevs | Richard van der Hoff | 2018-09-27 | 1 | -2/+16 |
| * | | | | | Include state from remote servers in pdu handling | Richard van der Hoff | 2018-09-27 | 1 | -4/+19 |
| * | | | | | Fix "unhashable type: 'list'" exception in federation handling | Richard van der Hoff | 2018-09-27 | 1 | -7/+12 |
* | | | | | | Merge pull request #3964 from matrix-org/rav/remove_localhost_checks | Richard van der Hoff | 2018-09-28 | 1 | -0/+1 |
|\ \ \ \ \ \
| |_|/ / / /
|/| | | | | |
|
| * | | | | | Fix complete fail to do the right thing | Richard van der Hoff | 2018-09-28 | 1 | -0/+1 |
| | |_|_|/
| |/| | | |
|
* | | | | | Merge pull request #3794 from matrix-org/erikj/faster_typing | Richard van der Hoff | 2018-09-27 | 1 | -3/+19 |
|\ \ \ \ \ |
|
| * \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/faster_typing | Erik Johnston | 2018-09-19 | 10 | -70/+198 |
| |\ \ \ \ \ |
|
| * | | | | | | Improve performance of getting typing updates for replication | Erik Johnston | 2018-09-05 | 1 | -3/+19 |
* | | | | | | | Merge pull request #3967 from matrix-org/rav/federation_handler_cleanups | Richard van der Hoff | 2018-09-27 | 1 | -2/+10 |
|\ \ \ \ \ \ \
| | |_|_|/ / /
| |/| | | | | |
|
| * | | | | | | more comments | Richard van der Hoff | 2018-09-27 | 1 | -4/+3 |
| * | | | | | | Clarifications in FederationHandler | Richard van der Hoff | 2018-09-27 | 1 | -2/+11 |
* | | | | | | | Merge pull request #3970 from schnuffle/develop-py3 | Amber Brown | 2018-09-27 | 2 | -2/+2 |
|\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | | |
|
| * | | | | | | Replaced all occurences of e.message with str(e) | Schnuffle | 2018-09-27 | 2 | -2/+2 |
| | |_|/ / /
| |/| | | | |
|
* | | | | | | Merge pull request #3966 from matrix-org/rav/rx_txn_logging_2 | Richard van der Hoff | 2018-09-27 | 1 | -0/+4 |
|\ \ \ \ \ \ |
|
| * | | | | | | Logging improvements | Richard van der Hoff | 2018-09-26 | 1 | -0/+4 |
| |/ / / / / |
|
* / / / / / | Include eventid in log lines when processing incoming federation transactions... | Richard van der Hoff | 2018-09-27 | 1 | -26/+39 |
|/ / / / / |
|
* | | | | | Merge pull request #3924 from matrix-org/rav/clean_up_on_receive_pdu | Amber Brown | 2018-09-26 | 1 | -23/+46 |
|\ \ \ \ \ |
|
| * | | | | | Comments and interface cleanup for on_receive_pdu | Richard van der Hoff | 2018-09-20 | 1 | -23/+46 |
* | | | | | | Only lazy load self-members on initial sync | Matthew Hodgson | 2018-09-25 | 1 | -5/+8 |
* | | | | | | Always LL ourselves if we're in a room to simplify clients (#3916) | Matthew Hodgson | 2018-09-20 | 1 | -0/+4 |
|/ / / / / |
|
* | / / / | Improve the logging when handling a federation transaction (#3904) | Richard van der Hoff | 2018-09-19 | 1 | -55/+109 |
| |/ / /
|/| | | |
|
* | | | | Merge pull request #3903 from matrix-org/rav/increase_get_missing_events_timeout | Amber Brown | 2018-09-19 | 1 | -1/+30 |
|\ \ \ \ |
|
| * | | | | Bump timeout on get_missing_events request | Richard van der Hoff | 2018-09-18 | 1 | -1/+30 |
* | | | | | Use directory server for room joins (#3899) | Richard van der Hoff | 2018-09-18 | 1 | -0/+5 |
|/ / / / |
|
* | | | | Merge pull request #3879 from matrix-org/matthew/fix-autojoin | Richard van der Hoff | 2018-09-18 | 1 | -0/+1 |
|\ \ \ \ |
|
| * | | | | don't ratelimit autojoins | Matthew Hodgson | 2018-09-15 | 1 | -0/+1 |
* | | | | | Reinstate missing null check | Richard van der Hoff | 2018-09-17 | 1 | -1/+1 |
* | | | | | Return a 404 when deleting unknown room alias | Richard van der Hoff | 2018-09-17 | 1 | -3/+16 |
|/ / / / |
|
* | | | | don't filter membership events based on history visibility (#3874) | Matthew Hodgson | 2018-09-14 | 1 | -8/+1 |
* | | | | show heroes if a room has a 'deleted' name/canonical_alias (#3851) | Matthew Hodgson | 2018-09-12 | 1 | -2/+15 |
* | | | | argh pep8 | Matthew Hodgson | 2018-09-12 | 1 | -1/+1 |
* | | | | correctly log gappy sync metrics | Matthew Hodgson | 2018-09-12 | 1 | -1/+1 |
* | | | | fix logline | Matthew Hodgson | 2018-09-12 | 1 | -1/+1 |
* | | | | Speed up lazy loading (#3827) | Matthew Hodgson | 2018-09-12 | 1 | -30/+88 |
* | | | | Don't send empty tags list down sync | Erik Johnston | 2018-09-06 | 1 | -0/+5 |
* | | | | Send existing room tags down sync on join | Erik Johnston | 2018-09-06 | 1 | -0/+8 |
* | | | | Merge pull request #3795 from matrix-org/erikj/faster_sync_state | Amber Brown | 2018-09-07 | 1 | -8/+8 |
|\ \ \ \ |
|
| * | | | | User iter* during sync state calculations | Erik Johnston | 2018-09-05 | 1 | -8/+8 |
| |/ / / |
|
* / / / | Port handlers/ to Python 3 (#3803) | Amber Brown | 2018-09-07 | 6 | -19/+22 |
|/ / / |
|
* | | | Merge pull request #3737 from matrix-org/erikj/remove_redundant_state_func | Erik Johnston | 2018-09-03 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | Remove unnecessary resolve_events_with_state_map | Erik Johnston | 2018-08-22 | 1 | -1/+1 |
| | |/
| |/| |
|
* | | | fix bug where preserved threepid user comes to sign up and server is mau blocked | Neil Johnson | 2018-08-31 | 1 | -1/+2 |
* | | | don't return non-LL-member state in incremental sync state blocks (#3760) | Matthew Hodgson | 2018-08-28 | 1 | -1/+8 |
|/ / |
|
* | | Merge pull request #3659 from matrix-org/erikj/split_profiles | Erik Johnston | 2018-08-22 | 2 | -9/+26 |
|\ \ |
|
| * | | Rename WorkerProfileHandler to BaseProfileHandler | Erik Johnston | 2018-08-22 | 1 | -3/+10 |
| * | | Add assert to ensure handler is only run on master | Erik Johnston | 2018-08-22 | 1 | -0/+2 |
| * | | Remove redundant vars | Erik Johnston | 2018-08-22 | 1 | -3/+0 |
| * | | Add some fixmes | Erik Johnston | 2018-08-17 | 1 | -0/+4 |
| * | | Call UserDirectoryHandler methods directly | Erik Johnston | 2018-08-17 | 1 | -21/+5 |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof... | Erik Johnston | 2018-08-17 | 15 | -84/+409 |
| |\ \ |
|
| * | | | Split ProfileHandler into master and worker | Erik Johnston | 2018-08-17 | 1 | -7/+14 |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof... | Erik Johnston | 2018-08-09 | 6 | -55/+112 |
| |\ \ \ |
|
| * | | | | Allow profile changes to happen on workers | Erik Johnston | 2018-08-07 | 1 | -5/+21 |
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s... | Erik Johnston | 2018-08-20 | 16 | -109/+445 |
|\ \ \ \ \ |
|
| * \ \ \ \ | Merge pull request #3710 from matrix-org/rav/logcontext_for_pusher_updates | Richard van der Hoff | 2018-08-17 | 3 | -17/+11 |
| |\ \ \ \ \ |
|
| | * | | | | | Fix logcontexts for running pushers | Richard van der Hoff | 2018-08-17 | 3 | -17/+11 |
| * | | | | | | Integrate presence from hotfixes (#3694) | Amber Brown | 2018-08-18 | 3 | -8/+25 |
| | |_|_|/ /
| |/| | | | |
|
| * | | | | | block event creation and room creation on hitting resource limits | Neil Johnson | 2018-08-16 | 2 | -1/+9 |
| |/ / / / |
|
| * | | | | lazyload aware /messages (#3589) | Matthew Hodgson | 2018-08-16 | 1 | -1/+34 |
| * | | | | initial cut at a room summary API (#3574) | Matthew Hodgson | 2018-08-16 | 1 | -10/+149 |
| * | | | | Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+maus | Neil Johnson | 2018-08-15 | 1 | -2/+2 |
| |\ \ \ \ |
|
| | * \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by... | Neil Johnson | 2018-08-15 | 4 | -31/+108 |
| | |\ \ \ \ |
|
| | * | | | | | support admin_email config and pass through into blocking errors, return Auth... | Neil Johnson | 2018-08-14 | 1 | -1/+0 |
| | * | | | | | fix off by 1s on mau | Neil Johnson | 2018-08-14 | 1 | -2/+2 |
| | * | | | | | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/... | Neil Johnson | 2018-08-14 | 1 | -10/+0 |
| | |\ \ \ \ \ |
|
| | * \ \ \ \ \ | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/... | Neil Johnson | 2018-08-14 | 1 | -13/+14 |
| | |\ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ | Merge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into nei... | Neil Johnson | 2018-08-14 | 1 | -2/+11 |
| | |\ \ \ \ \ \ \ |
|
| * | | | | | | | | | speed up /members and add at= and membership params (#3568) | Matthew Hodgson | 2018-08-15 | 1 | -12/+76 |
| | |_|_|_|/ / / /
| |/| | | | | | | |
|
| * | | | | | | | | Merge pull request #3653 from matrix-org/erikj/split_federation | Erik Johnston | 2018-08-15 | 1 | -17/+57 |
| |\ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fede... | Erik Johnston | 2018-08-15 | 14 | -27/+78 |
| | |\ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | Use federation handler function rather than duplicate | Erik Johnston | 2018-08-15 | 1 | -7/+7 |
| | * | | | | | | | | | Move clean_room_for_join to master | Erik Johnston | 2018-08-09 | 1 | -2/+14 |
| | * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fede... | Erik Johnston | 2018-08-09 | 6 | -55/+112 |
| | |\ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|/ /
| | | |/| | | | | | | |
|
| | * | | | | | | | | | Add EDU/query handling over replication | Erik Johnston | 2018-08-06 | 1 | -11/+13 |
| | * | | | | | | | | | Add replication APIs for persisting federation events | Erik Johnston | 2018-08-06 | 1 | -9/+35 |
| | | |_|_|_|_|_|/ /
| | |/| | | | | | | |
|
| * | | | | | | | | | Merge pull request #3687 from matrix-org/neilj/admin_email | Neil Johnson | 2018-08-15 | 1 | -14/+4 |
| |\ \ \ \ \ \ \ \ \
| | |_|_|/ / / / / /
| |/| | | | | | | | |
|
| | * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_email | Neil Johnson | 2018-08-14 | 1 | -2/+11 |
| | |\ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | remove blank line | Neil Johnson | 2018-08-14 | 1 | -1/+0 |
| | | |_|_|_|_|_|/ /
| | |/| | | | | | | |
|
| | * | | | | | | | | Update register.py | Neil Johnson | 2018-08-14 | 1 | -10/+0 |
| | | |_|_|_|_|/ /
| | |/| | | | | | |
|
| | * | | | | | | | support admin_email config and pass through into blocking errors, return Auth... | Neil Johnson | 2018-08-13 | 1 | -13/+14 |
| | | |_|_|/ / /
| | |/| | | | | |
|
| * | | | | | | | Merge pull request #3667 from matrix-org/erikj/fixup_unbind | Erik Johnston | 2018-08-15 | 3 | -14/+51 |
| |\ \ \ \ \ \ \
| | |_|/ / / / /
| |/| | | | | | |
|
| | * | | | | | | Log when we 3pid/unbind request fails | Erik Johnston | 2018-08-09 | 1 | -0/+2 |
| | * | | | | | | Don't fail requests to unbind 3pids for non supporting ID servers | Erik Johnston | 2018-08-08 | 3 | -14/+49 |
| | | |_|_|_|/
| | |/| | | | |
|
| * | | | | | | Merge pull request #3670 from matrix-org/neilj/mau_sync_block | Neil Johnson | 2018-08-14 | 1 | -2/+11 |
| |\ \ \ \ \ \
| | |_|/ / / /
| |/| | | | /
| | | |_|_|/
| | |/| | | |
|
| | * | | | | only block on sync where user is not part of the mau cohort | Neil Johnson | 2018-08-09 | 1 | -1/+6 |
| | * | | | | block sync if auth checks fail | Neil Johnson | 2018-08-09 | 1 | -7/+5 |
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_b... | Neil Johnson | 2018-08-09 | 5 | -34/+69 |
| | |\ \ \ \
| | | | |_|/
| | | |/| | |
|
| | * | | | | sync auth blocking | Neil Johnson | 2018-08-08 | 1 | -5/+11 |
| * | | | | | Revert "support admin_email config and pass through into blocking errors, ret... | Neil Johnson | 2018-08-13 | 1 | -14/+13 |
| * | | | | | support admin_email config and pass through into blocking errors, return Auth... | Neil Johnson | 2018-08-13 | 1 | -13/+14 |
| * | | | | | Run tests under PostgreSQL (#3423) | Amber Brown | 2018-08-13 | 1 | -0/+5 |
| * | | | | | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678) | Amber Brown | 2018-08-10 | 11 | -11/+11 |
| | |/ / /
| |/| | | |
|
* | | | | | Remove redundant room_version checks | Erik Johnston | 2018-08-20 | 1 | -1/+1 |
* | | | | | Revert spurious change | Erik Johnston | 2018-08-20 | 1 | -2/+2 |
* | | | | | Choose state algorithm based on room version | Erik Johnston | 2018-08-09 | 2 | -4/+9 |
|/ / / / |
|
* | | | | Merge pull request #3632 from matrix-org/erikj/refactor_repl_servlet | Erik Johnston | 2018-08-09 | 2 | -31/+21 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_r... | Erik Johnston | 2018-08-03 | 5 | -141/+210 |
| |\ \ \ |
|
| * | | | | Use new helper base class for membership requests | Erik Johnston | 2018-07-31 | 1 | -24/+17 |
| * | | | | Use new helper base class for ReplicationSendEventRestServlet | Erik Johnston | 2018-07-31 | 1 | -7/+4 |
* | | | | | Merge pull request #3664 from matrix-org/rav/federation_metrics | Richard van der Hoff | 2018-08-08 | 1 | -0/+10 |
|\ \ \ \ \ |
|
| * | | | | | more metrics for the federation and appservice senders | Richard van der Hoff | 2018-08-07 | 1 | -0/+10 |
| | |_|_|/
| |/| | | |
|
* | | | | | Merge pull request #3654 from matrix-org/rav/room_versions | Richard van der Hoff | 2018-08-08 | 2 | -3/+38 |
|\ \ \ \ \
| |_|_|_|/
|/| | | | |
|
| * | | | | Don't expose default_room_version as config opt | Richard van der Hoff | 2018-08-07 | 1 | -1/+2 |
| * | | | | include known room versions in outgoing make_joins | Richard van der Hoff | 2018-08-06 | 1 | -2/+11 |
| * | | | | Basic support for room versioning | Richard van der Hoff | 2018-08-03 | 1 | -1/+26 |
| | |_|/
| |/| | |
|
* | | | | Merge pull request #3633 from matrix-org/neilj/mau_tracker | Neil Johnson | 2018-08-08 | 2 | -21/+6 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | py3 fix | Neil Johnson | 2018-08-03 | 1 | -1/+1 |
| * | | | bug fixes | Neil Johnson | 2018-08-03 | 2 | -17/+6 |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_tracker | Neil Johnson | 2018-08-03 | 3 | -114/+140 |
| |\| | |
|
| * | | | do mau checks based on monthly_active_users table | Neil Johnson | 2018-08-02 | 2 | -12/+8 |
* | | | | Return M_NOT_FOUND when a profile could not be found. (#3596) | Will Hunt | 2018-08-03 | 1 | -31/+58 |
| |/ /
|/| | |
|
* | | | Merge pull request #3639 from matrix-org/rav/refactor_error_handling | Richard van der Hoff | 2018-08-02 | 1 | -17/+8 |
|\ \ \ |
|
| * | | | Kill off MatrixCodeMessageException | Richard van der Hoff | 2018-08-01 | 1 | -17/+8 |
* | | | | Merge branch 'master' into develop | Richard van der Hoff | 2018-08-02 | 2 | -10/+44 |
|\ \ \ \ |
|
| * | | | | Check room visibility for /event/ requests | Richard van der Hoff | 2018-08-02 | 1 | -4/+21 |
| * | | | | Avoid extra db lookups | Richard van der Hoff | 2018-08-02 | 1 | -27/+11 |
| * | | | | Validation for events/rooms in fed requests | Richard van der Hoff | 2018-08-02 | 1 | -1/+34 |
* | | | | | Merge pull request #3621 from matrix-org/erikj/split_fed_store | Erik Johnston | 2018-08-02 | 1 | -87/+88 |
|\ \ \ \ \
| |_|_|/ /
|/| | | | |
|
| * | | | | update docs | Erik Johnston | 2018-08-01 | 1 | -3/+5 |
| * | | | | _persist_auth_tree no longer returns anything | Erik Johnston | 2018-08-01 | 1 | -1/+1 |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fed_... | Erik Johnston | 2018-07-30 | 6 | -30/+177 |
| |\ \ \ \
| | | |_|/
| | |/| | |
|
| * | | | | Split out DB writes in federation handler | Erik Johnston | 2018-07-25 | 1 | -83/+82 |
* | | | | | Merge pull request #3630 from matrix-org/neilj/mau_sign_in_log_in_limits | Neil Johnson | 2018-08-01 | 2 | -3/+35 |
|\ \ \ \ \
| |_|_|_|/
|/| | | | |
|
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sign_i... | Neil Johnson | 2018-08-01 | 1 | -14/+14 |
| |\ \ \ \ |
|
| * | | | | | count_monthly_users() async | Neil Johnson | 2018-08-01 | 1 | -4/+7 |
| * | | | | | make count_monthly_users async synapse/handlers/auth.py | Neil Johnson | 2018-08-01 | 1 | -4/+5 |
| * | | | | | coding style | Neil Johnson | 2018-07-31 | 1 | -1/+2 |
| * | | | | | limit register and sign in on number of monthly users | Neil Johnson | 2018-07-30 | 2 | -2/+29 |
| | |_|/ /
| |/| | | |
|
* | | | | | Python 3: Convert some unicode/bytes uses (#3569) | Amber Brown | 2018-08-02 | 2 | -10/+21 |
| |/ / /
|/| | | |
|
* | | | | rename replication_layer to federation_client | Richard van der Hoff | 2018-07-31 | 1 | -14/+14 |
|/ / / |
|
* | | | make /context lazyload & filter aware (#3567) | Matthew Hodgson | 2018-07-27 | 2 | -4/+22 |
* | | | Merge pull request #3391 from t3chguy/t3chguy/default_inviter_display_name_3pid | Richard van der Hoff | 2018-07-27 | 1 | -0/+4 |
|\ \ \ |
|
| * \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into t3chguy/default_... | Michael Telatynski | 2018-07-24 | 31 | -1534/+3975 |
| |\ \ \ |
|
| * | | | | if inviter_display_name == ""||None then default to inviter MXID | Michael Telatynski | 2018-06-13 | 1 | -0/+4 |
* | | | | | Deduplicate redundant lazy-loaded members (#3331) | Matthew Hodgson | 2018-07-26 | 1 | -25/+62 |
* | | | | | Fix some looping_call calls which were broken in #3604 | Richard van der Hoff | 2018-07-26 | 1 | -1/+1 |
* | | | | | Merge pull request #2970 from matrix-org/matthew/filter_members | Matthew Hodgson | 2018-07-26 | 1 | -14/+102 |
|\ \ \ \ \ |
|
| * \ \ \ \ | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-25 | 3 | -13/+21 |
| |\ \ \ \ \
| | | |_|/ /
| | |/| | | |
|
| * | | | | | clarify comment on p_ids | Matthew Hodgson | 2018-07-24 | 1 | -1/+2 |
| * | | | | | rather than adding ll_ids, remove them from p_ids | Matthew Hodgson | 2018-07-24 | 1 | -5/+6 |
| * | | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-24 | 6 | -282/+307 |
| |\ \ \ \ \ |
|
| * | | | | | | incorporate more review | Matthew Hodgson | 2018-07-24 | 1 | -3/+9 |
| * | | | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-23 | 4 | -43/+77 |
| |\ \ \ \ \ \ |
|
| * | | | | | | | incorporate review | Matthew Hodgson | 2018-07-23 | 1 | -40/+27 |
| * | | | | | | | incorporate review | Matthew Hodgson | 2018-07-19 | 1 | -17/+27 |
| * | | | | | | | add a filtered_types param to limit filtering to specific types | Matthew Hodgson | 2018-07-19 | 1 | -29/+36 |
| * | | | | | | | merge develop pydoc for _get_state_for_groups | Matthew Hodgson | 2018-07-19 | 30 | -416/+441 |
| |\ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-06-10 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-06-04 | 11 | -30/+45 |
| |\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | more comments | Matthew Hodgson | 2018-06-04 | 1 | -0/+7 |
| * | | | | | | | | | | add pydoc | Matthew Hodgson | 2018-05-29 | 1 | -5/+13 |
| * | | | | | | | | | | merge develop | Matthew Hodgson | 2018-05-29 | 20 | -472/+970 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | make lazy_load_members configurable in filters | Matthew Hodgson | 2018-03-19 | 1 | -9/+9 |
| * | | | | | | | | | | | reshuffle todo & comments | Matthew Hodgson | 2018-03-19 | 1 | -2/+10 |
| * | | | | | | | | | | | only get member state IDs for incremental syncs if we're filtering | Matthew Hodgson | 2018-03-18 | 1 | -5/+5 |
| * | | | | | | | | | | | remove debug | Matthew Hodgson | 2018-03-16 | 1 | -4/+0 |
| * | | | | | | | | | | | fix tsm search again | Matthew Hodgson | 2018-03-16 | 1 | -5/+4 |
| * | | | | | | | | | | | add state_ids for timeline entries | Matthew Hodgson | 2018-03-16 | 1 | -4/+14 |
| * | | | | | | | | | | | simplify timeline_start_members | Matthew Hodgson | 2018-03-16 | 1 | -14/+13 |
| * | | | | | | | | | | | make incr syncs work | Matthew Hodgson | 2018-03-16 | 1 | -3/+4 |
| * | | | | | | | | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-03-14 | 3 | -101/+293 |
| |\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | add copyright to nudge CI | Matthew Hodgson | 2018-03-14 | 1 | -1/+2 |
| * | | | | | | | | | | | | oops | Matthew Hodgson | 2018-03-13 | 1 | -1/+1 |
| * | | | | | | | | | | | | make it work | Matthew Hodgson | 2018-03-13 | 1 | -3/+3 |
| * | | | | | | | | | | | | merge proper fix to bug 2969 | Matthew Hodgson | 2018-03-13 | 13 | -73/+223 |
| |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | ensure we always include the members for a given timeline block | Matthew Hodgson | 2018-03-13 | 1 | -4/+32 |
| * | | | | | | | | | | | | | typos | Matthew Hodgson | 2018-03-11 | 1 | -2/+2 |
| * | | | | | | | | | | | | | WIP experiment in lazyloading room members | Matthew Hodgson | 2018-03-11 | 1 | -12/+31 |
* | | | | | | | | | | | | | | Fix a minor documentation typo in on_make_leave | Travis Ralston | 2018-07-25 | 1 | -1/+1 |
| |_|_|_|_|_|_|_|_|/ / / /
|/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | Fix updating of cached remote profiles | Richard van der Hoff | 2018-07-25 | 1 | -1/+8 |
* | | | | | | | | | | | | | Replace usage of get_current_toke with StreamToken.START | Erik Johnston | 2018-07-24 | 1 | -5/+7 |
| |_|_|_|_|_|_|_|_|_|/ /
|/| | | | | | | | | | | |
|
* | | | | | | | | | | | | Merge pull request #3586 from matrix-org/rav/optimise_resolve_state_groups | Richard van der Hoff | 2018-07-24 | 1 | -7/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|_|/ / /
|/| | | | | | | | | | | |
|
| * | | | | | | | | | | | Handle delta_ids being None in _update_context_for_auth_events | Richard van der Hoff | 2018-07-23 | 1 | -7/+6 |
| | |_|_|_|_|_|_|/ / /
| |/| | | | | | | | | |
|
* | | | | | | | | | | | Merge branch 'develop' into rav/logcontext_fixes | Richard van der Hoff | 2018-07-24 | 4 | -264/+282 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | Merge branch 'develop' into erikj/client_apis_move | Erik Johnston | 2018-07-24 | 4 | -32/+66 |
| |\| | | | | | | | | | |
|
| * | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/client_api... | Erik Johnston | 2018-07-23 | 2 | -11/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | Move PaginationHandler to its own file | Erik Johnston | 2018-07-20 | 2 | -240/+267 |
| * | | | | | | | | | | | | Move check_in_room_or_world_readable to Auth | Erik Johnston | 2018-07-20 | 1 | -34/+6 |
| * | | | | | | | | | | | | Move RoomContextHandler out of Handlers | Erik Johnston | 2018-07-18 | 2 | -3/+5 |