| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #3232 from matrix-org/rav/server_notices_room | Richard van der Hoff | 2018-05-18 | 4 | -6/+80 |
|\ |
|
| * | Make sure we reject attempts to invite the notices user | Richard van der Hoff | 2018-05-18 | 2 | -0/+15 |
| * | fix missing yield for server_notices_room | Richard van der Hoff | 2018-05-17 | 1 | -3/+4 |
| * | Infrastructure for a server notices room | Richard van der Hoff | 2018-05-17 | 3 | -6/+64 |
* | | Merge pull request #3233 from matrix-org/rav/remove_dead_code | Richard van der Hoff | 2018-05-18 | 1 | -55/+0 |
|\ \ |
|
| * | | Remove unused `update_external_syncs` | Richard van der Hoff | 2018-05-17 | 1 | -55/+0 |
| |/ |
|
* | | Merge pull request #3221 from matrix-org/erikj/purge_token | Erik Johnston | 2018-05-18 | 1 | -6/+6 |
|\ \
| |/
|/| |
|
| * | Make purge_history operate on tokens | Erik Johnston | 2018-05-15 | 1 | -6/+6 |
* | | Move RoomCreationHandler out of synapse.handlers.Handlers | Richard van der Hoff | 2018-05-17 | 2 | -6/+7 |
|/ |
|
* | Merge pull request #3201 from matrix-org/dbkr/leave_rooms_on_deactivate | David Baker | 2018-05-14 | 1 | -2/+79 |
|\ |
|
| * | Catch failure to part user from room | David Baker | 2018-05-10 | 1 | -7/+13 |
| * | Many docstrings | David Baker | 2018-05-10 | 1 | -0/+24 |
| * | Oops, don't call function passed to run_in_background | David Baker | 2018-05-10 | 1 | -1/+1 |
| * | Prefix internal functions | David Baker | 2018-05-09 | 1 | -7/+7 |
| * | Indent fail | David Baker | 2018-05-09 | 1 | -1/+1 |
| * | Part deactivated users in the background | David Baker | 2018-05-09 | 1 | -1/+34 |
| * | Part user from rooms on account deactivate | David Baker | 2018-05-08 | 1 | -1/+15 |
* | | Merge pull request #3199 from matrix-org/erikj/pagination_sync | Erik Johnston | 2018-05-09 | 1 | -6/+18 |
|\ \ |
|
| * | | Add comment to sync as to why code path is split | Erik Johnston | 2018-05-09 | 1 | -0/+5 |
| * | | Refactor sync APIs to reuse pagination API | Erik Johnston | 2018-05-09 | 1 | -6/+13 |
* | | | Fix returned token is no longer a tuple | Erik Johnston | 2018-05-09 | 1 | -1/+1 |
|/ / |
|
* / | Refactor get_recent_events_for_room return type | Erik Johnston | 2018-05-09 | 2 | -6/+6 |
|/ |
|
* | Merge branch 'release-v0.28.1' into develop | Richard van der Hoff | 2018-05-01 | 1 | -1/+5 |
|\ |
|
| * | Apply some limits to depth to counter abuse | Richard van der Hoff | 2018-05-01 | 1 | -1/+5 |
* | | Merge pull request #3143 from matrix-org/rav/remove_redundant_preserve_fn | Richard van der Hoff | 2018-04-30 | 1 | -4/+2 |
|\ \ |
|
| * | | Remove redundant call to preserve_fn | Richard van der Hoff | 2018-04-30 | 1 | -4/+2 |
* | | | Merge pull request #3153 from NotAFile/py3-httplib | Richard van der Hoff | 2018-04-30 | 1 | -3/+3 |
|\ \ \ |
|
| * | | | move httplib import to six | Adrian Tschira | 2018-04-28 | 1 | -3/+3 |
* | | | | Merge pull request #3151 from NotAFile/py3-xrange-1 | Richard van der Hoff | 2018-04-30 | 1 | -1/+3 |
|\ \ \ \ |
|
| * \ \ \ | Merge branch 'develop' into py3-xrange-1 | Richard van der Hoff | 2018-04-30 | 6 | -21/+32 |
| |\ \ \ \
| | | |/ /
| | |/| | |
|
| * | | | | Move more xrange to six | Adrian Tschira | 2018-04-28 | 1 | -1/+3 |
| | |/ /
| |/| | |
|
* | | | | Merge pull request #3150 from NotAFile/py3-listcomp-yield | Richard van der Hoff | 2018-04-30 | 1 | -5/+9 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | Don't yield in list comprehensions | Adrian Tschira | 2018-04-28 | 1 | -5/+9 |
| |/ / |
|
* | | | pep8; remove spurious import | Richard van der Hoff | 2018-04-27 | 1 | -1/+1 |
* | | | Merge remote-tracking branch 'origin/develop' into rav/use_run_in_background | Richard van der Hoff | 2018-04-27 | 6 | -74/+112 |
|\| | |
|
| * | | Merge pull request #3142 from matrix-org/rav/reraise | Richard van der Hoff | 2018-04-27 | 2 | -13/+24 |
| |\ \ |
|
| | * | | reraise exceptions more carefully | Richard van der Hoff | 2018-04-27 | 2 | -13/+24 |
| | |/ |
|
| * | | Merge pull request #3138 from matrix-org/rav/catch_unhandled_exceptions | Richard van der Hoff | 2018-04-27 | 4 | -59/+86 |
| |\ \ |
|
| | * | | Improve exception handling for background processes | Richard van der Hoff | 2018-04-27 | 4 | -59/+86 |
| | |/ |
|
| * / | Add missing consumeErrors | Richard van der Hoff | 2018-04-27 | 1 | -2/+2 |
| |/ |
|
* / | Use run_in_background in preference to preserve_fn | Richard van der Hoff | 2018-04-27 | 6 | -20/+31 |
|/ |
|
* | Merge pull request #3118 from matrix-org/rav/reject_prev_events | Richard van der Hoff | 2018-04-23 | 1 | -7/+71 |
|\ |
|
| * | Remove spurious param | Richard van der Hoff | 2018-04-23 | 1 | -1/+0 |
| * | accept stupid events over backfill | Richard van der Hoff | 2018-04-20 | 1 | -4/+9 |
| * | Add some comments | Richard van der Hoff | 2018-04-18 | 1 | -3/+12 |
| * | Check events on backfill too | Richard van der Hoff | 2018-04-18 | 1 | -15/+42 |
| * | Reject events which have too many auth_events or prev_events | Richard van der Hoff | 2018-04-18 | 1 | -4/+28 |
* | | Merge pull request #3107 from NotAFile/py3-bool-nonzero | Richard van der Hoff | 2018-04-20 | 1 | -0/+7 |
|\ \ |
|
| * | | add __bool__ alias to __nonzero__ methods | Adrian Tschira | 2018-04-15 | 1 | -0/+7 |
| |/ |
|
* | | Merge pull request #3093 from matrix-org/rav/response_cache_wrap | Richard van der Hoff | 2018-04-20 | 2 | -35/+19 |
|\ \ |
|
| * | | Refactor ResponseCache usage | Richard van der Hoff | 2018-04-12 | 2 | -35/+19 |
| |/ |
|
* | | Merge pull request #3117 from matrix-org/rav/refactor_have_events | Richard van der Hoff | 2018-04-20 | 1 | -19/+12 |
|\ \ |
|
| * | | Refactor store.have_events | Richard van der Hoff | 2018-04-20 | 1 | -19/+12 |
| |/ |
|
* / | Avoid creating events with huge numbers of prev_events | Richard van der Hoff | 2018-04-16 | 2 | -38/+53 |
|/ |
|
* | Merge pull request #3092 from matrix-org/rav/response_cache_metrics | Richard van der Hoff | 2018-04-12 | 2 | -3/+4 |
|\ |
|
| * | Add metrics for ResponseCache | Richard van der Hoff | 2018-04-10 | 2 | -3/+4 |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/processed_... | Erik Johnston | 2018-04-12 | 1 | -2/+19 |
|\ \ |
|
| * \ | Merge pull request #3088 from matrix-org/erikj/as_parallel | Erik Johnston | 2018-04-12 | 1 | -2/+19 |
| |\ \ |
|
| | * | | Send events to ASes concurrently | Erik Johnston | 2018-04-11 | 1 | -2/+19 |
* | | | | Set all metrics at the same time | Erik Johnston | 2018-04-12 | 1 | -4/+4 |
* | | | | Track last processed event received_ts | Erik Johnston | 2018-04-11 | 1 | -0/+10 |
* | | | | Track where event stream processing have gotten up to | Erik Johnston | 2018-04-11 | 1 | -0/+4 |
|/ / / |
|
* | | | Merge pull request #3079 from matrix-org/erikj/limit_concurrent_sends | Erik Johnston | 2018-04-10 | 1 | -49/+55 |
|\ \ \
| |/ /
|/| | |
|
| * | | Note why we're limiting concurrent event sends | Erik Johnston | 2018-04-10 | 1 | -0/+5 |
| * | | Limit concurrent event sends for a room | Erik Johnston | 2018-04-09 | 1 | -49/+50 |
* | | | Merge pull request #2996 from krombel/allow_auto_join_rooms | Richard van der Hoff | 2018-04-10 | 1 | -2/+34 |
|\ \ \
| |_|/
|/| | |
|
| * | | Merge branch 'develop' of into allow_auto_join_rooms | Krombel | 2018-03-28 | 3 | -8/+14 |
| |\ \ |
|
| * | | | move handling of auto_join_rooms to RegisterHandler | Krombel | 2018-03-14 | 1 | -2/+34 |
* | | | | Merge pull request #3080 from matrix-org/rav/fix_500_on_rejoin | Richard van der Hoff | 2018-04-09 | 1 | -0/+8 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | Return a 404 rather than a 500 on rejoining empty rooms | Richard van der Hoff | 2018-04-09 | 1 | -0/+8 |
* | | | | Implement group join API | David Baker | 2018-04-06 | 1 | -1/+39 |
|/ / / |
|
* | | | Merge pull request #3045 from matrix-org/dbkr/group_joinable | Luke Barnard | 2018-04-05 | 1 | -0/+3 |
|\ \ \ |
|
| * | | | Use join_policy API instead of joinable | Luke Barnard | 2018-04-03 | 1 | -1/+1 |
| * | | | Add joinability for groups | David Baker | 2018-03-28 | 1 | -0/+3 |
* | | | | Merge pull request #3000 from NotAFile/change-except-style | Richard van der Hoff | 2018-04-04 | 1 | -3/+3 |
|\ \ \ \ |
|
| * | | | | replace old style error catching with 'as' keyword | NotAFile | 2018-03-15 | 1 | -3/+3 |
| | |/ /
| |/| | |
|
* | | | | Merge pull request #3049 from matrix-org/rav/use_staticjson | Richard van der Hoff | 2018-04-03 | 1 | -2/+2 |
|\ \ \ \ |
|
| * | | | | Use static JSONEncoders | Richard van der Hoff | 2018-03-29 | 1 | -2/+2 |
* | | | | | Use simplejson throughout | Richard van der Hoff | 2018-03-29 | 1 | -3/+5 |
|/ / / / |
|
* | | | | Merge pull request #3034 from matrix-org/rav/fix_key_claim_errors | Richard van der Hoff | 2018-03-28 | 1 | -28/+28 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | Stringify exceptions for keys/{query,claim} | Richard van der Hoff | 2018-03-27 | 1 | -1/+4 |
| * | | | factor out exception handling for keys/claim and keys/query | Richard van der Hoff | 2018-03-27 | 1 | -28/+25 |
| | |/
| |/| |
|
* | | | Also do check inside linearizer | Erik Johnston | 2018-03-27 | 1 | -3/+4 |
* | | | PEP8 | Erik Johnston | 2018-03-26 | 1 | -1/+3 |
* | | | Linearize calls to _generate_user_id | Erik Johnston | 2018-03-26 | 1 | -4/+7 |
|/ / |
|
* | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2018-03-19 | 2 | -4/+4 |
|\ \
| |/
|/| |
|
| * | Replace ujson with simplejson | Erik Johnston | 2018-03-15 | 2 | -4/+4 |
* | | Merge pull request #2992 from matrix-org/erikj/implement_member_workre | Erik Johnston | 2018-03-14 | 1 | -0/+102 |
|\ \ |
|
| * | | s/join/joined/ in notify_user_membership_change | Erik Johnston | 2018-03-14 | 1 | -1/+1 |
| * | | Split RoomMemberWorkerHandler to separate file | Erik Johnston | 2018-03-14 | 2 | -78/+102 |
| * | | Implement RoomMemberWorkerHandler | Erik Johnston | 2018-03-13 | 1 | -0/+78 |
* | | | Merge pull request #2989 from matrix-org/erikj/profile_cache_master | Erik Johnston | 2018-03-14 | 1 | -1/+4 |
|\ \ \ |
|
| * | | | Only update remote profile cache on master | Erik Johnston | 2018-03-13 | 1 | -1/+4 |
* | | | | _remote_join and co take a requester | Erik Johnston | 2018-03-13 | 1 | -4/+4 |
| |/ /
|/| | |
|
* | | | Merge pull request #2987 from matrix-org/erikj/split_room_member_handler | Erik Johnston | 2018-03-13 | 1 | -98/+185 |
|\ \ \
| |/ /
|/| | |
|
| * | | Add missing param to docstrings | Erik Johnston | 2018-03-13 | 1 | -0/+3 |
| * | | Correct import order | Erik Johnston | 2018-03-13 | 1 | -3/+3 |
| * | | Move user_*_room distributor stuff to master class | Erik Johnston | 2018-03-13 | 1 | -5/+50 |
| * | | Split RoomMemberHandler into base and master class | Erik Johnston | 2018-03-13 | 1 | -96/+135 |
* | | | Merge pull request #2978 from matrix-org/erikj/refactor_replication_layer | Erik Johnston | 2018-03-13 | 6 | -6/+6 |
|\ \ \ |
|
| * | | | s/replication_client/federation_client/ | Erik Johnston | 2018-03-13 | 6 | -6/+6 |
* | | | | Merge pull request #2981 from matrix-org/erikj/factor_remote_leave | Erik Johnston | 2018-03-13 | 1 | -22/+54 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/factor_rem... | Erik Johnston | 2018-03-13 | 11 | -31/+49 |
| |\ \ \ |
|
| * | | | | Add docstring | Erik Johnston | 2018-03-13 | 1 | -0/+26 |
| * | | | | Factor out _remote_reject_invite in RoomMember | Erik Johnston | 2018-03-13 | 1 | -22/+28 |
* | | | | | Merge pull request #2979 from matrix-org/erikj/no_handlers | Erik Johnston | 2018-03-13 | 8 | -12/+7 |
|\ \ \ \ \
| |_|/ / /
|/| | / /
| | |/ /
| |/| | |
|
| * | | | Split replication layer into two | Erik Johnston | 2018-03-13 | 8 | -12/+7 |
* | | | | Merge pull request #2980 from matrix-org/erikj/rm_priv | Erik Johnston | 2018-03-13 | 1 | -7/+7 |
|\ \ \ \ |
|
| * | | | | Make functions private that can be | Erik Johnston | 2018-03-13 | 1 | -7/+7 |
| | |/ /
| |/| | |
|
* | | | | Merge pull request #2982 from matrix-org/erikj/fix_extra_users | Erik Johnston | 2018-03-13 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | extra_users is actually a list of UserIDs | Erik Johnston | 2018-03-13 | 1 | -1/+1 |
| |/ / / |
|
* | | | | Merge pull request #2983 from matrix-org/erikj/rename_register_3pid | Erik Johnston | 2018-03-13 | 2 | -11/+25 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | Refactor get_or_register_3pid_guest | Erik Johnston | 2018-03-13 | 2 | -11/+25 |
| |/ / |
|
* / / | Split out edu/query registration to a separate class | Erik Johnston | 2018-03-13 | 8 | -12/+16 |
|/ / |
|
* | | Add transactional API to history purge | Richard van der Hoff | 2018-03-12 | 1 | -5/+99 |
* | | Return an error when doing two purges on a room | Richard van der Hoff | 2018-03-12 | 1 | -3/+14 |
* | | Fix up log message | Erik Johnston | 2018-03-07 | 1 | -1/+1 |
* | | Fix typo | Erik Johnston | 2018-03-07 | 1 | -2/+2 |
* | | Fix race in sync when joining room | Erik Johnston | 2018-03-07 | 1 | -28/+75 |
* | | Merge pull request #2949 from krombel/use_bcrypt_checkpw | Richard van der Hoff | 2018-03-06 | 1 | -2/+4 |
|\ \ |
|
| * | | use bcrypt.checkpw | Krombel | 2018-03-05 | 1 | -2/+4 |
* | | | Merge pull request #2946 from matrix-org/rav/timestamp_to_purge | Richard van der Hoff | 2018-03-06 | 1 | -9/+5 |
|\ \ \ |
|
| * | | | Provide a means to pass a timestamp to purge_history | Richard van der Hoff | 2018-03-05 | 1 | -9/+5 |
| |/ / |
|
* / / | Remove ability for AS users to call /events and /sync | Erik Johnston | 2018-03-05 | 2 | -10/+9 |
|/ / |
|
* | | Add missing yield during 3pid signature checks | Erik Johnston | 2018-03-02 | 1 | -1/+1 |
* | | Merge pull request #2927 from matrix-org/erikj/read_marker_caches | Erik Johnston | 2018-03-01 | 1 | -3/+3 |
|\ \ |
|
| * | | Improve caching for read_marker API | Erik Johnston | 2018-03-01 | 1 | -3/+3 |
* | | | Move back to hs.is_mine | Erik Johnston | 2018-03-01 | 1 | -7/+6 |
* | | | Move RoomMemberHandler out of Handlers | Erik Johnston | 2018-03-01 | 6 | -31/+37 |
|/ / |
|
* | | Check event auth on the worker | Erik Johnston | 2018-03-01 | 1 | -16/+16 |
* | | Correctly send ratelimit and extra_users params | Erik Johnston | 2018-03-01 | 1 | -0/+2 |
* | | Fixup comments | Erik Johnston | 2018-03-01 | 1 | -4/+4 |
* | | Calculate push actions on worker | Erik Johnston | 2018-02-28 | 1 | -25/+61 |
* | | Delete from push_actions_staging in federation too | Erik Johnston | 2018-02-20 | 1 | -9/+17 |
* | | Ensure that we delete staging push actions on errors | Erik Johnston | 2018-02-15 | 1 | -3/+9 |
* | | Merge pull request #2854 from matrix-org/erikj/event_create_worker | Erik Johnston | 2018-02-13 | 1 | -6/+22 |
|\ \ |
|
| * | | Move presence handling into handle_new_client_event | Erik Johnston | 2018-02-07 | 1 | -6/+6 |
| * | | Add replication http endpoint for event sending | Erik Johnston | 2018-02-07 | 1 | -0/+16 |
* | | | Merge pull request #2858 from matrix-org/rav/purge_updates | Richard van der Hoff | 2018-02-09 | 1 | -2/+2 |
|\ \ \
| |/ /
|/| | |
|
| * | | delete_local_events for purge_history | Richard van der Hoff | 2018-02-09 | 1 | -2/+2 |
| * | | rename delete_old_state -> purge_history | Richard van der Hoff | 2018-02-09 | 1 | -1/+1 |
* | | | Remove pointless ratelimit check | Erik Johnston | 2018-02-07 | 1 | -5/+0 |
* | | | Merge pull request #2847 from matrix-org/erikj/separate_event_creation | Erik Johnston | 2018-02-06 | 5 | -179/+193 |
|\ \ \ |
|
| * | | | Update copyright | Erik Johnston | 2018-02-06 | 4 | -1/+4 |
| * | | | s/_create_new_client_event/create_new_client_event/ | Erik Johnston | 2018-02-06 | 2 | -8/+8 |
| * | | | Update places where we create events | Erik Johnston | 2018-02-05 | 4 | -29/+26 |
| * | | | Split event creation into a separate handler | Erik Johnston | 2018-02-05 | 1 | -146/+160 |
* | | | | Store state groups separately from events (#2784) | Erik Johnston | 2018-02-06 | 1 | -7/+17 |
|/ / / |
|
* | | | Rename resolve_state_groups -> resolve_state_groups_for_events | Richard van der Hoff | 2018-02-01 | 1 | -6/+5 |
* | | | add white space line | Neil Johnson | 2018-01-26 | 1 | -0/+1 |
* | | | rather than try reconstruct the results object, better to guard against the x... | Neil Johnson | 2018-01-26 | 1 | -6/+2 |
* | | | fix return type, should be a dict | Neil Johnson | 2018-01-25 | 1 | -1/+1 |
* | | | fix PEP8 violation | Neil Johnson | 2018-01-25 | 1 | -1/+1 |
* | | | remove white space | Neil Johnson | 2018-01-25 | 1 | -1/+0 |
* | | | synapse 500s on a call to publicRooms in the case where the number of public ... | Neil Johnson | 2018-01-25 | 1 | -0/+5 |
* | | | Add federation_domain_whitelist option (#2820) | Matthew Hodgson | 2018-01-22 | 3 | -1/+15 |
* | | | rewrite based on PR feedback: | Matthew Hodgson | 2018-01-19 | 1 | -10/+5 |
* | | | fix up v1, and improve errors | Matthew Hodgson | 2018-01-19 | 1 | -1/+12 |
|/ / |
|
* | | Sanity checking for user ids | Richard van der Hoff | 2018-01-17 | 2 | -8/+19 |
* | | Metrics for events processed in appservice and fed sender | Richard van der Hoff | 2018-01-15 | 1 | -0/+7 |
* | | Merge pull request #2773 from matrix-org/erikj/hash_bg | Erik Johnston | 2018-01-10 | 3 | -10/+18 |
|\ \ |
|
| * | | Do bcrypt hashing in a background thread | Erik Johnston | 2018-01-10 | 3 | -10/+18 |
* | | | fix order of operations derp and also use `.get` to default to {} | Michael Telatynski | 2018-01-10 | 1 | -2/+3 |
* | | | Fix publicised groups API (singular) over federation | Michael Telatynski | 2018-01-10 | 1 | -4/+4 |
| |/
|/| |
|
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/createroom... | Erik Johnston | 2017-12-07 | 12 | -116/+389 |
|\ \ |
|
| * \ | Merge pull request #2723 from matrix-org/matthew/search-all-local-users | Matthew Hodgson | 2017-12-05 | 3 | -16/+78 |
| |\ \ |
|
| | * | | speed up the rate of initial spam for users | Matthew Hodgson | 2017-12-04 | 1 | -11/+12 |
| | * | | fix pep8 and tests | Matthew Hodgson | 2017-12-04 | 2 | -4/+3 |
| | * | | switch to a simpler 'search_all_users' button as per review feedback | Matthew Hodgson | 2017-12-04 | 3 | -6/+6 |
| | * | | Merge branch 'develop' into matthew/search-all-local-users | Matthew Hodgson | 2017-11-30 | 4 | -37/+139 |
| | |\| |
|
| | * | | fix thinkos galore | Matthew Hodgson | 2017-11-30 | 1 | -4/+6 |
| | * | | kick the user_directory index when new users register | Matthew Hodgson | 2017-11-29 | 1 | -0/+8 |
| | * | | untested WIP but might actually work | Matthew Hodgson | 2017-11-29 | 2 | -4/+56 |
| | * | | Add user_directory_include_pattern config param to expand search results to a... | Matthew Hodgson | 2017-11-29 | 1 | -2/+2 |
| * | | | support custom login types for validating users | Richard van der Hoff | 2017-12-05 | 1 | -24/+57 |
| * | | | Factor out a validate_user_via_ui_auth method | Richard van der Hoff | 2017-12-05 | 1 | -0/+43 |
| * | | | Refactor UI auth implementation | Richard van der Hoff | 2017-12-05 | 1 | -17/+29 |
| | |/
| |/| |
|
| * | | Delete devices in various logout situations | Richard van der Hoff | 2017-11-29 | 3 | -1/+38 |
| * | | Move set_password into its own handler | Richard van der Hoff | 2017-11-29 | 2 | -16/+45 |
| * | | Move deactivate_account into its own handler | Richard van der Hoff | 2017-11-29 | 2 | -16/+44 |
| * | | Remove pushers when deleting access tokens | Richard van der Hoff | 2017-11-29 | 1 | -4/+12 |
| |/ |
|
| * | Merge pull request #2686 from matrix-org/luke/as-flair | Luke Barnard | 2017-11-17 | 1 | -0/+11 |
| |\ |
|
| | * | Make sure we check AS groups for lookup on bulk | Luke Barnard | 2017-11-16 | 1 | -0/+5 |
| | * | Add automagical AS Publicised Group(s) | Luke Barnard | 2017-11-16 | 1 | -0/+6 |
| * | | typo | Matthew Hodgson | 2017-11-17 | 1 | -1/+1 |
| * | | Fix auth handler #2678 | Jurek | 2017-11-16 | 1 | -1/+1 |
| |/ |
|
| * | Merge pull request #2675 from matrix-org/rav/remove_broken_logcontext_funcs | Richard van der Hoff | 2017-11-15 | 2 | -4/+4 |
| |\ |
|
| | * | Remove preserve_context_over_{fn, deferred} | Richard van der Hoff | 2017-11-14 | 2 | -4/+4 |
| * | | Reshuffle room list request code | Richard van der Hoff | 2017-11-14 | 1 | -27/+24 |
| * | | Add a load of logging to the room_list handler | Richard van der Hoff | 2017-11-14 | 1 | -0/+13 |
| |/ |
|
* | | Copy dict in update_membership too | Erik Johnston | 2017-12-07 | 1 | -0/+4 |
* | | PEP8 | Erik Johnston | 2017-11-28 | 1 | -1/+1 |
* | | Fix wrong avatars when inviting multiple users when creating room | Erik Johnston | 2017-11-28 | 1 | -5/+5 |
* | | Fix auth handler #2678 | Jurek | 2017-11-17 | 1 | -1/+1 |
|/ |
|
* | Revert "Allow upper-case characters in mxids" | Richard van der Hoff | 2017-11-09 | 1 | -3/+3 |
* | Allow upper-case characters in mxids | Richard van der Hoff | 2017-11-09 | 1 | -3/+3 |
* | Have an explicit API to update room config | Erik Johnston | 2017-11-08 | 1 | -0/+1 |
* | Revert "Modify group room association API to allow modification of is_public" | Erik Johnston | 2017-11-08 | 1 | -2/+2 |
* | Merge pull request #2631 from xyzz/fix_appservice_event_backlog | Erik Johnston | 2017-11-08 | 1 | -5/+1 |
|\ |
|
| * | Remove useless assignment in notify_interested_services | Ilya Zhuravlev | 2017-11-07 | 1 | -1/+0 |
| * | Fix appservices being backlogged and not receiving new events due to a bug in... | Ilya Zhuravlev | 2017-11-02 | 1 | -4/+1 |
* | | Merge pull request #2649 from matrix-org/rav/fix_delta_on_state_res | Richard van der Hoff | 2017-11-08 | 1 | -20/+46 |
|\ \ |
|
| * | | s/items/iteritems/ | Richard van der Hoff | 2017-11-08 | 1 | -2/+2 |
| * | | Update deltas when doing auth resolution | Richard van der Hoff | 2017-11-07 | 1 | -3/+7 |
| * | | factor out _update_context_for_auth_events | Richard van der Hoff | 2017-11-07 | 1 | -20/+42 |
* | | | Merge pull request #2643 from matrix-org/matthew/user_dir_typos | Matthew Hodgson | 2017-11-07 | 1 | -2/+2 |
|\ \ \
| |/ /
|/| | |
|
| * | | s/intial/initial/ | Matthew Hodgson | 2017-11-04 | 1 | -2/+2 |
| |/ |
|
* | | Merge pull request #2636 from farialima/me-master | Erik Johnston | 2017-11-07 | 1 | -13/+8 |
|\ \
| |/
|/| |
|
| * | removed unused import flagged by flake8a | Francois Granade | 2017-11-03 | 1 | -1/+0 |
| * | Fix for issue 2635: correctly update rooms avatar/display name when modified ... | Francois Granade | 2017-11-03 | 1 | -12/+8 |
* | | Factor _AccountHandler proxy out to ModuleApi | Richard van der Hoff | 2017-11-02 | 1 | -69/+3 |
* | | Merge pull request #2624 from matrix-org/rav/password_provider_notify_logout | David Baker | 2017-11-02 | 1 | -2/+24 |
|\ \ |
|
| * | | Notify auth providers on logout | Richard van der Hoff | 2017-11-01 | 1 | -2/+24 |
* | | | Merge pull request #2623 from matrix-org/rav/callbacks_for_auth_providers | David Baker | 2017-11-02 | 1 | -6/+11 |
|\ \ \ |
|
| * | | | Fix user-interactive password auth | Richard van der Hoff | 2017-11-01 | 1 | -1/+3 |
| * | | | Allow password_auth_providers to return a callback | Richard van der Hoff | 2017-11-01 | 1 | -5/+8 |
| |/ / |
|
* | | | Merge pull request #2622 from matrix-org/rav/db_access_for_auth_providers | David Baker | 2017-11-02 | 1 | -0/+16 |
|\ \ \
| |/ /
|/| | |
|
| * | | Let auth providers get to the database | Richard van der Hoff | 2017-10-31 | 1 | -0/+16 |
* | | | Merge pull request #2620 from matrix-org/rav/auth_non_password | Richard van der Hoff | 2017-11-01 | 1 | -22/+96 |
|\ \ \ |
|
| * | | | Let password auth providers handle arbitrary login types | Richard van der Hoff | 2017-11-01 | 1 | -22/+96 |
| |/ / |
|
* | | | Merge remote-tracking branch 'origin/develop' into rav/refactor_accesstoken_d... | David Baker | 2017-11-01 | 3 | -13/+8 |
|\ \ \ |
|
| * \ \ | Merge pull request #2615 from matrix-org/rav/break_auth_device_dep | David Baker | 2017-11-01 | 1 | -9/+6 |
| |\ \ \ |
|
| | * | | | Break dependency of auth_handler on device_handler | Richard van der Hoff | 2017-11-01 | 1 | -9/+6 |
| | |/ / |
|
| * | | | Merge pull request #2613 from matrix-org/rav/kill_refresh_tokens | David Baker | 2017-11-01 | 1 | -2/+0 |
| |\ \ \ |
|
| | * | | | Remove the last vestiges of refresh_tokens | Richard van der Hoff | 2017-10-31 | 1 | -2/+0 |
| | |/ / |
|
| * / / | Modify group room association API to allow modification of is_public | Luke Barnard | 2017-10-31 | 1 | -2/+2 |
| |/ / |
|
* / / | Move access token deletion into auth handler | Richard van der Hoff | 2017-11-01 | 3 | -5/+52 |
|/ / |
|
* | | Refactor some logic from LoginRestServlet into AuthHandler | Richard van der Hoff | 2017-10-31 | 1 | -28/+52 |
* | | Merge pull request #2589 from matrix-org/rav/as_deactivate_account | Richard van der Hoff | 2017-10-27 | 1 | -1/+1 |
|\ \ |
|
| * | | Allow ASes to deactivate their own users | Richard van der Hoff | 2017-10-27 | 1 | -1/+1 |
| |/ |
|
* | | Update room_list.py | Erik Johnston | 2017-10-26 | 1 | -1/+1 |
* | | Do logcontexts outside ResponseCache | Erik Johnston | 2017-10-25 | 2 | -5/+8 |
* | | Add logging and fix log contexts for publicRooms | Erik Johnston | 2017-10-25 | 1 | -0/+2 |
|/ |
|
* | replace 'except:' with 'except Exception:' | Richard van der Hoff | 2017-10-23 | 8 | -17/+17 |
* | Merge pull request #2561 from matrix-org/rav/id_checking | Richard van der Hoff | 2017-10-23 | 1 | -9/+6 |
|\ |
|
| * | Allow = in mxids and groupids | Richard van der Hoff | 2017-10-20 | 1 | -3/+2 |
| * | Disallow capital letters in userids | Richard van der Hoff | 2017-10-20 | 1 | -6/+4 |
* | | Remove pointless create() method | Richard van der Hoff | 2017-10-20 | 2 | -3/+3 |
|/ |
|
* | _create_rererouter for get_invited_users_in_group | Luke Barnard | 2017-10-16 | 1 | -17/+2 |
* | Implement GET /groups/$groupId/invited_users | Luke Barnard | 2017-10-16 | 1 | -0/+17 |
* | Log a warning when no profile for invited member | Luke Barnard | 2017-10-16 | 1 | -2/+5 |
* | Merge pull request #2531 from matrix-org/dbkr/spamcheck_error_messages | David Baker | 2017-10-12 | 1 | -2/+6 |
|\ |
|
| * | fix isinstance | David Baker | 2017-10-11 | 1 | -1/+1 |
| * | Allow error strings from spam checker | David Baker | 2017-10-11 | 1 | -2/+6 |
* | | Fix fetching remote summaries | Erik Johnston | 2017-10-11 | 1 | -2/+2 |
* | | Merge pull request #2530 from matrix-org/rav/fix_receipt_logcontext | Richard van der Hoff | 2017-10-11 | 1 | -0/+4 |
|\ \ |
|
| * | | fix a logcontext leak in read receipt handling | Richard van der Hoff | 2017-10-11 | 1 | -0/+4 |
* | | | Fix attestations to check correct server name | Erik Johnston | 2017-10-11 | 1 | -10/+20 |
| |/
|/| |
|
* | | Merge pull request #2466 from matrix-org/erikj/groups_merged | Erik Johnston | 2017-10-11 | 8 | -17/+584 |
|\ \ |
|
| * \ | Merge branch 'develop' into erikj/groups_merged | David Baker | 2017-10-02 | 4 | -8/+121 |
| |\ \ |
|