| Commit message (Expand) | Author | Age | Files | Lines |
* | Support registration / login with phone number | David Baker | 2017-03-13 | 1 | -6/+82 |
* | Revert "Support registration & login with phone number" | Erik Johnston | 2017-03-13 | 1 | -82/+6 |
* | Not any more, it doesn't | David Baker | 2017-03-08 | 1 | -1/+0 |
* | Minor fixes from PR feedback | David Baker | 2017-03-08 | 1 | -1/+1 |
* | Factor out msisdn canonicalisation | David Baker | 2017-03-08 | 1 | -13/+5 |
* | Fix pep8 | David Baker | 2017-03-08 | 1 | -3/+3 |
* | Support new login format | David Baker | 2017-03-07 | 1 | -6/+91 |
* | Remove unused param | Erik Johnston | 2017-02-20 | 1 | -1/+0 |
* | Make kick & ban reasons work | David Baker | 2017-02-14 | 1 | -0/+5 |
* | admin,storage: added more administrator functionalities | Morteza Araby | 2017-02-02 | 2 | -2/+224 |
* | Fix email push in pusher worker | Erik Johnston | 2017-02-02 | 1 | -1/+4 |
* | Added username and password for turn server | Marvin Steadfast | 2017-01-19 | 1 | -9/+17 |
* | Lowercase all email addresses before querying db | David Baker | 2017-01-18 | 1 | -1/+7 |
* | Linearize updates to membership via PUT /state/ | Erik Johnston | 2017-01-09 | 1 | -11/+17 |
* | Merge pull request #1676 from matrix-org/erikj/room_list | Erik Johnston | 2016-12-12 | 2 | -1/+52 |
|\ |
|
| * | Add new API appservice specific public room list | Erik Johnston | 2016-12-06 | 2 | -1/+52 |
* | | Add /room/<room_id>/joined_members API | Erik Johnston | 2016-12-08 | 1 | -0/+19 |
* | | Add joined_rooms servlet | Erik Johnston | 2016-12-08 | 1 | -0/+17 |
|/ |
|
* | Merge branch 'develop' into rav/no_more_refresh_tokens | Richard van der Hoff | 2016-11-30 | 1 | -12/+0 |
|\ |
|
| * | Stop putting a time caveat on access tokens | Richard van der Hoff | 2016-11-29 | 1 | -12/+0 |
* | | Stop generating refresh tokens | Richard van der Hoff | 2016-11-28 | 1 | -18/+10 |
|/ |
|
* | Clean transactions based on time. Add HttpTransactionCache tests. | Kegan Dougal | 2016-11-14 | 1 | -1/+1 |
* | Move .observe() up to the cache to make things neater | Kegan Dougal | 2016-11-14 | 1 | -24/+6 |
* | Review comments | Kegan Dougal | 2016-11-11 | 3 | -146/+29 |
* | More flake8 | Kegan Dougal | 2016-11-11 | 1 | -1/+3 |
* | Flake8 and fix whoopsie | Kegan Dougal | 2016-11-11 | 1 | -4/+8 |
* | Use ObservableDeferreds instead of Deferreds as they behave as intended | Kegan Dougal | 2016-11-11 | 2 | -30/+31 |
* | Flake8 | Kegan Dougal | 2016-11-10 | 1 | -3/+3 |
* | Store Promise<Response> instead of Response for HTTP API transactions | Kegan Dougal | 2016-11-10 | 3 | -82/+56 |
* | rest/client/v1/register: use the correct requester in createUser | Patrik Oldsberg | 2016-10-06 | 1 | -3/+6 |
* | storage/appservice: make appservice methods only relying on the cache synchro... | Patrik Oldsberg | 2016-10-06 | 1 | -1/+1 |
* | Time out typing over federation | Erik Johnston | 2016-09-23 | 1 | -1/+4 |
* | Support /initialSync in synchrotron worker | Erik Johnston | 2016-09-21 | 2 | -5/+4 |
* | Enable guest access to POST /publicRooms | Erik Johnston | 2016-09-17 | 1 | -2/+2 |
* | Make POST /publicRooms require auth | Erik Johnston | 2016-09-16 | 1 | -2/+1 |
* | Change the way we calculate new_limit in /publicRooms and add POST API | Erik Johnston | 2016-09-15 | 1 | -0/+29 |
* | Remove default public rooms limit | Erik Johnston | 2016-09-15 | 1 | -1/+1 |
* | By default limit /publicRooms to 100 entries | Erik Johnston | 2016-09-15 | 1 | -1/+1 |
* | Pass since/from parameters over federation | Erik Johnston | 2016-09-15 | 1 | -3/+3 |
* | Allow paginating both forwards and backwards | Erik Johnston | 2016-09-15 | 1 | -3/+15 |
* | Remove support for aggregate room lists | Erik Johnston | 2016-09-15 | 1 | -1/+1 |
* | Conform better to the CAS protocol specification | Shell Turner | 2016-09-09 | 1 | -5/+2 |
* | Merge pull request #1096 from matrix-org/markjh/get_access_token | Mark Haines | 2016-09-09 | 3 | -16/+10 |
|\ |
|
| * | Add helper function for getting access_tokens from requests | Mark Haines | 2016-09-09 | 3 | -16/+10 |
* | | Filter returned events for client-facing format | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -2/+3 |
* | | Allow clients to specify the format a room state event is returned in | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -1/+7 |
|/ |
|
* | Use parse_string | Erik Johnston | 2016-09-08 | 1 | -2/+2 |
* | Add server param to /publicRooms | Erik Johnston | 2016-09-08 | 1 | -5/+16 |
* | Pass through user-supplied content in /join/$room_id | Kegan Dougal | 2016-08-23 | 1 | -0/+1 |
* | Make synchrotron accept /events | Erik Johnston | 2016-08-12 | 1 | -5/+4 |
* | Dont invoke get_handlers fromClientV1RestServlet | Erik Johnston | 2016-08-12 | 9 | -1/+86 |
* | Merge pull request #995 from matrix-org/rav/clean_up_cas_login | David Baker | 2016-08-09 | 1 | -125/+33 |
|\ |
|
| * | Clean up CAS login code | Richard van der Hoff | 2016-08-08 | 1 | -125/+33 |
* | | Fix CAS login | Richard van der Hoff | 2016-08-08 | 1 | -0/+1 |
|/ |
|
* | Implement deleting devices | Richard van der Hoff | 2016-07-26 | 1 | -3/+10 |
* | 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 | -1/+3 |
|\ \ |
|
| * | | Further registration refactoring | Richard van der Hoff | 2016-07-19 | 1 | -1/+3 |
| |/ |
|
* | | Merge pull request #922 from matrix-org/erikj/file_api2 | Erik Johnston | 2016-07-20 | 1 | -1/+10 |
|\ \
| |/
|/| |
|
| * | Add filter param to /messages API | Erik Johnston | 2016-07-14 | 1 | -1/+10 |
* | | Add device_id support to /login | Richard van der Hoff | 2016-07-18 | 1 | -3/+36 |
* | | Refactor login flow | Richard van der Hoff | 2016-07-18 | 1 | -18/+23 |
* | | Bug fix: expire invalid access tokens | Negar Fazeli | 2016-07-13 | 1 | -1/+1 |
|/ |
|
* | Add rest servlet. Fix SQL. | Erik Johnston | 2016-07-06 | 1 | -0/+1 |
* | Merge branch 'erikj/shared_secret' into erikj/test2 | Erik Johnston | 2016-07-06 | 1 | -4/+16 |
|\ |
|
| * | Check that there are no null bytes in user and passsword | Erik Johnston | 2016-07-06 | 1 | -0/+6 |
| * | Add null separator to hmac | Erik Johnston | 2016-07-06 | 1 | -0/+2 |
| * | Add an admin option to shared secret registration | Erik Johnston | 2016-07-05 | 1 | -0/+1 |
| * | Protect password when registering using shared secret | Erik Johnston | 2016-07-05 | 1 | -4/+7 |
* | | Add purge_history API | Erik Johnston | 2016-07-05 | 1 | -0/+18 |
|/ |
|
* | Fix style violations | Kent Shikama | 2016-07-04 | 1 | -1/+2 |
* | Use .get() instead of [] to access password_hash | Kent Shikama | 2016-07-04 | 1 | -1/+1 |
* | Optionally include password hash in createUser endpoint | Kent Shikama | 2016-07-03 | 1 | -1/+3 |
* | Feature: Add deactivate account admin API | Erik Johnston | 2016-06-30 | 1 | -0/+26 |
* | Implement purge_media_cache admin API | Erik Johnston | 2016-06-29 | 1 | -0/+32 |
* | Remove redundant exception log in /events | Erik Johnston | 2016-06-09 | 1 | -24/+21 |
* | Don't make rooms visibile by default | Erik Johnston | 2016-06-08 | 1 | -2/+0 |
* | Log user that is making /publicRooms calls | Erik Johnston | 2016-06-08 | 1 | -0/+7 |
* | Load push rules in storage layer, so that they get cached | Erik Johnston | 2016-06-03 | 1 | -4/+2 |
* | Working unsubscribe links going straight to the HS | David Baker | 2016-06-02 | 1 | -1/+3 |
* | Merge branch 'dbkr/split_out_auth_handler' into dbkr/email_unsubscribe | David Baker | 2016-06-02 | 1 | -5/+6 |
|\ |
|
| * | Split out the auth handler | David Baker | 2016-06-02 | 1 | -5/+6 |
* | | WIP on unsubscribing email notifs without logging in | David Baker | 2016-06-01 | 1 | -1/+54 |
|/ |
|
* | Basic, un-cached support for secondary_directory_servers | David Baker | 2016-05-31 | 1 | -1/+2 |
* | Split out the room list handler | David Baker | 2016-05-31 | 1 | -1/+1 |
* | Allow clients to specify a server_name to avoid 'No known servers' | Kegan Dougal | 2016-05-19 | 1 | -1/+4 |
* | Move typing handler out of the Handlers object | Mark Haines | 2016-05-17 | 1 | -4/+3 |
* | Move the presence handler out of the Handlers object | Mark Haines | 2016-05-16 | 2 | -7/+15 |
* | Create user with expiry | Negi Fazeli | 2016-05-13 | 1 | -0/+71 |
* | Make pyjwt dependency optional | Erik Johnston | 2016-04-25 | 1 | -5/+7 |
* | Merge pull request #687 from nikriek/jwt-fix | Erik Johnston | 2016-04-21 | 1 | -3/+6 |
|\ |
|
| * | Fix issues with JWT login | Niklas Riekenbrauck | 2016-04-21 | 1 | -3/+6 |
* | | Make the /set part mandatory | David Baker | 2016-04-12 | 1 | -1/+1 |
* | | Mis-named function | David Baker | 2016-04-12 | 1 | -1/+1 |
* | | Split into separate servlet classes | David Baker | 2016-04-12 | 1 | -11/+16 |
* | | Add get endpoint for pushers | David Baker | 2016-04-11 | 1 | -1/+34 |
|/ |
|
* | Remove spurious comment | Erik Johnston | 2016-03-30 | 1 | -1/+0 |
* | Require user to have left room to forget room | Erik Johnston | 2016-03-30 | 1 | -0/+38 |
* | Add JWT support | Niklas Riekenbrauck | 2016-03-29 | 1 | -0/+53 |
* | Add published room list edit API | Erik Johnston | 2016-03-21 | 1 | -0/+42 |
* | Update aliases event after deletion | Erik Johnston | 2016-03-17 | 1 | -1/+2 |
* | Hook up adding a pusher to the notifier for replication. | Mark Haines | 2016-03-15 | 1 | -0/+6 |
* | Fix regression where synapse checked whether push rules were valid JSON befor... | Mark Haines | 2016-03-14 | 1 | -2/+2 |
* | Merge pull request #642 from matrix-org/erikj/logout | Erik Johnston | 2016-03-11 | 1 | -0/+72 |
|\ |
|
| * | Implement logout | Erik Johnston | 2016-03-11 | 1 | -0/+72 |
* | | Use parse_json_object_from_request to parse JSON out of request bodies | Mark Haines | 2016-03-11 | 3 | -22/+13 |
|/ |
|
* | Add a parse_json_object function | Mark Haines | 2016-03-09 | 6 | -83/+21 |
* | Fix relative imports so they work in both py3 and py27 | Mark Haines | 2016-03-08 | 6 | -6/+6 |
* | Use syntax that works on both py2.7 and py3 | Mark Haines | 2016-03-07 | 1 | -1/+1 |
* | Merge branch 'develop' into markjh/pushrule_stream | Mark Haines | 2016-03-04 | 3 | -10/+11 |
|\ |
|
| * | Merge pull request #614 from matrix-org/erikj/alias_delete | Erik Johnston | 2016-03-04 | 1 | -3/+0 |
| |\ |
|
| | * | Allow alias creators to delete aliases | Erik Johnston | 2016-03-01 | 1 | -3/+0 |
| * | | Pass whole requester to ratelimiting | Daniel Wagner-Hall | 2016-03-03 | 3 | -7/+11 |
| |/ |
|
* | | Hook up the push rules stream to account_data in /sync | Mark Haines | 2016-03-04 | 1 | -1/+1 |
* | | Move the code for formatting push rules into a separate function | Mark Haines | 2016-03-03 | 1 | -86/+4 |
* | | Hook up the push rules to the notifier | Mark Haines | 2016-03-03 | 1 | -15/+29 |
|/ |
|
* | Add support for changing the actions for default rules | Mark Haines | 2016-02-26 | 1 | -4/+27 |
* | Fix to appease the PEP8 dragon | Gergely Polonkai | 2016-02-26 | 1 | -1/+3 |
* | Add error codes for malformed/bad JSON in /login | Gergely Polonkai | 2016-02-26 | 1 | -2/+2 |
* | Make sure we return a JSON object when returning the values of specif… | Mark Haines | 2016-02-25 | 1 | -1/+3 |
* | Remove unused get_rule_attr method | Mark Haines | 2016-02-24 | 1 | -8/+0 |
* | Ignore invalid POST bodies when joining rooms | Daniel Wagner-Hall | 2016-02-24 | 1 | -2/+12 |
* | Allow third_party_signed to be specified on /join | Daniel Wagner-Hall | 2016-02-23 | 1 | -0/+4 |
* | Merge pull request #582 from matrix-org/erikj/presence | Erik Johnston | 2016-02-19 | 2 | -22/+22 |
|\ |
|
| * | "You are not..." | Erik Johnston | 2016-02-18 | 1 | -1/+1 |
| * | Initial cut | Erik Johnston | 2016-02-17 | 2 | -22/+22 |
* | | Remove dead code for setting device specific rules. | Mark Haines | 2016-02-18 | 2 | -88/+8 |
* | | Merge branch 'develop' into daniel/roomcleanupincremental | Daniel Wagner-Hall | 2016-02-17 | 2 | -2/+2 |
|\| |
|
| * | client/v1/room: include event_id in response to state event PUT, in accordanc... | Patrik Oldsberg | 2016-02-17 | 1 | -2/+2 |
| * | Fix typo in request validation for adding push rules. | Mark Haines | 2016-02-16 | 1 | -1/+1 |
| * | Simplify room creation code | Daniel Wagner-Hall | 2016-02-15 | 1 | -15/+3 |
* | | Some cleanup | Daniel Wagner-Hall | 2016-02-17 | 1 | -3/+3 |
* | | Branch off member and non member sends | Daniel Wagner-Hall | 2016-02-15 | 1 | -5/+16 |
* | | Simplify room creation code | Daniel Wagner-Hall | 2016-02-15 | 1 | -15/+3 |
* | | Reuse update_membership from /join | Daniel Wagner-Hall | 2016-02-15 | 1 | -16/+5 |
* | | Merge implementation of /join by alias or ID | Daniel Wagner-Hall | 2016-02-15 | 1 | -37/+31 |
* | | Merge some room joining codepaths | Daniel Wagner-Hall | 2016-02-15 | 1 | -1/+1 |
|/ |
|
* | Revert "Merge two of the room join codepaths" | Daniel Wagner-Hall | 2016-02-12 | 1 | -13/+55 |
* | Merge two of the room join codepaths | Daniel Wagner-Hall | 2016-02-12 | 1 | -55/+13 |
* | Catch the exceptions thrown by twisted when you write to a closed connection | Mark Haines | 2016-02-12 | 1 | -4/+6 |
* | Revert "Reject additional path segments" | Daniel Wagner-Hall | 2016-02-09 | 3 | -6/+6 |
* | Reject additional path segments | Daniel Wagner-Hall | 2016-02-08 | 3 | -6/+6 |
* | Merge pull request #557 from matrix-org/dbkr/profile_dont_return_null | David Baker | 2016-02-04 | 1 | -6/+17 |
|\ |
|
| * | No braces here | David Baker | 2016-02-03 | 1 | -1/+1 |
| * | Don't return null if profile display name / avatar url isn't set: omit them i... | David Baker | 2016-02-03 | 1 | -6/+17 |
* | | Remove old log line | Erik Johnston | 2016-02-03 | 1 | -2/+0 |
|/ |
|
* | Rename config field to reflect yaml name | Daniel Wagner-Hall | 2016-02-03 | 1 | -2/+2 |
* | Fix flake8 warnings for new flake8 | Daniel Wagner-Hall | 2016-02-02 | 3 | -4/+5 |
* | Fix adding push rules relative to other rules | Mark Haines | 2016-01-27 | 1 | -5/+10 |
* | Add missing yield in push_rules set enabled | Mark Haines | 2016-01-25 | 1 | -2/+2 |
* | Allow non-guests to peek on rooms using /events | Daniel Wagner-Hall | 2016-01-20 | 2 | -4/+3 |
* | Take a deepcopy of push rules before mutating them | Erik Johnston | 2016-01-19 | 1 | -1/+3 |
* | Use static for const dicts | Erik Johnston | 2016-01-18 | 1 | -1/+7 |
* | Remove internal ids | Erik Johnston | 2016-01-18 | 1 | -0/+4 |
* | Require unbanning before other membership changes | Daniel Wagner-Hall | 2016-01-15 | 1 | -39/+12 |
* | Merge branch 'release-v0.12.1' into develop | Richard van der Hoff | 2016-01-14 | 1 | -0/+6 |
|\ |
|
| * | Add 'event' result to 'context' endpoint | Richard van der Hoff | 2016-01-13 | 1 | -0/+6 |
* | | Fix enabling & disabling push rules | David Baker | 2016-01-14 | 1 | -1/+1 |
* | | Rename 'user_name' to 'user_id' in push to make it consistent with the rest o... | Mark Haines | 2016-01-13 | 2 | -7/+7 |
* | | Introduce a Requester object | Daniel Wagner-Hall | 2016-01-11 | 10 | -85/+113 |
* | | copyrights | Matthew Hodgson | 2016-01-07 | 15 | -15/+15 |
|/ |
|
* | Expose /login under r0 | Richard van der Hoff | 2016-01-02 | 1 | -1/+1 |
* | Missing yield | Mark Haines | 2015-12-10 | 1 | -1/+1 |
* | Actually host r0 and unstable prefixes | Daniel Wagner-Hall | 2015-12-08 | 1 | -30/+0 |
* | also do more structured logging | David Baker | 2015-12-07 | 1 | -0/+1 |
* | pep8 | David Baker | 2015-12-07 | 1 | -0/+1 |
* | Add logging to pushers API to log the body of the request | David Baker | 2015-12-07 | 1 | -0/+4 |
* | Take object not bool | Daniel Wagner-Hall | 2015-12-07 | 1 | -0/+5 |
* | Merge pull request #415 from matrix-org/daniel/endpoints | Daniel Wagner-Hall | 2015-12-03 | 4 | -32/+8 |
|\ |
|
| * | Update endpoints to reflect current spec | Daniel Wagner-Hall | 2015-12-02 | 4 | -32/+8 |
* | | Fix implementation of /admin/whois | Daniel Wagner-Hall | 2015-12-02 | 1 | -1/+1 |
|/ |
|
* | Reuse a single http client, rather than creating new ones | Mark Haines | 2015-12-02 | 1 | -5/+2 |
* | Host /unstable and /r0 versions of r0 APIs | Daniel Wagner-Hall | 2015-12-01 | 13 | -77/+83 |
* | Rename presence_handler.send_invite to presence_handler.send_presence_invite ... | Mark Haines | 2015-12-01 | 1 | -1/+1 |
* | Merge pull request #385 from matrix-org/daniel/forgetrooms | Mark Haines | 2015-11-20 | 1 | -3/+10 |
|\ |
|
| * | Allow users to forget rooms | Daniel Wagner-Hall | 2015-11-17 | 1 | -3/+10 |
* | | Comment | Erik Johnston | 2015-11-20 | 1 | -0/+8 |
* | | Remove m.login.token from advertised flows. | Erik Johnston | 2015-11-19 | 1 | -1/+2 |
|/ |
|
* | Merge branch 'develop' into sh-cas-auth-via-homeserver | Steven Hammerton | 2015-11-17 | 2 | -13/+31 |
|\ |
|
| * | Allow guests to /room/:room_id/{join,leave} | Daniel Wagner-Hall | 2015-11-13 | 1 | -3/+14 |
| * | Merge pull request #360 from matrix-org/daniel/guestroominitialsync | Daniel Wagner-Hall | 2015-11-12 | 1 | -1/+2 |
| |\ |
|
| | * | Allow guest access to room initialSync | Daniel Wagner-Hall | 2015-11-11 | 1 | -1/+2 |
| * | | Allow guests to set their display names | Daniel Wagner-Hall | 2015-11-12 | 1 | -1/+1 |
| * | | Allow guests to access room context API | Daniel Wagner-Hall | 2015-11-11 | 1 | -2/+2 |
| |/ |
|
| * | Allow guest users to join and message rooms | Daniel Wagner-Hall | 2015-11-10 | 1 | -3/+10 |
| * | Merge pull request #356 from matrix-org/daniel/3pidyetagain | Daniel Wagner-Hall | 2015-11-10 | 1 | -2/+1 |
| |\ |
|
| | * | Get display name from identity server, not client | Daniel Wagner-Hall | 2015-11-09 | 1 | -2/+1 |
| * | | Add a couple of unit tests for room/<x>/messages | Richard van der Hoff | 2015-11-09 | 1 | -1/+1 |
| |/ |
|
* | | Snakes not camels | Steven Hammerton | 2015-11-11 | 1 | -5/+5 |
* | | Minor review fixes | Steven Hammerton | 2015-11-11 | 1 | -13/+10 |
* | | Merge branch 'develop' into sh-cas-auth-via-homeserver | Steven Hammerton | 2015-11-05 | 2 | -17/+25 |
|\| |
|
| * | Merge pull request #350 from matrix-org/erikj/search | Erik Johnston | 2015-11-05 | 1 | -1/+2 |
| |\ |
|
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-11-05 | 10 | -31/+43 |
| | |\ |
|
| | * | | Implement basic pagination for search results | Erik Johnston | 2015-11-05 | 1 | -1/+2 |
| * | | | Exchange 3pid invites for m.room.member invites | Daniel Wagner-Hall | 2015-11-05 | 1 | -12/+8 |
| | |/
| |/| |
|
| * | | Open up /events to anonymous users for room events only | Daniel Wagner-Hall | 2015-11-05 | 2 | -4/+15 |
* | | | Allow hs to do CAS login completely and issue the client with a login token t... | Steven Hammerton | 2015-11-05 | 1 | -1/+144 |
|/ / |
|
* / | Allow guests to register and call /events?room_id= | Daniel Wagner-Hall | 2015-11-04 | 10 | -30/+31 |
|/ |
|
* | Add room context api | Erik Johnston | 2015-10-28 | 1 | -0/+36 |
* | Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-10-23 | 1 | -1/+7 |
|\ |
|
| * | Add config option to disable password login | Erik Johnston | 2015-10-22 | 1 | -1/+7 |
* | | Use 403 and message to match handlers/auth | Kegan Dougal | 2015-10-21 | 1 | -3/+1 |
* | | Don't 500 when the email doesn't map to a valid user ID. | Kegan Dougal | 2015-10-20 | 1 | -0/+4 |
* | | Merge pull request #307 from matrix-org/erikj/search | Erik Johnston | 2015-10-19 | 1 | -0/+17 |
|\ \ |
|
| * \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-10-16 | 1 | -5/+31 |
| |\ \ |
|
| * \ \ | Merge branch 'erikj/store_engine' into erikj/search | Erik Johnston | 2015-10-13 | 1 | -27/+57 |
| |\ \ \
| | | |/
| | |/| |
|
| * | | | Merge remote-tracking branch 'origin/develop' into erikj/search | Erik Johnston | 2015-10-12 | 2 | -2/+78 |
| |\ \ \ |
|
| * | | | | Keep FTS indexes up to date. Only search through rooms currently joined | Erik Johnston | 2015-10-12 | 1 | -1/+1 |
| * | | | | Add basic full text search impl. | Erik Johnston | 2015-10-09 | 1 | -0/+17 |
* | | | | | Merge pull request #306 from matrix-org/markjh/unused_methods | Mark Haines | 2015-10-16 | 1 | -30/+0 |
|\ \ \ \ \
| |_|_|_|/
|/| | | | |
|
| * | | | | synapse.client.v1.login.LoginFallbackRestServlet and synapse.client.v1.login.... | Mark Haines | 2015-10-15 | 1 | -30/+0 |
| | |_|/
| |/| | |
|
* | | | | Remove unnecessary class-wrapping | Daniel Wagner-Hall | 2015-10-13 | 1 | -5/+6 |
* | | | | Move logic into handler | Daniel Wagner-Hall | 2015-10-13 | 1 | -115/+18 |
* | | | | Add logging | Daniel Wagner-Hall | 2015-10-13 | 1 | -2/+2 |
* | | | | Move event contents into third_party_layout field | Daniel Wagner-Hall | 2015-10-13 | 1 | -1/+2 |
* | | | | Merge branch 'develop' into daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-13 | 2 | -2/+108 |
|\| | | |
|
| * | | | Add a comment to clarify why we split on closing curly brace when reading CAS... | Steven Hammerton | 2015-10-12 | 1 | -0/+5 |
| * | | | Unpack dictionary in for loop for nicer syntax | Steven Hammerton | 2015-10-12 | 1 | -4/+4 |
| * | | | Remove not required parenthesis | Steven Hammerton | 2015-10-12 | 1 | -1/+1 |
| * | | | Support multiple required attributes in CAS response, and in a nicer config f... | Steven Hammerton | 2015-10-12 | 1 | -7/+6 |
| * | | | Allow optional config params for a required attribute and it's value, if spec... | Steven Hammerton | 2015-10-12 | 1 | -1/+15 |
| * | | | Parse both user and attributes from CAS response | Steven Hammerton | 2015-10-12 | 1 | -26/+38 |
| | |/
| |/| |
|
| * | | Raise LoginError if CasResponse doensn't contain user | Steven Hammerton | 2015-10-10 | 1 | -1/+1 |
| * | | Fix my broken line splitting | Steven Hammerton | 2015-10-10 | 1 | -4/+6 |
| * | | Use UserId to create FQ user id | Steven Hammerton | 2015-10-10 | 1 | -1/+1 |
| * | | Add get_raw method to SimpleHttpClient, use this in CAS auth rather than requ... | Steven Hammerton | 2015-10-10 | 1 | -5/+8 |
| * | | Formatting changes | Steven Hammerton | 2015-10-10 | 1 | -5/+12 |
| * | | Provide ability to login using CAS | Steven Hammerton | 2015-10-10 | 1 | -1/+63 |
| * | | Use 'true' rather than '1' for archived flag | Mark Haines | 2015-10-08 | 1 | -1/+1 |
| * | | Add a flag to initial sync to indicate we want rooms that the user has left | Mark Haines | 2015-10-08 | 1 | -1/+3 |
| |/ |
|
* | | Fix lint errors | Daniel Wagner-Hall | 2015-10-06 | 1 | -3/+4 |
* | | Implement third party identifier invites | Daniel Wagner-Hall | 2015-10-01 | 1 | -6/+126 |
|/ |
|
* | Remove undocumented and unimplemented 'feedback' parameter from the Client-Se... | Mark Haines | 2015-09-09 | 2 | -4/+0 |
* | Allow users that have left the room to view the member list from the point th... | Mark Haines | 2015-09-09 | 1 | -5/+13 |
* | Merge erikj/user_dedup to develop | Daniel Wagner-Hall | 2015-08-26 | 1 | -2/+3 |
* | Merge pull request #248 from matrix-org/deviceid | Daniel Wagner-Hall | 2015-08-25 | 9 | -32/+32 |
|\ |
|
| * | Remove completely unused concepts from codebase | Daniel Wagner-Hall | 2015-08-25 | 9 | -32/+32 |
* | | Remove syutil dependency in favour of smaller single-purpose libraries | Mark Haines | 2015-08-24 | 1 | -1/+1 |
|/ |
|
* | Return fully qualified user_id as per spec | David Baker | 2015-08-20 | 1 | -1/+1 |
* | Merge branch 'develop' into refresh | Daniel Wagner-Hall | 2015-08-20 | 1 | -4/+11 |
|\ |
|
| * | Comma comma comma comma comma chameleon | David Baker | 2015-08-20 | 1 | -1/+1 |
| * | Merge branch 'develop' into email_login | David Baker | 2015-08-20 | 1 | -3/+2 |
| |\ |
|
| * | | Allow sign in using email address | David Baker | 2015-08-04 | 1 | -5/+12 |
* | | | /tokenrefresh POST endpoint | Daniel Wagner-Hall | 2015-08-20 | 1 | -2/+4 |
| |/
|/| |
|
* | | Simplify LoginHander and AuthHandler | Daniel Wagner-Hall | 2015-08-12 | 1 | -3/+2 |
|/ |
|
* | Remove semicolon. | Kegan Dougal | 2015-07-20 | 1 | -1/+1 |
* | Parse the ID given to /invite|ban|kick to make sure it looks like a user ID. | Kegan Dougal | 2015-07-20 | 1 | -0/+2 |
* | Small tweaks to SAML2 configuration. | Erik Johnston | 2015-07-10 | 1 | -4/+4 |
* | Make SAML2 optional and add some references/comments | Muthu Subramanian | 2015-07-09 | 1 | -4/+9 |