| Commit message (Expand) | Author | Age | Files | Lines |
* | Remove unused param | Erik Johnston | 2017-02-20 | 1 | -1/+0 |
* | Merge pull request #1917 from matrix-org/dbkr/make_ban_reasons_work | David Baker | 2017-02-14 | 1 | -0/+5 |
|\ |
|
| * | Make kick & ban reasons work | David Baker | 2017-02-14 | 1 | -0/+5 |
* | | Ordering is important on errbacks so add the cleanup func before creating an ... | Kegan Dougal | 2017-02-13 | 1 | -7/+7 |
* | | Pop the txn from the map in case it has already been deleted somehow | Kegan Dougal | 2017-02-13 | 1 | -1/+1 |
* | | Don't cache errors at all | Kegan Dougal | 2017-02-13 | 1 | -10/+9 |
* | | http txns: Do not cache error responses | Kegan Dougal | 2017-02-13 | 1 | -1/+10 |
|/ |
|
* | Merge pull request #1784 from morteza-araby/user-admin | Erik Johnston | 2017-02-06 | 2 | -2/+224 |
|\ |
|
| * | admin,storage: added more administrator functionalities | Morteza Araby | 2017-02-02 | 2 | -2/+224 |
* | | sets aren't JSON serializable | Erik Johnston | 2017-02-02 | 1 | -1/+1 |
|/ |
|
* | Fix email push in pusher worker | Erik Johnston | 2017-02-02 | 2 | -2/+6 |
* | Include newly joined users in /keys/changes API | Erik Johnston | 2017-02-01 | 1 | -1/+1 |
* | Comment | Erik Johnston | 2017-02-01 | 1 | -1/+1 |
* | Comment | Erik Johnston | 2017-02-01 | 1 | -1/+12 |
* | Implement /keys/changes | Erik Johnston | 2017-02-01 | 1 | -0/+38 |
* | Add basic implementation of local device list changes | Erik Johnston | 2017-01-25 | 1 | -1/+5 |
* | 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 | 2 | -1/+12 |
* | Fix spurious Unhandled Error log lines | Erik Johnston | 2017-01-12 | 1 | -1/+5 |
* | Linearize updates to membership via PUT /state/ | Erik Johnston | 2017-01-09 | 1 | -11/+17 |
* | Add /account/3pid/delete endpoint | David Baker | 2016-12-20 | 1 | -1/+35 |
* | 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 |
* | | Remove unspecced GET endpoints for e2e keys | Richard van der Hoff | 2016-12-12 | 1 | -39/+4 |
* | | 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 |
|/ |
|
* | Fix doc-string | Richard van der Hoff | 2016-12-01 | 1 | -2/+1 |
* | Rip out more refresh_token code | Richard van der Hoff | 2016-11-30 | 2 | -25/+3 |
* | Merge branch 'develop' into rav/no_more_refresh_tokens | Richard van der Hoff | 2016-11-30 | 5 | -25/+24 |
|\ |
|
| * | Merge pull request #1656 from matrix-org/rav/remove_time_caveat | 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 |
| * | | Merge pull request #1653 from matrix-org/rav/guest_e2e | Richard van der Hoff | 2016-11-29 | 4 | -13/+24 |
| |\ \
| | |/
| |/| |
|
| | * | Allow guest access to endpoints for E2E | Richard van der Hoff | 2016-11-25 | 3 | -9/+9 |
| | * | Give guest users a device_id | Richard van der Hoff | 2016-11-25 | 1 | -4/+15 |
* | | | Stop generating refresh tokens | Richard van der Hoff | 2016-11-28 | 2 | -21/+12 |
|/ / |
|
* / | Shuffle receipt handler around so that worker apps don't need to load it | Erik Johnston | 2016-11-23 | 1 | -1/+1 |
|/ |
|
* | Merge pull request #1638 from matrix-org/kegan/sync-event-fields | Kegsay | 2016-11-22 | 1 | -10/+13 |
|\ |
|
| * | Glue only_event_fields into the sync rest servlet | Kegan Dougal | 2016-11-22 | 1 | -10/+13 |
* | | Fix flake8 | Mark Haines | 2016-11-18 | 1 | -1/+0 |
* | | Work around client replacing reg params | David Baker | 2016-11-18 | 1 | -0/+12 |
|/ |
|
* | Clean transactions based on time. Add HttpTransactionCache tests. | Kegan Dougal | 2016-11-14 | 3 | -7/+21 |
* | Move .observe() up to the cache to make things neater | Kegan Dougal | 2016-11-14 | 3 | -33/+11 |
* | Review comments | Kegan Dougal | 2016-11-11 | 5 | -158/+119 |
* | 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 |
* | Use observable deferreds because they are sane | Kegan Dougal | 2016-11-11 | 1 | -3/+4 |
* | Flake8 | Kegan Dougal | 2016-11-10 | 2 | -4/+4 |
* | Store Promise<Response> instead of Response for HTTP API transactions | Kegan Dougal | 2016-11-10 | 4 | -88/+68 |
* | Merge pull request #1164 from pik/error-codes | Erik Johnston | 2016-10-19 | 1 | -6/+6 |
|\ |
|
| * | Refactor test_filter to use real DataStore | pik | 2016-10-18 | 1 | -2/+2 |
| * | Error codes for filters | Alexander Maznev | 2016-10-14 | 1 | -4/+4 |
* | | Handle delete device requests with no body | Richard van der Hoff | 2016-10-12 | 1 | -2/+11 |
* | | User-interactive auth on delete device | Richard van der Hoff | 2016-10-12 | 1 | -5/+11 |
* | | Merge pull request #1157 from Rugvip/nolimit | Erik Johnston | 2016-10-11 | 1 | -4/+7 |
|\ \
| |/
|/| |
|
| * | 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 |
* | | window.postmessage for Interactive Auth fallback | Richard van der Hoff | 2016-10-06 | 1 | -1/+3 |
|/ |
|
* | 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 |
* | Move the E2E key handling into the e2e handler | Mark Haines | 2016-09-13 | 1 | -112/+16 |
* | Add a timeout parameter for end2end key queries. | Mark Haines | 2016-09-12 | 1 | -26/+51 |
* | 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 | 5 | -20/+16 |
|\ |
|
| * | Add helper function for getting access_tokens from requests | Mark Haines | 2016-09-09 | 5 | -20/+16 |
* | | Merge pull request #1091 from matrix-org/paul/third-party-lookup | Paul Evans | 2016-09-09 | 1 | -0/+24 |
|\ \ |
|
| * | | appease pep8 | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -1/+2 |
| * | | Python isn't JavaScript; have to quote dict keys | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -1/+1 |
| * | | Efficiency fix for lookups of a single protocol | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -1/+3 |
| * | | Allow lookup of a single 3PE protocol query metadata | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -0/+21 |
* | | | 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 |
| |/
|/| |
|
* | | Merge pull request #1081 from matrix-org/dbkr/notifications_only_highlight | Matthew Hodgson | 2016-09-09 | 1 | -1/+2 |
|\ \
| |/
|/| |
|
| * | Implement `only=highlight` on `/notifications` | David Baker | 2016-09-08 | 1 | -1/+2 |
* | | Merge pull request #1082 from matrix-org/erikj/remote_public_rooms | Erik Johnston | 2016-09-08 | 1 | -6/+17 |
|\ \ |
|
| * | | Use parse_string | Erik Johnston | 2016-09-08 | 1 | -2/+2 |
| * | | Add server param to /publicRooms | Erik Johnston | 2016-09-08 | 1 | -5/+16 |
| |/ |
|
* / | Send device messages over federation | Mark Haines | 2016-09-06 | 1 | -26/+7 |
|/ |
|
* | Fix up the calls to the notifier for device messages | Mark Haines | 2016-09-01 | 1 | -1/+1 |
* | Add a replication stream for direct to device messages | Mark Haines | 2016-08-31 | 1 | -2/+8 |
* | Merge remote-tracking branch 'origin/develop' into markjh/direct_to_device | Mark Haines | 2016-08-26 | 1 | -1/+1 |
|\ |
|
| * | Move ThirdPartyEntityKind into api.constants so the expectation becomes that ... | Paul "LeoNerd" Evans | 2016-08-25 | 1 | -1/+1 |
* | | Merge branch 'develop' into markjh/direct_to_device | Mark Haines | 2016-08-25 | 2 | -4/+21 |
|\| |
|
| * | Merge pull request #1041 from matrix-org/paul/third-party-lookup | Paul Evans | 2016-08-25 | 1 | -2/+20 |
| |\ |
|
| | * | Move static knowledge of protocol metadata into AS handler; cache the result | Paul "LeoNerd" Evans | 2016-08-24 | 1 | -20/+1 |
| | * | Declare 'gitter' known protocol, with user lookup | Paul "LeoNerd" Evans | 2016-08-24 | 1 | -0/+3 |
| | * | Initial hack at the 3PN protocols metadata lookup API | Paul "LeoNerd" Evans | 2016-08-24 | 1 | -0/+34 |
| | * | Move 3PU/3PL lookup APIs into /thirdparty containing entity | Paul "LeoNerd" Evans | 2016-08-24 | 1 | -2/+2 |
| * | | Preserve some logcontexts | Erik Johnston | 2016-08-24 | 1 | -2/+1 |
| |/ |
|
* | | Add some TODOs | Mark Haines | 2016-08-25 | 1 | -0/+4 |
* | | Fix the deduplication of incoming direct-to-device messages | Mark Haines | 2016-08-25 | 1 | -1/+12 |
* | | Add store-and-forward direct-to-device messaging | Mark Haines | 2016-08-25 | 2 | -3/+75 |
|/ |
|
* | Pass through user-supplied content in /join/$room_id | Kegan Dougal | 2016-08-23 | 1 | -0/+1 |
* | Merge branch 'develop' into dbkr/notifications_api | Matthew Hodgson | 2016-08-20 | 1 | -0/+78 |
|\ |
|
| * | Avoid so much copypasta between 3PU and 3PL query by unifying around a ThirdP... | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -2/+7 |
| * | Authenticate 3PE lookup requests | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -0/+6 |
| * | Copypasta the 3PU support code to also do 3PL | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -0/+20 |
| * | Remove TODO note about request fields being strings - they're always strings | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -2/+0 |
| * | Merge remote-tracking branch 'origin/develop' into paul/thirdpartylookup | Paul "LeoNerd" Evans | 2016-08-18 | 9 | -5/+89 |
| |\ |
|
| * | | Ensure that 3PU lookup request fields actually get passed in | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -1/+5 |
| * | | Thread 3PU lookup through as far as the AS API object; which currently noöps it | Paul "LeoNerd" Evans | 2016-08-17 | 1 | -2/+9 |
| * | | Initial empty implementation that just registers an API endpoint handler | Paul "LeoNerd" Evans | 2016-08-17 | 1 | -0/+38 |
* | | | Use tuple comparison | David Baker | 2016-08-18 | 1 | -4/+3 |
* | | | Merge remote-tracking branch 'origin/develop' into dbkr/notifications_api | David Baker | 2016-08-18 | 10 | -6/+90 |
|\ \ \
| | |/
| |/| |
|
| * | | 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 |
| |/ |
|
| * | Don't change status_msg on /sync | Will Hunt | 2016-08-10 | 1 | -1/+1 |
* | | Merge remote-tracking branch 'origin/develop' into dbkr/notifications_api | David Baker | 2016-08-11 | 16 | -380/+800 |
|\| |
|
| * | 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 |
| |/ |
|
| * | Merge branch 'rav/null_default_device_displayname' into develop | Richard van der Hoff | 2016-08-03 | 1 | -3/+1 |
| |\ |
|
| | * | Default device_display_name to null | Richard van der Hoff | 2016-08-03 | 1 | -3/+1 |
| * | | Merge branch 'develop' into rav/refactor_device_query | Mark Haines | 2016-08-03 | 1 | -9/+7 |
| |\| |
|
| | * | Fix adding emails on registration | David Baker | 2016-07-29 | 1 | -9/+7 |
| * | | Move e2e query logic into a handler | Richard van der Hoff | 2016-08-01 | 1 | -39/+7 |
| |/ |
|
| * | Add r0.1.0 to the "supported versions" list | Richard van der Hoff | 2016-07-28 | 1 | -0/+1 |
| * | Add r0.2.0 to the "supported versions" list | Richard van der Hoff | 2016-07-28 | 1 | -1/+4 |
| * | key upload tweaks | Richard van der Hoff | 2016-07-27 | 1 | -7/+5 |
| * | Delete e2e keys on device delete | Richard van der Hoff | 2016-07-27 | 1 | -4/+9 |
| * | Make the device id on e2e key upload optional | Richard van der Hoff | 2016-07-26 | 1 | -12/+35 |
| * | Add `create_requester` function | Richard van der Hoff | 2016-07-26 | 1 | -6/+4 |
| * | Implement updating devices | Richard van der Hoff | 2016-07-26 | 1 | -7/+17 |
| * | Implement deleting devices | Richard van der Hoff | 2016-07-26 | 3 | -8/+29 |
| * | Merge pull request #943 from matrix-org/rav/get_device_api | David Baker | 2016-07-21 | 1 | -0/+25 |
| |\ |
|
| | * | Implement GET /device/{deviceId} | Richard van der Hoff | 2016-07-21 | 1 | -0/+25 |
| * | | Merge pull request #942 from matrix-org/rav/fix_register_deviceid | David Baker | 2016-07-21 | 1 | -11/+10 |
| |\ \
| | |/
| |/| |
|
| | * | Preserve device_id from first call to /register | Richard van der Hoff | 2016-07-21 | 1 | -11/+10 |
| * | | Merge branch 'develop' into rav/get_devices_api | Richard van der Hoff | 2016-07-20 | 1 | -15/+39 |
| |\| |
|
| | * | Register a device_id in the /v2/register flow. | Richard van der Hoff | 2016-07-20 | 1 | -15/+39 |
| * | | GET /devices endpoint | Richard van der Hoff | 2016-07-20 | 2 | -4/+60 |
| |/ |
|
| * | Merge pull request #933 from matrix-org/rav/type_annotations | Richard van der Hoff | 2016-07-20 | 3 | -0/+17 |
| |\ |
|
| | * | Type annotations | Richard van der Hoff | 2016-07-19 | 3 | -0/+17 |
| * | | Merge pull request #932 from matrix-org/rav/register_refactor | David Baker | 2016-07-20 | 2 | -14/+40 |
| |\ \ |
|
| | * | | Further registration refactoring | Richard van der Hoff | 2016-07-19 | 2 | -14/+40 |
| | |/ |
|
| * | | 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 |
| * | | Merge pull request #931 from matrix-org/rav/refactor_register | David Baker | 2016-07-19 | 1 | -78/+102 |
| |\ \ |
|
| | * | | Don't bind email unless threepid contains expected fields | Richard van der Hoff | 2016-07-19 | 1 | -28/+25 |
| | * | | rest/client/v2_alpha/register.py: Refactor flow somewhat. | Richard van der Hoff | 2016-07-19 | 1 | -75/+102 |
| * | | | Add device_id support to /login | Richard van der Hoff | 2016-07-18 | 2 | -6/+43 |
| |/ / |
|
| * | | Merge pull request #928 from matrix-org/rav/refactor_login | Richard van der Hoff | 2016-07-18 | 1 | -18/+23 |
| |\ \ |
|
| | * | | Refactor login flow | Richard van der Hoff | 2016-07-18 | 1 | -18/+23 |
| * | | | Use body.get to check for 'user' | Will Hunt | 2016-07-16 | 1 | -2/+1 |
| * | | | Fall back to 'username' if 'user' is not given for appservice reg. | Will Hunt | 2016-07-16 | 1 | -3/+5 |
| |/ / |
|
| * | | Merge pull request #921 from matrix-org/erikj/account_deactivate | Erik Johnston | 2016-07-14 | 1 | -0/+44 |
| |\ \ |
|
| | * | | Add hs object | Erik Johnston | 2016-07-14 | 1 | -0/+1 |
| | * | | Only accept password auth | Erik Johnston | 2016-07-14 | 1 | -12/+0 |
| | * | | Add an /account/deactivate endpoint | Erik Johnston | 2016-07-14 | 1 | -0/+55 |
| | |/ |
|
| * | | Merge pull request #918 from negzi/bugfix_for_token_expiry | Erik Johnston | 2016-07-14 | 1 | -1/+1 |
| |\ \
| | |/
| |/| |
|
| | * | Bug fix: expire invalid access tokens | Negar Fazeli | 2016-07-13 | 1 | -1/+1 |
| * | | be more pythonic | David Baker | 2016-07-12 | 1 | -1/+1 |
| * | | on_OPTIONS isn't neccessary | David Baker | 2016-07-12 | 2 | -10/+1 |
| * | | Remove other debug logging | David Baker | 2016-07-12 | 1 | -2/+0 |
| * | | Separate out requestTokens to separate handlers | David Baker | 2016-07-11 | 2 | -65/+93 |
| * | | Oops, remove debug logging | David Baker | 2016-07-11 | 1 | -4/+0 |
| * | | Implement https://github.com/matrix-org/matrix-doc/pull/346/files | David Baker | 2016-07-08 | 1 | -0/+59 |
| |/ |
|
| * | 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 | 5 | -10/+11 |
| |\ |
|
| | * | Split out the auth handler | David Baker | 2016-06-02 | 5 | -10/+11 |
| * | | 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 |
* | | Include the ts the notif was received at | David Baker | 2016-05-24 | 1 | -0/+1 |
* | | Actually make the 'read' flag correct | David Baker | 2016-05-23 | 1 | -4/+3 |
* | | Add GET /notifications API | David Baker | 2016-05-23 | 1 | -0/+100 |
|/ |
|
* | 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 SyncHandler out of the Handlers object | Mark Haines | 2016-05-16 | 1 | -2/+1 |
* | Move the presence handler out of the Handlers object | Mark Haines | 2016-05-16 | 4 | -9/+17 |
* | Create user with expiry | Negi Fazeli | 2016-05-13 | 1 | -0/+71 |
* | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-05-10 | 2 | -0/+155 |
|\ |
|
| * | Rename openid/token to openid/request_token | Mark Haines | 2016-05-05 | 1 | -2/+2 |
| * | Add an openidish mechanism for proving to third parties that you own a given ... | Mark Haines | 2016-05-05 | 1 | -0/+96 |
| * | Add timestamp and auto incrementing ID | Erik Johnston | 2016-05-04 | 1 | -0/+2 |
| * | Move event_id to path | Erik Johnston | 2016-05-04 | 1 | -4/+2 |
| * | Add /report endpoint | Erik Johnston | 2016-05-04 | 1 | -0/+59 |
* | | More consistent config naming | David Baker | 2016-05-10 | 1 | -1/+1 |
* | | Add config option to not send email notifs for new users | David Baker | 2016-05-10 | 1 | -1/+4 |
* | | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-04-29 | 1 | -0/+1 |
|\| |
|
| * | Fix password reset | David Baker | 2016-04-29 | 1 | -0/+1 |
* | | Add an email pusher for new users | David Baker | 2016-04-29 | 1 | -0/+26 |
|/ |
|
* | 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 v2_alpha reg follow the AS API specification | Kegan Dougal | 2016-04-14 | 1 | -0/+5 |
* | | 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 |
|/ |
|
* | Use google style doc strings. | Mark Haines | 2016-04-01 | 1 | -36/+43 |
* | 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 |
* | Deduplicate identical /sync requests | Mark Haines | 2016-03-24 | 1 | -0/+3 |
* | Add published room list edit API | Erik Johnston | 2016-03-21 | 1 | -0/+42 |
* | Merge pull request #652 from matrix-org/erikj/delete_alias | Erik Johnston | 2016-03-18 | 1 | -1/+2 |
|\ |
|
| * | Update aliases event after deletion | Erik Johnston | 2016-03-17 | 1 | -1/+2 |
* | | remove debug logging | David Baker | 2016-03-16 | 1 | -3/+0 |
* | | Unused import | David Baker | 2016-03-16 | 1 | -1/+0 |
* | | Make registration idempotent, part 2: be idempotent if the client specifies a... | David Baker | 2016-03-16 | 1 | -5/+17 |
|/ |
|
* | take extra return val from check_auth in account too | David Baker | 2016-03-16 | 1 | -1/+1 |
* | pep8 & remove debug logging | David Baker | 2016-03-16 | 1 | -4/+5 |
* | Make registration idempotent: if you specify the same session, make it give y... | David Baker | 2016-03-16 | 1 | -1/+26 |
* | 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 | 7 | -71/+29 |
|/ |
|
* | Fix cache invalidation so deleting access tokens (which we did when changing ... | David Baker | 2016-03-11 | 1 | -1/+1 |
* | Register endpoint returns refresh_token | blide | 2016-03-10 | 1 | -5/+8 |
* | Add a parse_json_object function | Mark Haines | 2016-03-09 | 10 | -116/+32 |
* | 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 |