| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #1160 from matrix-org/rav/401_on_password_fail | Richard van der Hoff | 2016-10-07 | 1 | -32/+52 |
|\ |
|
| * | Interactive Auth: Return 401 from for incorrect password | Richard van der Hoff | 2016-10-07 | 1 | -32/+52 |
* | | Restructure ldap authentication | Martin Weinelt | 2016-09-29 | 1 | -87/+192 |
|/ |
|
* | Move FEDERATION_PING_INTERVAL timer. Update log line | Erik Johnston | 2016-09-23 | 1 | -8/+10 |
* | Time out typing over federation | Erik Johnston | 2016-09-23 | 1 | -70/+105 |
* | Merge pull request #1136 from matrix-org/erikj/fix_signed_3pid | Erik Johnston | 2016-09-22 | 1 | -6/+9 |
|\ |
|
| * | Add comments | Erik Johnston | 2016-09-22 | 1 | -0/+3 |
| * | Allow invites via 3pid to bypass sender sig check | Erik Johnston | 2016-09-22 | 1 | -6/+6 |
* | | Merge pull request #1132 from matrix-org/erikj/initial_sync_split | Erik Johnston | 2016-09-22 | 2 | -378/+446 |
|\ \
| |/
|/| |
|
| * | Support /initialSync in synchrotron worker | Erik Johnston | 2016-09-21 | 2 | -378/+446 |
* | | Add total_room_count_estimate to /publicRooms | Erik Johnston | 2016-09-21 | 1 | -0/+3 |
|/ |
|
* | Merge pull request #1130 from matrix-org/erikj/fix_pubroom_pag | Erik Johnston | 2016-09-19 | 1 | -12/+25 |
|\ |
|
| * | PEP8 | Erik Johnston | 2016-09-17 | 1 | -1/+1 |
| * | Handle fact that _generate_room_entry may not return a room entry | Erik Johnston | 2016-09-17 | 1 | -12/+25 |
* | | Merge pull request #1129 from matrix-org/erikj/fix_pubroom_pag | Erik Johnston | 2016-09-17 | 1 | -110/+123 |
|\| |
|
| * | Spelling | Erik Johnston | 2016-09-17 | 1 | -1/+1 |
| * | Fix and clean up publicRooms pagination | Erik Johnston | 2016-09-17 | 1 | -110/+123 |
* | | Make public room search case insensitive | David Baker | 2016-09-16 | 1 | -4/+4 |
|/ |
|
* | Comment | Erik Johnston | 2016-09-16 | 1 | -0/+2 |
* | Add remote reoom cache | Erik Johnston | 2016-09-16 | 1 | -2/+23 |
* | Support filtering remote room lists | Erik Johnston | 2016-09-16 | 1 | -3/+9 |
* | Filter remote rooms lists locally | Erik Johnston | 2016-09-16 | 1 | -10/+24 |
* | Don't cache searched in /publicRooms | Erik Johnston | 2016-09-16 | 1 | -1/+5 |
* | Add very basic filter API to /publicRooms | Erik Johnston | 2016-09-15 | 1 | -5/+18 |
* | Change the way we calculate new_limit in /publicRooms and add POST API | Erik Johnston | 2016-09-15 | 1 | -15/+33 |
* | Merge pull request #1121 from matrix-org/erikj/public_room_paginate | Erik Johnston | 2016-09-15 | 1 | -84/+196 |
|\ |
|
| * | Base public room list off of public_rooms stream | Erik Johnston | 2016-09-15 | 1 | -7/+27 |
| * | Pass since/from parameters over federation | Erik Johnston | 2016-09-15 | 1 | -29/+26 |
| * | Allow paginating both forwards and backwards | Erik Johnston | 2016-09-15 | 1 | -21/+50 |
| * | Remove support for aggregate room lists | Erik Johnston | 2016-09-15 | 1 | -55/+0 |
| * | Accept optional token to public room list | Erik Johnston | 2016-09-15 | 1 | -7/+75 |
| * | Calculate the public room list from a stream_ordering | Erik Johnston | 2016-09-14 | 1 | -3/+40 |
| * | Refactor public rooms to not pull out the full state for each room | Erik Johnston | 2016-09-14 | 1 | -14/+30 |
* | | Merge pull request #1117 from matrix-org/erikj/fix_state | Erik Johnston | 2016-09-14 | 1 | -0/+4 |
|\ \
| |/
|/| |
|
| * | Ensure we don't mutate state cache entries | Erik Johnston | 2016-09-14 | 1 | -0/+4 |
* | | Move RoomListHandler into a separate file | Erik Johnston | 2016-09-14 | 2 | -158/+185 |
|/ |
|
* | Merge pull request #1111 from matrix-org/matthew/device-ids | Matthew Hodgson | 2016-09-14 | 1 | -1/+1 |
|\ |
|
| * | make device IDs more useful for human disambiguation | Matthew Hodgson | 2016-09-13 | 1 | -1/+1 |
* | | Merge pull request #1116 from matrix-org/paul/tiny-fixes | Paul Evans | 2016-09-13 | 1 | -2/+2 |
|\ \ |
|
| * | | Fix typo "persiting" | Paul "LeoNerd" Evans | 2016-09-13 | 1 | -2/+2 |
* | | | Limit how often we ask for keys from dead servers | Mark Haines | 2016-09-13 | 1 | -11/+30 |
|/ / |
|
* | | Move the E2E key handling into the e2e handler | Mark Haines | 2016-09-13 | 1 | -3/+102 |
* | | Merge pull request #1110 from matrix-org/markjh/e2e_timeout | Mark Haines | 2016-09-13 | 1 | -21/+43 |
|\ \ |
|
| * | | Add a timeout parameter for end2end key queries. | Mark Haines | 2016-09-12 | 1 | -21/+43 |
* | | | Add is_direct param to /createRoom | Erik Johnston | 2016-09-12 | 1 | -0/+6 |
|/ / |
|
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/batch_edus | Erik Johnston | 2016-09-09 | 1 | -2/+31 |
|\| |
|
| * | Merge pull request #1091 from matrix-org/paul/third-party-lookup | Paul Evans | 2016-09-09 | 1 | -2/+31 |
| |\ |
|
| | * | Reject malformed 3PE query metadata results earlier in AS API handling code | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -9/+5 |
| | * | Minor fixes from PR comments | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -2/+2 |
| | * | Efficiency fix for lookups of a single protocol | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -1/+4 |
| | * | Don't corrupt shared cache on subsequent protocol requests | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -0/+2 |
| | * | Collect up all the "instances" lists of individual AS protocol results into o... | Paul "LeoNerd" Evans | 2016-09-08 | 1 | -1/+29 |
* | | | Clobber EDUs in send queue | Erik Johnston | 2016-09-09 | 3 | -15/+7 |
|/ / |
|
* / | Deduplicate presence in _update_states | Erik Johnston | 2016-09-09 | 1 | -0/+6 |
|/ |
|
* | Merge pull request #1082 from matrix-org/erikj/remote_public_rooms | Erik Johnston | 2016-09-08 | 1 | -0/+10 |
|\ |
|
| * | Add server param to /publicRooms | Erik Johnston | 2016-09-08 | 1 | -0/+10 |
* | | Check the user_id for presence/typing matches origin | Erik Johnston | 2016-09-08 | 2 | -1/+15 |
* | | Merge branch 'develop' into markjh/direct_to_device_federation | Mark Haines | 2016-09-08 | 3 | -54/+35 |
|\| |
|
| * | Record counts of state changes | Erik Johnston | 2016-09-06 | 1 | -0/+4 |
| * | Short circuit if presence is the same | Erik Johnston | 2016-09-06 | 1 | -0/+3 |
| * | Fiddle should_notify to better report stats | Erik Johnston | 2016-09-06 | 1 | -12/+7 |
| * | Merge pull request #1070 from matrix-org/erikj/presence_stats | Erik Johnston | 2016-09-05 | 1 | -0/+8 |
| |\ |
|
| | * | Record why we have chosen to notify | Erik Johnston | 2016-09-05 | 1 | -0/+8 |
| * | | Use get_joined_users_from_context instead of manually looking up hosts | Erik Johnston | 2016-09-05 | 2 | -46/+17 |
| |/ |
|
* | | Add a new method to enqueue the device messages rather than sending a dummy EDU | Mark Haines | 2016-09-07 | 1 | -7/+3 |
* | | Send device messages over federation | Mark Haines | 2016-09-06 | 1 | -0/+121 |
|/ |
|
* | Merge pull request #1067 from matrix-org/markjh/idempotent | Mark Haines | 2016-09-05 | 1 | -0/+6 |
|\ |
|
| * | Fix membership changes to be idempotent | Mark Haines | 2016-09-02 | 1 | -0/+6 |
* | | Merge pull request #1066 from matrix-org/markjh/direct_to_device_lowerbound | Mark Haines | 2016-09-02 | 1 | -1/+1 |
|\ \ |
|
| * | | Only return new device messages in /sync | Mark Haines | 2016-09-02 | 1 | -1/+1 |
| |/ |
|
* | | Merge pull request #1064 from matrix-org/erikj/on_receive_check | Erik Johnston | 2016-09-02 | 1 | -6/+18 |
|\ \ |
|
| * | | Comment on when auth chain and state are None | Erik Johnston | 2016-09-02 | 1 | -0/+3 |
| * | | Comment | Erik Johnston | 2016-09-02 | 1 | -0/+3 |
| * | | Only check if host is in room if we have state and auth_chain | Erik Johnston | 2016-09-02 | 1 | -6/+12 |
| |/ |
|
* | | Docstrings | Erik Johnston | 2016-09-02 | 1 | -0/+4 |
* | | Only pull out IDs from DB for /state_ids/ request | Erik Johnston | 2016-09-02 | 1 | -0/+26 |
|/ |
|
* | Fix typo in log line | Erik Johnston | 2016-09-01 | 1 | -1/+1 |
* | Correctly handle the difference between prev and current state | Erik Johnston | 2016-08-31 | 3 | -17/+30 |
* | Merge pull request #1055 from matrix-org/erikj/occaisonally_persist | Erik Johnston | 2016-08-30 | 1 | -0/+28 |
|\ |
|
| * | Check correct variable | Erik Johnston | 2016-08-30 | 1 | -1/+1 |
| * | Occaisonally persist unpersisted presence updates | Erik Johnston | 2016-08-30 | 1 | -0/+28 |
* | | Don't notify for online -> online transitions. | Erik Johnston | 2016-08-30 | 1 | -1/+6 |
|/ |
|
* | Comment about message deletion | Erik Johnston | 2016-08-30 | 1 | -0/+3 |
* | Fix check | Erik Johnston | 2016-08-30 | 1 | -2/+1 |
* | Noop get_new_messages_for_device if token hasn't changed | Erik Johnston | 2016-08-30 | 1 | -9/+12 |
* | Merge pull request #1049 from matrix-org/erikj/presence_users_in_room | Erik Johnston | 2016-08-30 | 6 | -13/+28 |
|\ |
|
| * | Use state handler instead of get_users_in_room/get_joined_hosts | Erik Johnston | 2016-08-26 | 6 | -13/+28 |
* | | Merge remote-tracking branch 'origin/develop' into markjh/direct_to_device | Mark Haines | 2016-08-26 | 5 | -167/+309 |
|\| |
|
| * | Measure _filter_events_for_server | Erik Johnston | 2016-08-26 | 1 | -0/+2 |
| * | Don't pull out full state for _filter_events_for_server | Erik Johnston | 2016-08-26 | 1 | -1/+25 |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_ids | Erik Johnston | 2016-08-26 | 2 | -1/+13 |
| |\ |
|
| | * | Merge pull request #1043 from matrix-org/erikj/backfill_fix | Erik Johnston | 2016-08-26 | 1 | -1/+3 |
| | |\ |
|
| | | * | Fix None check in backfill | Erik Johnston | 2016-08-25 | 1 | -1/+3 |
| * | | | Make sync not pull out full state | Erik Johnston | 2016-08-25 | 1 | -34/+41 |
| * | | | Replace context.current_state with context.current_state_ids | Erik Johnston | 2016-08-25 | 4 | -131/+226 |
| * | | | Pull out event ids rather than full events for state | Erik Johnston | 2016-08-25 | 1 | -0/+12 |
| | |/
| |/| |
|
* | | | Merge branch 'develop' into markjh/direct_to_device | Mark Haines | 2016-08-25 | 4 | -36/+57 |
|\ \ \
| | |/
| |/| |
|
| * | | Merge pull request #1041 from matrix-org/paul/third-party-lookup | Paul Evans | 2016-08-25 | 1 | -0/+10 |
| |\ \
| | |/
| |/| |
|
| | * | Don't need toplevel cache on 3PE lookup metadata any more | Paul "LeoNerd" Evans | 2016-08-25 | 1 | -8/+0 |
| | * | Actually query over AS API for 3PE lookup metadata | Paul "LeoNerd" Evans | 2016-08-25 | 1 | -13/+1 |
| | * | Move static knowledge of protocol metadata into AS handler; cache the result | Paul "LeoNerd" Evans | 2016-08-24 | 1 | -2/+24 |
| | * | Initial hack at the 3PN protocols metadata lookup API | Paul "LeoNerd" Evans | 2016-08-24 | 1 | -0/+8 |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/preserve_l... | Erik Johnston | 2016-08-24 | 1 | -2/+2 |
| |\| |
|
| * | | Preserve some logcontexts | Erik Johnston | 2016-08-24 | 4 | -36/+47 |
* | | | Add store-and-forward direct-to-device messaging | Mark Haines | 2016-08-25 | 1 | -1/+42 |
| |/
|/| |
|
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/pagination | Erik Johnston | 2016-08-24 | 1 | -2/+12 |
|\| |
|
| * | Pass through user-supplied content in /join/$room_id | Kegan Dougal | 2016-08-23 | 1 | -2/+12 |
* | | Add None checks to backfill | Erik Johnston | 2016-08-24 | 1 | -2/+2 |
|/ |
|
* | defer.returnValue must not be called within Measure | Erik Johnston | 2016-08-19 | 1 | -7/+7 |
* | Merge pull request #1026 from matrix-org/paul/thirdpartylookup | Paul Evans | 2016-08-18 | 1 | -0/+24 |
|\ |
|
| * | Move validation logic for AS 3PE query response into ApplicationServiceApi cl... | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -44/+2 |
| * | More warnings about invalid results from AS 3PE query | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -2/+7 |
| * | Avoid so much copypasta between 3PU and 3PL query by unifying around a ThirdP... | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -26/+9 |
| * | Minor syntax neatenings | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -14/+8 |
| * | Appease pep8 | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -0/+2 |
| * | Copypasta the 3PU support code to also do 3PL | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -3/+30 |
| * | Log a warning if an AS yields an invalid 3PU lookup result | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -1/+6 |
| * | Scattergather the call out to ASes; validate received results | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -7/+34 |
| * | Filter 3PU lookups by only ASes that declare knowledge of that protocol | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -2/+4 |
| * | Merge remote-tracking branch 'origin/develop' into paul/thirdpartylookup | Paul "LeoNerd" Evans | 2016-08-18 | 5 | -62/+82 |
| |\ |
|
| * | | Extend individual list results into the main return list, don't append | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -1/+1 |
| * | | Thread 3PU lookup through as far as the AS API object; which currently noƶps it | Paul "LeoNerd" Evans | 2016-08-17 | 1 | -0/+21 |
* | | | Add appservice worker | Erik Johnston | 2016-08-18 | 1 | -38/+51 |
| |/
|/| |
|
* | | Make AppserviceHandler stream events from database | Erik Johnston | 2016-08-18 | 1 | -21/+44 |
* | | Make notify_interested_services faster | Erik Johnston | 2016-08-17 | 1 | -23/+8 |
* | | Measure notify_interested_services | Erik Johnston | 2016-08-17 | 1 | -19/+22 |
* | | Merge pull request #1012 from matrix-org/erikj/limit_backfill_uri | Erik Johnston | 2016-08-16 | 1 | -4/+5 |
|\ \ |
|
| * | | Limit number of extremeties in backfill request | Erik Johnston | 2016-08-16 | 1 | -4/+5 |
* | | | Refactor user_delete_access_tokens. Invalidate get_user_by_access_token to sl... | Erik Johnston | 2016-08-15 | 1 | -3/+3 |
|/ / |
|
* | | Merge pull request #1009 from matrix-org/erikj/event_split | Erik Johnston | 2016-08-15 | 2 | -11/+19 |
|\ \
| |/
|/| |
|
| * | Make synchrotron accept /events | Erik Johnston | 2016-08-12 | 2 | -11/+19 |
* | | Log the value which is observed in the first place. | Daniel Ehlers | 2016-08-14 | 1 | -1/+1 |
* | | Fix AttributeError when bind_dn is not defined. | Daniel Ehlers | 2016-08-14 | 1 | -1/+1 |
* | | Only process one local membership event per room at a time | Erik Johnston | 2016-08-12 | 1 | -1/+1 |
|/ |
|
* | Merge pull request #997 from Half-Shot/develop | Erik Johnston | 2016-08-11 | 1 | -3/+6 |
|\ |
|
| * | Don't change status_msg on /sync | Will Hunt | 2016-08-10 | 1 | -3/+6 |
* | | Also check if server is in the room | Erik Johnston | 2016-08-10 | 1 | -2/+7 |
* | | Correctly auth /event/ requests | Erik Johnston | 2016-08-10 | 1 | -5/+6 |
* | | Only resign our own events | Erik Johnston | 2016-08-10 | 1 | -9/+10 |
|/ |
|
* | /login: Respond with a 403 when we get an invalid m.login.token | Richard van der Hoff | 2016-08-09 | 1 | -3/+3 |
* | Fix login with m.login.token | Richard van der Hoff | 2016-08-08 | 1 | -13/+4 |
* | Fix backfill auth events | Erik Johnston | 2016-08-05 | 1 | -21/+50 |
* | keys/query: Omit device displayname if null | Richard van der Hoff | 2016-08-04 | 1 | -3/+4 |
* | Include device name in /keys/query response | Richard van der Hoff | 2016-08-03 | 1 | -3/+8 |
* | keys/query: return all users which were asked for | Richard van der Hoff | 2016-08-03 | 1 | -3/+6 |
* | Merge branch 'rav/null_default_device_displayname' into develop | Richard van der Hoff | 2016-08-03 | 1 | -1/+1 |
|\ |
|
| * | PEP8 | Richard van der Hoff | 2016-08-03 | 1 | -1/+1 |
| * | Default device_display_name to null | Richard van der Hoff | 2016-08-03 | 1 | -1/+1 |
* | | E2eKeysHandler: minor tweaks | Richard van der Hoff | 2016-08-03 | 1 | -5/+3 |
* | | Merge branch 'develop' into rav/refactor_device_query | Mark Haines | 2016-08-03 | 3 | -9/+4 |
|\| |
|
| * | Merge pull request #940 from matrix-org/erikj/fed_state_cache | Erik Johnston | 2016-08-02 | 3 | -9/+4 |
| |\ |
|
| | * | Cache federation state responses | Erik Johnston | 2016-07-21 | 3 | -9/+4 |
* | | | E2E keys: Make federation query share code with client query | Richard van der Hoff | 2016-08-02 | 1 | -25/+90 |
* | | | Move e2e query logic into a handler | Richard van der Hoff | 2016-08-01 | 1 | -0/+67 |
|/ / |
|
* | | Merge pull request #958 from matrix-org/paul/SYN-738 | Paul Evans | 2016-07-29 | 1 | -0/+7 |
|\ \ |
|
| * | | Forbid non-ASes from registering users whose names begin with '_' (SYN-738) | Paul "LeoNerd" Evans | 2016-07-27 | 1 | -0/+7 |
* | | | Mention that func will fetch auth events | Erik Johnston | 2016-07-29 | 1 | -0/+2 |
* | | | Update docstring | Erik Johnston | 2016-07-29 | 1 | -0/+6 |
* | | | Handle the case of missing auth events when joining a room | Erik Johnston | 2016-07-28 | 1 | -4/+23 |
* | | | Delete e2e keys on device delete | Richard van der Hoff | 2016-07-27 | 1 | -0/+4 |
|/ / |
|
* | | Add `create_requester` function | Richard van der Hoff | 2016-07-26 | 4 | -29/+32 |
* | | Delete refresh tokens when deleting devices | Richard van der Hoff | 2016-07-26 | 1 | -2/+4 |
* | | Implement updating devices | Richard van der Hoff | 2016-07-26 | 1 | -0/+24 |
* | | Implement deleting devices | Richard van der Hoff | 2016-07-26 | 2 | -3/+46 |
* | | Use get to avoid KeyErrors | David Baker | 2016-07-22 | 1 | -1/+1 |
* | | Log the hostname the reCAPTCHA was completed on | David Baker | 2016-07-22 | 1 | -2/+11 |
* | | make /devices return a list | Richard van der Hoff | 2016-07-21 | 1 | -5/+5 |
* | | Fix PEP8 errors | Richard van der Hoff | 2016-07-21 | 1 | -1/+1 |
* | | Implement GET /device/{deviceId} | Richard van der Hoff | 2016-07-21 | 1 | -9/+37 |
* | | GET /devices endpoint | Richard van der Hoff | 2016-07-20 | 1 | -0/+27 |
|/ |
|
* | Merge pull request #935 from matrix-org/erikj/backfill_notifs | Erik Johnston | 2016-07-20 | 1 | -5/+6 |
|\ |
|
| * | Don't notify pusher pool for backfilled events | Erik Johnston | 2016-07-20 | 1 | -5/+6 |
* | | Merge pull request #933 from matrix-org/rav/type_annotations | Richard van der Hoff | 2016-07-20 | 2 | -0/+8 |
|\ \ |
|
| * | | Type annotations | Richard van der Hoff | 2016-07-19 | 2 | -0/+8 |
* | | | Merge pull request #932 from matrix-org/rav/register_refactor | David Baker | 2016-07-20 | 1 | -5/+8 |
|\ \ \
| |_|/
|/| | |
|
| * | | Further registration refactoring | Richard van der Hoff | 2016-07-19 | 1 | -5/+8 |
| |/ |
|
* | | Merge pull request #922 from matrix-org/erikj/file_api2 | Erik Johnston | 2016-07-20 | 1 | -4/+12 |
|\ \
| |/
|/| |
|
| * | Add filter param to /messages API | Erik Johnston | 2016-07-14 | 1 | -4/+12 |
* | | Merge pull request #929 from matrix-org/rav/support_deviceid_in_login | Richard van der Hoff | 2016-07-19 | 2 | -8/+82 |
|\ \ |
|
| * | | Add device_id support to /login | Richard van der Hoff | 2016-07-18 | 2 | -8/+82 |
* | | | Summary line | Mark Haines | 2016-07-19 | 1 | -2/+1 |
* | | | Update docstring on Handlers. | Mark Haines | 2016-07-19 | 1 | -3/+15 |
|/ / |
|
* | | Refactor login flow | Richard van der Hoff | 2016-07-18 | 1 | -47/+59 |
* | | Fix a doc-comment | Richard van der Hoff | 2016-07-18 | 1 | -1/+1 |
* | | Merge pull request #919 from matrix-org/erikj/auth_fix | Erik Johnston | 2016-07-15 | 1 | -2/+6 |
|\ \ |
|
| * | | Comment | Erik Johnston | 2016-07-15 | 1 | -0/+4 |
| * | | Check sender signed event | Erik Johnston | 2016-07-14 | 1 | -2/+2 |
| |/ |
|
* / | Bug fix: expire invalid access tokens | Negar Fazeli | 2016-07-13 | 2 | -5/+6 |
|/ |
|
* | Merge branch 'erikj/shared_secret' into erikj/test2 | Erik Johnston | 2016-07-06 | 3 | -17/+34 |
|\ |
|
| * | Add an admin option to shared secret registration | Erik Johnston | 2016-07-05 | 1 | -1/+3 |
| * | Merge pull request #904 from matrix-org/dbkr/register_email_no_untrusted_id_s... | David Baker | 2016-07-05 | 1 | -14/+27 |
| |\ |
|
| | * | requestToken update | David Baker | 2016-06-30 | 1 | -14/+27 |
| * | | Fix password config | Kent Shikama | 2016-07-05 | 1 | -2/+2 |
| * | | Fix pep8 | Kent Shikama | 2016-07-05 | 1 | -1/+2 |
| * | | Add pepper to password hashing | Kent Shikama | 2016-07-05 | 1 | -2/+3 |
* | | | Add ReadWriteLock for pagination and history prune | Erik Johnston | 2016-07-05 | 1 | -34/+36 |
* | | | Add purge_history API | Erik Johnston | 2016-07-05 | 2 | -1/+14 |
|/ / |
|
* | | Fix style violations | Kent Shikama | 2016-07-04 | 1 | -1/+2 |
* | | Optionally include password hash in createUser endpoint | Kent Shikama | 2016-07-03 | 1 | -2/+2 |
|/ |
|
* | Rework ldap integration with ldap3 | Martin Weinelt | 2016-06-22 | 1 | -33/+170 |
* | Add a comment on why we don't create a profile for upgrading users | Mark Haines | 2016-06-17 | 1 | -0/+1 |
* | Remove registered_users from the distributor. | Mark Haines | 2016-06-17 | 2 | -20/+10 |
* | Only re-sign our own events | Erik Johnston | 2016-06-17 | 1 | -6/+9 |
* | Fix TypeError in call to bcrypt.hashpw | Salvatore LaMendola | 2016-06-16 | 1 | -1/+1 |
* | Correctly mark backfilled events as backfilled | Erik Johnston | 2016-06-15 | 1 | -14/+16 |
* | Fix a bug caused by a change in auth_handler function | Negar Fazeli | 2016-06-08 | 1 | -2/+2 |
* | Pull full state for each room all at once | Erik Johnston | 2016-06-08 | 1 | -16/+16 |
* | Don't hit DB for noop replications queries | Erik Johnston | 2016-06-08 | 1 | -0/+3 |
* | Remove dead code. | Mark Haines | 2016-06-07 | 1 | -13/+0 |
* | .values() returns list of sets | Erik Johnston | 2016-06-06 | 1 | -1/+2 |
* | Fix typos | Erik Johnston | 2016-06-06 | 1 | -32/+36 |
* | Fire after 30s not 8h | Erik Johnston | 2016-06-06 | 1 | -1/+1 |
* | Merge pull request #832 from matrix-org/erikj/presence_coount | Erik Johnston | 2016-06-03 | 1 | -5/+9 |
|\ |
|
| * | Change metric style | Erik Johnston | 2016-06-03 | 1 | -5/+4 |
| * | Presence metrics. Change def of small delta | Erik Johnston | 2016-06-03 | 1 | -5/+10 |
* | | Fix typo | Erik Johnston | 2016-06-03 | 1 | -1/+1 |
|/ |
|
* | Merge pull request #829 from matrix-org/erikj/poke_notifier | Erik Johnston | 2016-06-03 | 1 | -4/+7 |
|\ |
|
| * | Poke notifier on next reactor tick | Erik Johnston | 2016-06-03 | 1 | -4/+7 |
* | | Load push rules in storage layer, so that they get cached | Erik Johnston | 2016-06-03 | 1 | -3/+2 |
|/ |
|
* | Merge remote-tracking branch 'origin/dbkr/email_notif_string_fmt_error' into ... | David Baker | 2016-06-02 | 1 | -28/+36 |
|\ |
|
| * | Store the typing users as user_id strings. (#819) | Mark Haines | 2016-06-02 | 1 | -28/+36 |
* | | Merge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribe | David Baker | 2016-06-02 | 2 | -550/+716 |
|\| |
|
| * | Deduplicate presence entries in sync (#818) | Mark Haines | 2016-06-02 | 1 | -0/+3 |
| * | Allow external processes to mark a user as syncing. (#812) | Mark Haines | 2016-06-02 | 1 | -13/+106 |
| * | Merge pull request #817 from matrix-org/dbkr/split_out_auth_handler | David Baker | 2016-06-02 | 2 | -3/+1 |
| |\ |
|
| * \ | Merge pull request #800 from matrix-org/erikj/sync_refactor | Erik Johnston | 2016-06-02 | 1 | -537/+607 |
| |\ \ |
|
| | * | | Change short circuit path | Erik Johnston | 2016-05-24 | 1 | -16/+26 |
| | * | | Don't send down all ephemeral events | Erik Johnston | 2016-05-24 | 1 | -1/+3 |
| | * | | Only work out newly_joined_users for incremental sync | Erik Johnston | 2016-05-24 | 1 | -6/+9 |
| | * | | Only include non-offline presence in initial sync | Erik Johnston | 2016-05-24 | 1 | -0/+3 |
| | * | | Spell builder correctly | Erik Johnston | 2016-05-24 | 1 | -63/+63 |
| | * | | Inline function. Make load_filtered_recents private | Erik Johnston | 2016-05-24 | 1 | -17/+7 |
| | * | | Add comments | Erik Johnston | 2016-05-24 | 1 | -7/+105 |
| | * | | Shuffle things room | Erik Johnston | 2016-05-24 | 1 | -37/+33 |
| | * | | Add back concurrently_execute | Erik Johnston | 2016-05-23 | 1 | -25/+9 |
| | * | | Refactor SyncHandler | Erik Johnston | 2016-05-23 | 1 | -497/+481 |
* | | | | Merge branch 'dbkr/split_out_auth_handler' into dbkr/email_unsubscribe | David Baker | 2016-06-02 | 3 | -4/+2 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | Split out the auth handler | David Baker | 2016-06-02 | 2 | -3/+1 |
| |/ / |
|
| * | | Fix room list spidering | David Baker | 2016-06-01 | 1 | -1/+1 |
* | | | Email unsubscribing that may in theory, work | David Baker | 2016-06-02 | 1 | -0/+5 |
|/ / |
|
* | | Merge remote-tracking branch 'origin/develop' into dbkr/room_list_spider | David Baker | 2016-06-01 | 3 | -22/+7 |
|\ \ |
|
| * | | Move the AS handler out of the Handlers object. | Mark Haines | 2016-05-31 | 3 | -22/+7 |
* | | | Add cache to remote room lists | David Baker | 2016-05-31 | 1 | -4/+30 |
* | | | Basic, un-cached support for secondary_directory_servers | David Baker | 2016-05-31 | 1 | -1/+32 |
|/ / |
|
* | | Split out the room list handler | David Baker | 2016-05-31 | 1 | -2/+1 |
* | | Send down correct error response if user not found | Erik Johnston | 2016-05-27 | 1 | -2/+7 |
* | | Fix set profile error with Requester. | Negi Fazeli | 2016-05-23 | 1 | -4/+5 |
|/ |
|
* | Move typing handler out of the Handlers object | Mark Haines | 2016-05-17 | 2 | -20/+15 |
* | Merge remote-tracking branch 'origin/develop' into markjh/liberate_sync_handler | Mark Haines | 2016-05-17 | 1 | -15/+0 |
|\ |
|
| * | Remove unused get_joined_rooms_for_user | Mark Haines | 2016-05-17 | 1 | -15/+0 |