| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | Fix mergefail | David Baker | 2018-10-09 | 1 | -1/+1 |
* | | | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups | David Baker | 2018-10-09 | 4 | -9/+23 |
|\| | |
|
| * | | Fix userconsent on Python 3 (#3938) | Amber Brown | 2018-10-02 | 1 | -1/+1 |
| * | | Replaced all occurences of e.message with str(e) | Schnuffle | 2018-09-27 | 1 | -1/+1 |
| * | | Implement 'event_format' filter param in /sync | Richard van der Hoff | 2018-09-04 | 1 | -0/+1 |
| * | | assert rather than warn hhs-4 | Neil Johnson | 2018-08-31 | 1 | -3/+2 |
| * | | move threepid checker to config, add missing yields | Neil Johnson | 2018-08-31 | 1 | -2/+11 |
| * | | fix reference to is_threepid_reserved | Neil Johnson | 2018-08-31 | 1 | -1/+1 |
| * | | ensure post registration auth checks do not fail erroneously | Neil Johnson | 2018-08-31 | 1 | -5/+2 |
| * | | fix bug where preserved threepid user comes to sign up and server is mau blocked | Neil Johnson | 2018-08-31 | 1 | -1/+9 |
| * | | Change admin_uri to admin_contact in config and errors | Erik Johnston | 2018-08-24 | 2 | -5/+5 |
* | | | try to make flake8 and isort happy | Hubert Chathi | 2018-09-06 | 1 | -0/+1 |
* | | | Merge branch 'develop' into e2e_backups | Hubert Chathi | 2018-08-24 | 4 | -12/+113 |
|\| | |
|
| * | | Implement trail users | Erik Johnston | 2018-08-23 | 1 | -1/+5 |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... | Erik Johnston | 2018-08-22 | 3 | -11/+15 |
| |\ \ |
|
| | * \ | Merge pull request #3673 from matrix-org/erikj/refactor_state_handler | Erik Johnston | 2018-08-22 | 1 | -2/+7 |
| | |\ \ |
|
| | | * \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s... | Erik Johnston | 2018-08-20 | 2 | -8/+48 |
| | | |\ \ |
|
| | | * | | | Add constants for room versions | Erik Johnston | 2018-08-09 | 1 | -2/+7 |
| | * | | | | Port over enough to get some sytests running on Python 3 (#3668) | Amber Brown | 2018-08-20 | 2 | -8/+8 |
| | | |/ /
| | |/| | |
|
| * | | | | Update notice format | Erik Johnston | 2018-08-22 | 1 | -2/+4 |
| * | | | | rename error code | Neil Johnson | 2018-08-18 | 2 | -4/+4 |
| * | | | | special case server_notices_mxid | Neil Johnson | 2018-08-18 | 1 | -0/+6 |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... | Neil Johnson | 2018-08-17 | 2 | -6/+28 |
| |\| | | |
|
| | * | | | Merge branch 'develop' into neilj/limit_exceeded_error | Neil Johnson | 2018-08-17 | 1 | -1/+2 |
| | |\ \ \ |
|
| | * | | | | add new error type ResourceLimit | Neil Johnson | 2018-08-16 | 2 | -6/+27 |
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... | Neil Johnson | 2018-08-17 | 1 | -1/+1 |
| |\ \ \ \ \
| | | |/ / /
| | |/| | | |
|
| | * | | | | call reap on start up and fix under reaping bug | Neil Johnson | 2018-08-16 | 1 | -1/+1 |
| | |/ / / |
|
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... | Neil Johnson | 2018-08-15 | 2 | -9/+18 |
| |\| | | |
|
| | * | | | clean up AuthError | Neil Johnson | 2018-08-15 | 1 | -7/+3 |
| | * | | | update error codes for resource limiting | Neil Johnson | 2018-08-15 | 1 | -2/+1 |
| | * | | | replace admin_email with admin_uri for greater flexibility | Neil Johnson | 2018-08-15 | 2 | -7/+7 |
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_email | Neil Johnson | 2018-08-14 | 1 | -1/+11 |
| | |\ \ \ |
|
| | | * | | | make comments clearer | Neil Johnson | 2018-08-14 | 1 | -1/+2 |
| | * | | | | support admin_email config and pass through into blocking errors, return Auth... | Neil Johnson | 2018-08-13 | 2 | -4/+17 |
| | * | | | | Revert "support admin_email config and pass through into blocking errors, ret... | Neil Johnson | 2018-08-13 | 2 | -17/+4 |
| | * | | | | support admin_email config and pass through into blocking errors, return Auth... | Neil Johnson | 2018-08-13 | 2 | -4/+17 |
| | | |/ /
| | |/| | |
|
| * | | | | add new event types | Neil Johnson | 2018-08-15 | 1 | -0/+1 |
| * | | | | support server notice state events for resource limits | Neil Johnson | 2018-08-14 | 1 | -0/+2 |
| | |/ /
| |/| | |
|
| * | | | rename _user_last_seen_monthly_active | Neil Johnson | 2018-08-09 | 1 | -1/+1 |
| * | | | fix errant parenthesis | Neil Johnson | 2018-08-09 | 1 | -1/+1 |
| * | | | only block on sync where user is not part of the mau cohort | Neil Johnson | 2018-08-09 | 1 | -2/+11 |
| |/ / |
|
| * | | fix pep8 too many lines | Neil Johnson | 2018-08-08 | 1 | -1/+0 |
| * | | Merge branch 'develop' into neilj/disable_hs | Neil Johnson | 2018-08-08 | 2 | -0/+34 |
| |\ \ |
|
| | * \ | Merge pull request #3654 from matrix-org/rav/room_versions | Richard van der Hoff | 2018-08-08 | 2 | -0/+33 |
| | |\ \ |
|
| | | * | | Don't expose default_room_version as config opt | Richard van der Hoff | 2018-08-07 | 1 | -0/+3 |
| | | * | | Enforce compatibility when processing make_join requests | Richard van der Hoff | 2018-08-03 | 1 | -0/+22 |
| | | * | | Basic support for room versioning | Richard van der Hoff | 2018-08-03 | 2 | -0/+8 |
| | | |/ |
|
| * | | | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/... | Neil Johnson | 2018-08-06 | 1 | -4/+1 |
| |\| | |
|
| | * | | update comments to reflect new sig | Neil Johnson | 2018-08-06 | 1 | -4/+1 |
| * | | | disable HS from config | Neil Johnson | 2018-08-04 | 2 | -0/+5 |
| |/ / |
|
| * | | wip commit - tests failing | Neil Johnson | 2018-08-03 | 1 | -2/+4 |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_tracker | Neil Johnson | 2018-08-03 | 1 | -53/+53 |
| |\| |
|
| * | | do mau checks based on monthly_active_users table | Neil Johnson | 2018-08-02 | 1 | -0/+13 |
| * | | insertion into monthly_active_users | Neil Johnson | 2018-08-02 | 1 | -1/+1 |
* | | | blindly incorporate PR review - needs testing & fixing | Matthew Hodgson | 2018-08-12 | 1 | -3/+8 |
* | | | implement /room_keys/version too (untested) | Matthew Hodgson | 2018-08-12 | 1 | -0/+25 |
| |/
|/| |
|
* | | Merge pull request #3639 from matrix-org/rav/refactor_error_handling | Richard van der Hoff | 2018-08-02 | 1 | -53/+53 |
|\ \
| |/
|/| |
|
| * | Kill off MatrixCodeMessageException | Richard van der Hoff | 2018-08-01 | 1 | -11/+0 |
| * | Refactor code for turning HttpResponseException into SynapseError | Richard van der Hoff | 2018-08-01 | 1 | -31/+53 |
| * | Be more careful which errors we send back over the C-S API | Richard van der Hoff | 2018-08-01 | 1 | -11/+0 |
* | | Merge pull request #3630 from matrix-org/neilj/mau_sign_in_log_in_limits | Neil Johnson | 2018-08-01 | 1 | -0/+1 |
|\ \
| |/
|/| |
|
| * | limit register and sign in on number of monthly users | Neil Johnson | 2018-07-30 | 1 | -0/+1 |
* | | Python 3: Convert some unicode/bytes uses (#3569) | Amber Brown | 2018-08-02 | 1 | -2/+2 |
|/ |
|
* | Deduplicate redundant lazy-loaded members (#3331) | Matthew Hodgson | 2018-07-26 | 1 | -0/+9 |
* | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-24 | 1 | -0/+34 |
|\ |
|
| * | Merge branch 'develop' into erikj/client_apis_move | Erik Johnston | 2018-07-24 | 1 | -2/+4 |
| |\ |
|
| * | | Move check_in_room_or_world_readable to Auth | Erik Johnston | 2018-07-20 | 1 | -0/+34 |
* | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-23 | 1 | -2/+4 |
|\ \ \
| | |/
| |/| |
|
| * | | Use new getters | Erik Johnston | 2018-07-23 | 1 | -2/+4 |
| |/ |
|
* | | merge develop pydoc for _get_state_for_groups | Matthew Hodgson | 2018-07-19 | 5 | -75/+86 |
|\| |
|
| * | Make auth & transactions more testable (#3499) | Amber Brown | 2018-07-14 | 1 | -62/+62 |
| * | run isort | Amber Brown | 2018-07-09 | 4 | -13/+14 |
| * | Implementation of server_acls | Richard van der Hoff | 2018-07-04 | 1 | -0/+2 |
| * | add ip_range_whitelist parameter to limit where ASes can connect from | Matthew Hodgson | 2018-06-28 | 1 | -0/+6 |
| * | Attempt to be more performant on PyPy (#3462) | Amber Brown | 2018-06-28 | 2 | -2/+4 |
| * | Don't print invalid access tokens in the logs | Travis Ralston | 2018-06-24 | 1 | -2/+2 |
| * | Refactor get_send_level to take a power_levels event | Richard van der Hoff | 2018-06-14 | 1 | -1/+1 |
* | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-06-04 | 2 | -2/+4 |
|\| |
|
| * | Consistently use six's iteritems and wrap lazy keys/values in list() if they'... | Amber Brown | 2018-05-31 | 2 | -2/+4 |
* | | add lazy_load_members to the filter json schema | Matthew Hodgson | 2018-05-29 | 1 | -1/+4 |
* | | merge develop | Matthew Hodgson | 2018-05-29 | 5 | -10/+94 |
|\| |
|
| * | Merge remote-tracking branch 'origin/develop' into 3218-official-prom | Amber Brown | 2018-05-28 | 1 | -0/+1 |
| |\ |
|
| | * | custom error code for not leaving server notices room | Richard van der Hoff | 2018-05-22 | 1 | -0/+1 |
| * | | Merge remote-tracking branch 'origin/develop' into 3218-official-prom | Amber Brown | 2018-05-22 | 2 | -1/+79 |
| |\| |
|
| | * | Reject attempts to send event before privacy consent is given | Richard van der Hoff | 2018-05-22 | 2 | -1/+79 |
| * | | replacing portions | Amber Brown | 2018-05-21 | 1 | -1/+1 |
| |/ |
|
| * | Apply some limits to depth to counter abuse | Richard van der Hoff | 2018-05-01 | 1 | -0/+3 |
| * | Use six.itervalues in some places | Adrian Tschira | 2018-04-15 | 1 | -1/+2 |
| * | Add b prefixes to some strings that are bytes in py3 | Adrian Tschira | 2018-04-04 | 1 | -5/+5 |
| * | Use simplejson throughout | Richard van der Hoff | 2018-03-29 | 1 | -1/+2 |
| * | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2018-03-19 | 1 | -1/+1 |
| |\ |
|
| | * | Replace ujson with simplejson | Erik Johnston | 2018-03-15 | 1 | -1/+1 |
* | | | make lazy_load_members configurable in filters | Matthew Hodgson | 2018-03-19 | 1 | -0/+6 |
|/ / |
|
* | | Add federation_domain_whitelist option (#2820) | Matthew Hodgson | 2018-01-22 | 1 | -0/+26 |
* | | add registrations_require_3pid | Matthew Hodgson | 2018-01-19 | 1 | -0/+1 |
|/ |
|
* | Refactor UI auth implementation | Richard van der Hoff | 2017-12-05 | 1 | -0/+16 |
* | Improve comments on get_user_by_access_token | Richard van der Hoff | 2017-11-29 | 1 | -1/+5 |
* | Add a config option to block all room invites (#2457) | Richard van der Hoff | 2017-09-19 | 1 | -0/+8 |
* | Merge pull request #2309 from matrix-org/erikj/user_ip_repl | Erik Johnston | 2017-07-06 | 1 | -1/+1 |
|\ |
|
| * | Fix up | Erik Johnston | 2017-06-27 | 1 | -1/+1 |
* | | Cache macaroon parse and validation | Erik Johnston | 2017-06-29 | 1 | -13/+60 |
|/ |
|
* | Batch upsert user ips | Erik Johnston | 2017-06-27 | 1 | -2/+1 |
* | Change is_host_joined to use current_state table | Erik Johnston | 2017-06-09 | 1 | -11/+2 |
* | Use CodeMessageException subclass instead | David Baker | 2017-04-25 | 1 | -0/+11 |
* | use jsonschema.FormatChecker for RoomID and UserID strings | pik | 2017-03-23 | 1 | -18/+27 |
* | Add valid filter tests, flake8, fix typo | pik | 2017-03-23 | 1 | -5/+6 |
* | check_valid_filter using JSONSchema | pik | 2017-03-23 | 1 | -93/+158 |
* | Fix a couple of logcontext leaks | Richard van der Hoff | 2017-03-23 | 1 | -3/+2 |
* | Comment | Erik Johnston | 2017-03-15 | 1 | -1/+3 |
* | Comment | Erik Johnston | 2017-03-15 | 1 | -0/+3 |
* | Format presence events on the edges instead of reformatting them multiple times | Erik Johnston | 2017-03-15 | 1 | -10/+22 |
* | Merge pull request #1994 from matrix-org/dbkr/msisdn_signin_2 | Erik Johnston | 2017-03-15 | 1 | -0/+2 |
|\ |
|
| * | Support registration / login with phone number | David Baker | 2017-03-13 | 1 | -0/+2 |
* | | Address review comments | Richard van der Hoff | 2017-03-14 | 1 | -5/+14 |
* | | re-refactor exception heirarchy | Richard van der Hoff | 2017-03-14 | 1 | -16/+14 |
* | | Fix routing loop when fetching remote media | Richard van der Hoff | 2017-03-13 | 1 | -7/+52 |
|/ |
|
* | Revert "Support registration & login with phone number" | Erik Johnston | 2017-03-13 | 1 | -2/+0 |
* | WIP support for msisdn 3pid proxy methods | David Baker | 2017-02-14 | 1 | -0/+2 |
* | Remove a few aspirational but unused constants | David Baker | 2017-02-08 | 1 | -3/+0 |
* | Change resolve_state_groups call site logging to DEBUG | Erik Johnston | 2017-01-17 | 1 | -1/+1 |
* | Remove unused function | Erik Johnston | 2017-01-13 | 1 | -3/+0 |
* | Split event auth code into seperate module | Erik Johnston | 2017-01-13 | 1 | -645/+9 |
* | Split out static auth methods from Auth object | Erik Johnston | 2017-01-10 | 1 | -419/+495 |
* | Fix flake8 and update changelog v0.18.6-rc3 | Mark Haines | 2017-01-05 | 1 | -1/+1 |
* | add logging for all the places we call resolve_state_groups. my kingdom for a... | Matthew Hodgson | 2017-01-05 | 1 | -0/+1 |
* | Prevent user tokens being used as guest tokens (#1675) | Richard van der Hoff | 2016-12-06 | 1 | -15/+36 |
* | Rip out more refresh_token code | Richard van der Hoff | 2016-11-30 | 1 | -3/+2 |
* | Merge pull request #1656 from matrix-org/rav/remove_time_caveat | Richard van der Hoff | 2016-11-30 | 1 | -3/+13 |
|\ |
|
| * | Comments | Richard van der Hoff | 2016-11-30 | 1 | -3/+9 |
| * | Stop putting a time caveat on access tokens | Richard van der Hoff | 2016-11-29 | 1 | -0/+4 |
* | | Merge pull request #1653 from matrix-org/rav/guest_e2e | Richard van der Hoff | 2016-11-29 | 1 | -1/+5 |
|\ \
| |/
|/| |
|
| * | Give guest users a device_id | Richard van der Hoff | 2016-11-25 | 1 | -1/+5 |
* | | Merge pull request #1655 from matrix-org/rav/remove_redundant_macaroon_checks | Richard van der Hoff | 2016-11-25 | 1 | -26/+8 |
|\ \ |
|
| * | | Remove redundant list of known caveat prefixes | Richard van der Hoff | 2016-11-24 | 1 | -26/+8 |
| |/ |
|
* / | Return early on /sync code paths if a '*' filter is used | Kegan Dougal | 2016-11-22 | 1 | -0/+29 |
|/ |
|
* | Merge pull request #1638 from matrix-org/kegan/sync-event-fields | Kegsay | 2016-11-22 | 1 | -0/+16 |
|\ |
|
| * | Glue only_event_fields into the sync rest servlet | Kegan Dougal | 2016-11-22 | 1 | -0/+1 |
| * | Move event_fields filtering to serialize_event | Kegan Dougal | 2016-11-21 | 1 | -55/+1 |
| * | Add filter_event_fields and filter_field to FilterCollection | Kegan Dougal | 2016-11-21 | 1 | -0/+69 |
* | | Fail with a coherent error message if `/sync?filter=` is invalid | Kegan Dougal | 2016-11-21 | 1 | -0/+1 |
|/ |
|
* | Merge pull request #1098 from matrix-org/markjh/bearer_token | Mark Haines | 2016-10-25 | 1 | -9/+37 |
|\ |
|
| * | Fix unit tests | Mark Haines | 2016-09-12 | 1 | -1/+1 |
| * | Allow clients to supply access_tokens as headers | Mark Haines | 2016-09-09 | 1 | -9/+37 |
* | | Merge pull request #1175 from matrix-org/luke/feature-configurable-as-rate-li... | Luke Barnard | 2016-10-20 | 1 | -7/+10 |
|\ \ |
|
| * | | Closing brace on following line | Luke Barnard | 2016-10-20 | 1 | -1/+2 |
| * | | as_user->app_service, less redundant comments, better positioned comments | Luke Barnard | 2016-10-20 | 1 | -3/+3 |
| * | | flake8 | Luke Barnard | 2016-10-20 | 1 | -1/+3 |
| * | | Use real AS object by passing it through the requester | Luke Barnard | 2016-10-20 | 1 | -7/+7 |
* | | | Check whether to ratelimit sooner to avoid work | Erik Johnston | 2016-10-19 | 1 | -5/+9 |
|/ / |
|
* | | Merge pull request #1157 from Rugvip/nolimit | Erik Johnston | 2016-10-11 | 1 | -4/+3 |
|\ \ |
|
| * | | storage/appservice: make appservice methods only relying on the cache synchro... | Patrik Oldsberg | 2016-10-06 | 1 | -4/+3 |
* | | | api/auth: fix for not being allowed to set your own state_key | Patrik Oldsberg | 2016-09-30 | 1 | -10/+0 |
|/ / |
|
* | | Update comments | Erik Johnston | 2016-09-22 | 1 | -2/+3 |
* | | Add comments | Erik Johnston | 2016-09-22 | 1 | -0/+3 |
* | | Shuffle things around to make unit tests work | Erik Johnston | 2016-09-22 | 1 | -14/+15 |
* | | Allow invites via 3pid to bypass sender sig check | Erik Johnston | 2016-09-22 | 1 | -1/+16 |
|/ |
|
* | Add helper function for getting access_tokens from requests | Mark Haines | 2016-09-09 | 1 | -7/+51 |
* | Handle the fact that workers can't generate state groups | Erik Johnston | 2016-08-31 | 1 | -2/+4 |
* | Correctly handle the difference between prev and current state | Erik Johnston | 2016-08-31 | 1 | -2/+2 |
* | Cache check_host_in_room | Erik Johnston | 2016-08-26 | 1 | -14/+6 |
* | Add measure on check_host_in_room | Erik Johnston | 2016-08-26 | 1 | -11/+12 |
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_ids | Erik Johnston | 2016-08-26 | 2 | -1/+5 |
|\ |
|
| * | Move ThirdPartyEntityKind into api.constants so the expectation becomes that ... | Paul "LeoNerd" Evans | 2016-08-25 | 1 | -0/+5 |
| * | APP_SERVICE_PREFIX is never used; don't bother | Paul "LeoNerd" Evans | 2016-08-25 | 1 | -1/+0 |
* | | Pull out full state less | Erik Johnston | 2016-08-25 | 1 | -6/+7 |
* | | Replace context.current_state with context.current_state_ids | Erik Johnston | 2016-08-25 | 1 | -24/+44 |
|/ |
|
* | Fix login with m.login.token | Richard van der Hoff | 2016-08-08 | 1 | -15/+30 |
* | Merge pull request #952 from matrix-org/markjh/more_fixes | Mark Haines | 2016-07-26 | 1 | -0/+4 |
|\ |
|
| * | Check if the user is banned when handling 3pid invites | Mark Haines | 2016-07-26 | 1 | -0/+4 |
* | | Add `create_requester` function | Richard van der Hoff | 2016-07-26 | 1 | -13/+11 |
|/ |
|
* | Record device_id in client_ips | Richard van der Hoff | 2016-07-20 | 1 | -6/+23 |
* | More doc-comments | Richard van der Hoff | 2016-07-20 | 1 | -3/+2 |
* | Merge pull request #922 from matrix-org/erikj/file_api2 | Erik Johnston | 2016-07-20 | 1 | -3/+20 |
|\ |
|
| * | Add 'contains_url' to filter | Erik Johnston | 2016-07-14 | 1 | -3/+20 |
* | | Fix 500 ISE when sending alias event without a state_key | Mark Haines | 2016-07-15 | 1 | -0/+5 |
* | | Merge pull request #919 from matrix-org/erikj/auth_fix | Erik Johnston | 2016-07-15 | 1 | -1/+25 |
|\ \ |
|
| * | | Check sender signed event | Erik Johnston | 2016-07-14 | 1 | -2/+8 |
| * | | Check if alias event's state_key matches sender's domain | Erik Johnston | 2016-07-13 | 1 | -0/+11 |
| * | | Check creation event's room_id domain matches sender's | Erik Johnston | 2016-07-13 | 1 | -0/+7 |
* | | | Merge pull request #918 from negzi/bugfix_for_token_expiry | Erik Johnston | 2016-07-14 | 1 | -0/+3 |
|\ \ \
| |_|/
|/| | |
|
| * | | Bug fix: expire invalid access tokens | Negar Fazeli | 2016-07-13 | 1 | -0/+3 |
| |/ |
|
* / | Implement https://github.com/matrix-org/matrix-doc/pull/346/files | David Baker | 2016-07-08 | 1 | -0/+1 |
|/ |
|
* | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-07-08 | 1 | -5/+10 |
|\ |
|
| * | Fix bug where we did not correctly explode when multiple user_ids were set in... | Erik Johnston | 2016-07-07 | 1 | -5/+10 |
* | | requestToken update | David Baker | 2016-06-30 | 1 | -1/+2 |
|/ |
|
* | Working unsubscribe links going straight to the HS | David Baker | 2016-06-02 | 1 | -0/+7 |
* | Merge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribe | David Baker | 2016-06-02 | 1 | -0/+18 |
|\ |
|
| * | special case m.room.third_party_invite event auth to match invites, otherwise... | Matthew Hodgson | 2016-06-01 | 1 | -0/+18 |
* | | WIP on unsubscribing email notifs without logging in | David Baker | 2016-06-01 | 1 | -9/+16 |
|/ |
|
* | Spell "domain" correctly | Mark Haines | 2016-05-16 | 1 | -8/+8 |
* | Create user with expiry | Negi Fazeli | 2016-05-13 | 1 | -1/+2 |
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user | Erik Johnston | 2016-05-09 | 1 | -8/+8 |
|\ |
|
| * | Add and use get_domian_from_id | Erik Johnston | 2016-05-09 | 1 | -8/+8 |
* | | Implement basic ignore user | Erik Johnston | 2016-05-04 | 1 | -3/+5 |
|/ |
|
* | Measure Auth.check | Erik Johnston | 2016-04-13 | 1 | -47/+50 |
* | Don't auto log failed auth checks | Erik Johnston | 2016-04-13 | 1 | -53/+45 |
* | Add published room list edit API | Erik Johnston | 2016-03-21 | 1 | -4/+50 |
* | Send the user ID matching the guest access token, since there is no Matrix AP... | David Baker | 2016-03-07 | 1 | -2/+2 |
* | Allow third_party_signed to be specified on /join | Daniel Wagner-Hall | 2016-02-23 | 1 | -21/+36 |
* | Merge pull request #582 from matrix-org/erikj/presence | Erik Johnston | 2016-02-19 | 1 | -1/+0 |
|\ |
|
| * | Check presence state is a valid one | Erik Johnston | 2016-02-18 | 1 | -1/+0 |
* | | api/filtering: don't assume that event content will always be a dict | Patrik Oldsberg | 2016-02-17 | 1 | -1/+4 |
|/ |
|
* | Revert "Merge two of the room join codepaths" | Daniel Wagner-Hall | 2016-02-12 | 1 | -5/+0 |
* | Merge two of the room join codepaths | Daniel Wagner-Hall | 2016-02-12 | 1 | -0/+5 |
* | Fix up logcontexts | Erik Johnston | 2016-02-08 | 1 | -1/+3 |
* | Host /media/r0 as well as /media/v1 | Daniel Wagner-Hall | 2016-02-05 | 1 | -1/+2 |
* | Log more diagnostics for unrecognised access tokens | Daniel Wagner-Hall | 2016-02-02 | 1 | -0/+2 |
* | Fix flake8 warnings for new flake8 | Daniel Wagner-Hall | 2016-02-02 | 1 | -1/+1 |
* | Fix test | Erik Johnston | 2016-01-28 | 1 | -0/+5 |
* | Fix tests | Erik Johnston | 2016-01-25 | 1 | -1/+1 |
* | Move logic from rest/ to handlers/ | Erik Johnston | 2016-01-25 | 1 | -12/+10 |
* | Sanitize filters | Erik Johnston | 2016-01-22 | 1 | -21/+27 |
* | Don't error on AS non-ghost user use | Daniel Wagner-Hall | 2016-01-18 | 1 | -0/+2 |
* | Pull out app service user lookup | Daniel Wagner-Hall | 2016-01-18 | 1 | -31/+28 |
* | Require unbanning before other membership changes | Daniel Wagner-Hall | 2016-01-15 | 1 | -0/+1 |
* | M_INVALID_USERNAME to be consistent with the parameter name | David Baker | 2016-01-15 | 1 | -1/+1 |
* | Add specific error code for invalid user names. | David Baker | 2016-01-14 | 1 | -0/+1 |
* | Require AS users to be registered before use | Daniel Wagner-Hall | 2016-01-13 | 1 | -0/+5 |
* | Introduce a Requester object | Daniel Wagner-Hall | 2016-01-11 | 1 | -3/+5 |
* | copyrights | Matthew Hodgson | 2016-01-07 | 6 | -6/+6 |
* | Guest users must be joined to a room to see it in /sync | Mark Haines | 2016-01-06 | 2 | -28/+0 |
* | Allow guests to upgrade their accounts | Daniel Wagner-Hall | 2016-01-05 | 1 | -3/+3 |
* | Include the list of bad room ids in the error | Mark Haines | 2015-12-22 | 1 | -0/+16 |
* | Merge remote-tracking branch 'origin/develop' into markjh/guest_access | Mark Haines | 2015-12-22 | 1 | -0/+5 |
|\ |
|
| * | Add top level filters for filtering by room id | Mark Haines | 2015-12-22 | 1 | -33/+35 |
* | | Allow guest access if the user provides a list of rooms in the filter | Mark Haines | 2015-12-22 | 1 | -0/+12 |
* | | Add top level filtering by room id | Mark Haines | 2015-12-21 | 1 | -33/+30 |
|/ |
|
* | Strip address and such out of 3pid invites | Daniel Wagner-Hall | 2015-12-17 | 1 | -1/+1 |
* | Only include the archived rooms if a include_leave flag in set in the filter | Mark Haines | 2015-12-04 | 1 | -0/+4 |
* | Add API for setting account_data globaly or on a per room basis | Mark Haines | 2015-12-01 | 1 | -1/+8 |
* | Allow user to redact with an equal power | Erik Johnston | 2015-11-26 | 1 | -1/+1 |
* | Merge branch 'develop' into daniel/forgetrooms | Paul "LeoNerd" Evans | 2015-11-19 | 2 | -13/+22 |
|\ |
|
| * | Merge pull request #386 from matrix-org/markjh/rename_pud_to_account_data | Mark Haines | 2015-11-19 | 1 | -5/+5 |
| |\ |
|
| | * | s/private_user_data/account_data/ | Mark Haines | 2015-11-18 | 1 | -5/+5 |
| * | | Take a boolean not a list of lambdas | Daniel Wagner-Hall | 2015-11-19 | 1 | -8/+17 |
| |/ |
|
* / | Allow users to forget rooms | Daniel Wagner-Hall | 2015-11-17 | 1 | -0/+7 |
|/ |
|
* | Always check guest = true in macaroons | Steven Hammerton | 2015-11-17 | 1 | -1/+2 |
* | Merge branch 'develop' into sh-cas-auth-via-homeserver | Steven Hammerton | 2015-11-17 | 1 | -0/+1 |
|\ |
|
| * | Allow guest users to join and message rooms | Daniel Wagner-Hall | 2015-11-10 | 1 | -0/+1 |
* | | Share more code between macaroon validation | Steven Hammerton | 2015-11-11 | 1 | -9/+10 |
|/ |
|
* | Exchange 3pid invites for m.room.member invites | Daniel Wagner-Hall | 2015-11-05 | 1 | -35/+38 |
* | Merge pull request #347 from matrix-org/markjh/check_filter | Mark Haines | 2015-11-05 | 1 | -18/+2 |
|\ |
|
| * | Remove fields that are both unspecified and unused from the filter checks, ch... | Mark Haines | 2015-11-04 | 1 | -18/+2 |
* | | Allow guests to register and call /events?room_id= | Daniel Wagner-Hall | 2015-11-04 | 2 | -41/+55 |
|/ |
|
* | Include room tags in v2 /sync | Mark Haines | 2015-11-02 | 1 | -0/+7 |
* | Merge pull request #323 from matrix-org/daniel/sizelimits | Daniel Wagner-Hall | 2015-10-23 | 2 | -1/+30 |
|\ |
|
| * | Reject events which are too large | Daniel Wagner-Hall | 2015-10-22 | 2 | -1/+30 |
* | | Merge pull request #325 from matrix-org/markjh/filter_dicts | Mark Haines | 2015-10-22 | 1 | -3/+22 |
|\ \ |
|
| * | | Don't assume that the event has a room_id or sender | Mark Haines | 2015-10-22 | 1 | -2/+2 |
| * | | Support filtering events represented as dicts. | Mark Haines | 2015-10-22 | 1 | -3/+22 |