summary refs log tree commit diff
path: root/synapse/rest/client (follow)
Commit message (Expand)AuthorAgeFilesLines
* Add API for setting account_data globaly or on a per room basisMark Haines2015-12-013-0/+119
* Host /unstable and /r0 versions of r0 APIsDaniel Wagner-Hall2015-12-0123-104/+118
* Rename presence_handler.send_invite to presence_handler.send_presence_invite ...Mark Haines2015-12-011-1/+1
* Merge pull request #385 from matrix-org/daniel/forgetroomsMark Haines2015-11-201-3/+10
|\
| * Merge branch 'develop' into daniel/forgetroomsPaul "LeoNerd" Evans2015-11-192-5/+5
| |\
| * | Allow users to forget roomsDaniel Wagner-Hall2015-11-171-3/+10
* | | Merge pull request #389 from matrix-org/rav/flatten_sync_responseRichard van der Hoff2015-11-201-25/+16
|\ \ \
| * \ \ Merge branch 'develop' into rav/flatten_sync_responsePaul "LeoNerd" Evans2015-11-192-5/+5
| |\ \ \ | | | |/ | | |/|
| * | | Put back the 'state.events' subobjectRichard van der Hoff2015-11-191-1/+1
| * | | v2 /sync: Rename the keys of the 'rooms' object to match member statesRichard van der Hoff2015-11-191-3/+3
| * | | Flatten the /sync response to remove the event_mapRichard van der Hoff2015-11-191-22/+13
| | |/ | |/|
* | | Merge pull request #391 from matrix-org/erikj/remove_token_from_flowErik Johnston2015-11-201-1/+10
|\ \ \ | |_|/ |/| |
| * | CommentErik Johnston2015-11-201-0/+8
| * | Remove m.login.token from advertised flows.Erik Johnston2015-11-191-1/+2
| |/
* / s/private_user_data/account_data/Mark Haines2015-11-182-5/+5
|/
* Merge branch 'develop' into sh-cas-auth-via-homeserverSteven Hammerton2015-11-173-15/+152
|\
| * Allow guests to /room/:room_id/{join,leave}Daniel Wagner-Hall2015-11-131-3/+14
| * Implementation of state rollback in /syncRichard van der Hoff2015-11-131-2/+65
| * Make handlers.sync return a state dictionary, instead of an event list.Richard van der Hoff2015-11-131-1/+1
| * Update some commentsRichard van der Hoff2015-11-131-0/+56
| * Merge pull request #360 from matrix-org/daniel/guestroominitialsyncDaniel Wagner-Hall2015-11-121-1/+2
| |\
| | * Allow guest access to room initialSyncDaniel Wagner-Hall2015-11-111-1/+2
| * | Allow guests to set their display namesDaniel Wagner-Hall2015-11-121-1/+1
| * | Allow guests to access room context APIDaniel Wagner-Hall2015-11-111-2/+2
| |/
| * Allow guest users to join and message roomsDaniel Wagner-Hall2015-11-101-3/+10
| * Merge pull request #356 from matrix-org/daniel/3pidyetagainDaniel Wagner-Hall2015-11-101-2/+1
| |\
| | * Get display name from identity server, not clientDaniel Wagner-Hall2015-11-091-2/+1
| * | Add a couple of unit tests for room/<x>/messagesRichard van der Hoff2015-11-091-1/+1
| |/
* | Snakes not camelsSteven Hammerton2015-11-111-5/+5
* | Minor review fixesSteven Hammerton2015-11-111-13/+10
* | Merge branch 'develop' into sh-cas-auth-via-homeserverSteven Hammerton2015-11-052-17/+25
|\|
| * Merge pull request #350 from matrix-org/erikj/searchErik Johnston2015-11-051-1/+2
| |\
| | * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/searchErik Johnston2015-11-0517-45/+82
| | |\
| | * | Implement basic pagination for search resultsErik Johnston2015-11-051-1/+2
| * | | Exchange 3pid invites for m.room.member invitesDaniel Wagner-Hall2015-11-051-12/+8
| | |/ | |/|
| * | Open up /events to anonymous users for room events onlyDaniel Wagner-Hall2015-11-052-4/+15
* | | Allow hs to do CAS login completely and issue the client with a login token t...Steven Hammerton2015-11-051-1/+144
|/ /
* / Allow guests to register and call /events?room_id=Daniel Wagner-Hall2015-11-0417-44/+70
|/
* That TODO was doneMark Haines2015-11-031-1/+0
* Include room tags in v2 /syncMark Haines2015-11-021-0/+5
* Store room tag content and return the content in the m.tag eventMark Haines2015-11-021-2/+10
* Merge branch 'develop' into markjh/room_tagsMark Haines2015-11-022-2/+40
|\
| * Merge pull request #334 from matrix-org/erikj/context_apiErik Johnston2015-10-281-0/+36
| |\
| | * Add room context apiErik Johnston2015-10-281-0/+36
| * | Implement full_state incremental syncRichard van der Hoff2015-10-261-2/+4
| |/
* | Inform the client of new room tags using v1 /eventsMark Haines2015-10-291-3/+11
* | Fix pyflakes errorsMark Haines2015-10-281-0/+2
* | Add APIs for adding and removing tags from roomsMark Haines2015-10-282-0/+91
|/
* Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into developErik Johnston2015-10-231-1/+7
|\
| * Add config option to disable password loginErik Johnston2015-10-221-1/+7
* | Merge pull request #319 from matrix-org/erikj/filter_refactorErik Johnston2015-10-221-2/+2
|\ \
| * | Refactor api.filtering to have a Filter APIErik Johnston2015-10-201-2/+2
* | | Merge pull request #316 from matrix-org/markjh/v2_sync_archivedMark Haines2015-10-211-6/+23
|\ \ \
| * | | Add rooms that the user has left under archived in v2 sync.Mark Haines2015-10-191-6/+23
* | | | Use 403 and message to match handlers/authKegan Dougal2015-10-211-3/+1
* | | | Don't 500 when the email doesn't map to a valid user ID.Kegan Dougal2015-10-201-0/+4
| |/ / |/| |
* | | Merge pull request #307 from matrix-org/erikj/searchErik Johnston2015-10-191-0/+17
|\ \ \
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/searchErik Johnston2015-10-161-5/+31
| |\| |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/searchErik Johnston2015-10-151-78/+92
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'erikj/store_engine' into erikj/searchErik Johnston2015-10-131-27/+57
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/develop' into erikj/searchErik Johnston2015-10-122-2/+78
| |\ \ \ \
| * | | | | Keep FTS indexes up to date. Only search through rooms currently joinedErik Johnston2015-10-121-1/+1
| * | | | | Add basic full text search impl.Erik Johnston2015-10-091-0/+17
* | | | | | Merge pull request #306 from matrix-org/markjh/unused_methodsMark Haines2015-10-161-30/+0
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | synapse.client.v1.login.LoginFallbackRestServlet and synapse.client.v1.login....Mark Haines2015-10-151-30/+0
| | |_|_|/ | |/| | |
* | | | | Merge branch 'develop' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-151-78/+92
|\| | | |
| * | | | Include invites in incremental syncMark Haines2015-10-131-1/+1
| * | | | Include invited rooms in the initial syncMark Haines2015-10-131-1/+20
| * | | | Merge branch 'develop' into markjh/v2_sync_apiMark Haines2015-10-132-2/+108
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Start spliting out the rooms into joined and invited in v2 syncMark Haines2015-10-131-9/+9
| * | | | Update the filters to match the latest spec.Mark Haines2015-10-121-15/+11
| * | | | Set the user as online if they start polling the v2 syncMark Haines2015-10-091-3/+11
| * | | | Merge branch 'markjh/eventstream_presence' into markjh/v2_sync_apiMark Haines2015-10-091-0/+4
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Format the presence events correctly for v2Mark Haines2015-10-091-3/+9
| * | | | Update the v2 room sync format to match the current v2 specMark Haines2015-10-081-7/+7
| * | | | Update the sync response to match the latest specMark Haines2015-10-071-24/+22
| * | | | Move the rooms out into a room_map mapping from room_id to room.Mark Haines2015-10-051-13/+31
| * | | | Start updating the sync API to match the specificationMark Haines2015-10-011-53/+22
* | | | | Remove unnecessary class-wrappingDaniel Wagner-Hall2015-10-131-5/+6
* | | | | Move logic into handlerDaniel Wagner-Hall2015-10-131-115/+18
* | | | | Add loggingDaniel Wagner-Hall2015-10-131-2/+2
* | | | | Move event contents into third_party_layout fieldDaniel Wagner-Hall2015-10-131-1/+2
* | | | | Merge branch 'develop' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-132-2/+108
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Add a comment to clarify why we split on closing curly brace when reading CAS...Steven Hammerton2015-10-121-0/+5
| * | | | Unpack dictionary in for loop for nicer syntaxSteven Hammerton2015-10-121-4/+4
| * | | | Remove not required parenthesisSteven Hammerton2015-10-121-1/+1
| * | | | Support multiple required attributes in CAS response, and in a nicer config f...Steven Hammerton2015-10-121-7/+6
| * | | | Allow optional config params for a required attribute and it's value, if spec...Steven Hammerton2015-10-121-1/+15
| * | | | Parse both user and attributes from CAS responseSteven Hammerton2015-10-121-26/+38
| | |_|/ | |/| |
| * | | Raise LoginError if CasResponse doensn't contain userSteven Hammerton2015-10-101-1/+1
| * | | Fix my broken line splittingSteven Hammerton2015-10-101-4/+6
| * | | Use UserId to create FQ user idSteven Hammerton2015-10-101-1/+1
| * | | Add get_raw method to SimpleHttpClient, use this in CAS auth rather than requ...Steven Hammerton2015-10-101-5/+8
| * | | Formatting changesSteven Hammerton2015-10-101-5/+12
| * | | Provide ability to login using CASSteven Hammerton2015-10-101-1/+63
| * | | Use 'true' rather than '1' for archived flagMark Haines2015-10-081-1/+1
| * | | Add a flag to initial sync to indicate we want rooms that the user has leftMark Haines2015-10-081-1/+3
| | |/ | |/|
* | | Fix lint errorsDaniel Wagner-Hall2015-10-061-3/+4
* | | Merge branch 'develop' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-051-0/+4
|\| |
| * | Validate the receipt type before passing it on to the receipt handlerKegan Dougal2015-10-011-0/+4
| |/
* / Implement third party identifier invitesDaniel Wagner-Hall2015-10-011-6/+126
|/
* Merge pull request #276 from matrix-org/markjh/history_for_rooms_that_have_be...Mark Haines2015-09-212-9/+13
|\
| * Remove undocumented and unimplemented 'feedback' parameter from the Client-Se...Mark Haines2015-09-092-4/+0
| * Allow users that have left the room to view the member list from the point th...Mark Haines2015-09-091-5/+13
* | Merge pull request #274 from matrix-org/add_threepid_fixDavid Baker2015-09-101-0/+1
|\ \ | |/ |/|
| * Fix adding threepids to an existing accountDavid Baker2015-09-101-0/+1
| * When logging in fetch user by user_id case insensitively, *unless* there are ...Erik Johnston2015-08-211-2/+3
* | Merge erikj/user_dedup to developDaniel Wagner-Hall2015-08-261-2/+3
* | Merge pull request #248 from matrix-org/deviceidDaniel Wagner-Hall2015-08-2514-43/+42
|\ \
| * | Fix up one more referenceDaniel Wagner-Hall2015-08-251-3/+2
| * | Remove completely unused concepts from codebaseDaniel Wagner-Hall2015-08-2514-41/+41
* | | Remove syutil dependency in favour of smaller single-purpose librariesMark Haines2015-08-242-2/+3
|/ /
* | Return fully qualified user_id as per specDavid Baker2015-08-201-1/+1
* | Merge branch 'develop' into refreshDaniel Wagner-Hall2015-08-203-5/+40
|\|
| * Remove spurious extra arg to set_passwordDavid Baker2015-08-201-1/+1
| * Comma comma comma comma comma chameleonDavid Baker2015-08-201-1/+1
| * Merge branch 'develop' into email_loginDavid Baker2015-08-204-44/+80
| |\
| | * Merge pull request #211 from matrix-org/email_in_useMark Haines2015-08-201-0/+28
| | |\
| | | * Check absent before trying to access keysDavid Baker2015-08-121-3/+3
| | | * Just leaving off the $ is fine. r* == registerrrrrrrrrDavid Baker2015-08-121-1/+1
| * | | Allow sign in using email addressDavid Baker2015-08-041-5/+12
| | |/ | |/|
| * | Remember to yield: not much point testing is a deferred is not NoneDavid Baker2015-08-041-1/+2
| * | splt long lineDavid Baker2015-08-041-1/+3
| * | Add endpoint that proxies ID server request token and errors if the given ema...David Baker2015-08-041-1/+26
* | | /tokenrefresh POST endpointDaniel Wagner-Hall2015-08-203-2/+62
| |/ |/|
* | Merge pull request #208 from matrix-org/markjh/end-to-end-key-federationMark Haines2015-08-181-30/+70
|\ \
| * | Merge remote-tracking branch 'origin/develop' into markjh/end-to-end-key-fede...Mark Haines2015-08-131-54/+73
| |\|
| * | Get the end-to-end key federation workingMark Haines2015-07-241-5/+5
| * | Add federation support for end-to-end key requestsMark Haines2015-07-231-30/+70
* | | Simplify LoginHander and AuthHandlerDaniel Wagner-Hall2015-08-123-10/+6
| |/ |/|
* | Don't try & check the username if we don't have one (which we won't if it's b...David Baker2015-08-031-1/+2
* | Use the same reg paths as register v1 for ASes.Kegan Dougal2015-07-291-4/+6
* | Fix v2_alpha registration. Add unit tests.Kegan Dougal2015-07-281-54/+70
|/
* Query for all the ones we were asked about, not just the last...David Baker2015-07-211-1/+1
* s/take/claim/ for end to end key APIsMark Haines2015-07-201-5/+5
* Remove semicolon.Kegan Dougal2015-07-201-1/+1
* Parse the ID given to /invite|ban|kick to make sure it looks like a user ID.Kegan Dougal2015-07-201-0/+2
* Merge pull request #199 from matrix-org/erikj/receiptsErik Johnston2015-07-162-0/+57
|\
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receiptsErik Johnston2015-07-133-1/+352
| |\
| * | Wire together receipts and the notifer/federationErik Johnston2015-07-071-2/+1
| * | Add a ReceiptServletErik Johnston2015-07-072-1/+59
* | | pep8 + debug lineDavid Baker2015-07-151-6/+8
* | | Add back in support for remembering parameters submitted to a user-interactiv...David Baker2015-07-151-2/+9
| |/ |/|
* | Merge pull request #198 from matrix-org/markjh/client-end-to-end-key-managementErik Johnston2015-07-102-1/+279
|\ \
| * | Assume that each device for a user has only one of each type of keyMark Haines2015-07-101-3/+3
| * | Don't bother with a timeout for one time keys on the server.Mark Haines2015-07-091-18/+7
| * | Add client API for uploading and querying keys for end to end encryptionMark Haines2015-07-062-1/+290
| |/
* | Small tweaks to SAML2 configuration.Erik Johnston2015-07-101-4/+4
* | Make SAML2 optional and add some references/commentsMuthu Subramanian2015-07-091-4/+9
* | code beautifyMuthu Subramanian2015-07-091-9/+4
* | code beautifyMuthu Subramanian2015-07-081-10/+23
* | Integrate SAML2 basic authentication - uses pysaml2Muthu Subramanian2015-07-081-1/+61
|/
* Remove access_token from synapse.rest.client.v1.transactions {get,store}_resp...Erik Johnston2015-06-161-3/+3
* Add config option to turn off freezing events. Use new encode_json api and uj...Erik Johnston2015-05-292-2/+2
* Merge pull request #165 from matrix-org/bugs/SYN-390Erik Johnston2015-05-261-5/+8
|\
| * SYN-390: Don't modify the dictionary returned from the data storeMark Haines2015-05-261-5/+8
* | Make shared secret registration work againDavid Baker2015-05-141-1/+4
|/
* user_id now in user_threepidsDavid Baker2015-05-011-3/+3
* pep8David Baker2015-04-271-1/+2
* logging argsDavid Baker2015-04-271-2/+2
* More underscoresDavid Baker2015-04-242-4/+4
* Use underscores instead of camelcase for id server stuffDavid Baker2015-04-241-2/+2
* Merge branch 'develop' into csauthDavid Baker2015-04-241-9/+11
|\
| * Combine the request wrappers in rest/media/v1 and http/server into a single w...Mark Haines2015-04-211-9/+11
* | Dedicated error code for failed 3pid auth verificationDavid Baker2015-04-231-1/+3
* | Password reset, finally.David Baker2015-04-171-5/+16
* | Add endpoint to get threepids from serverDavid Baker2015-04-171-0/+12
* | make add3pid servlet workDavid Baker2015-04-172-12/+64
* | just the once would probably be fineDavid Baker2015-04-171-1/+0
* | Register the 3pid servletDavid Baker2015-04-171-1/+3
* | password -> account servlet and add start of an 'add 3pid' endpointDavid Baker2015-04-172-2/+17
* | Return user ID in use error straight awayDavid Baker2015-04-161-2/+23
* | Dummy login so we can do the first POST request to get login flows without it...David Baker2015-04-151-4/+14
* | Regstration with email in v2David Baker2015-04-152-7/+7
* | Add app service auth back in to v2 registerDavid Baker2015-04-021-2/+7
* | Throw sensible errors on not-json when allowing empty bodyDavid Baker2015-04-021-1/+4
* | pep8David Baker2015-04-021-0/+1
* | Add shared secret auth into register v2 and switch the script over.David Baker2015-04-021-11/+58
* | Completely replace fallback auth for C/S V2:David Baker2015-04-013-2/+193
* | pep8David Baker2015-03-312-3/+4
* | New registration for C/S API v2. Only ReCAPTCHA working currently.David Baker2015-03-303-1/+95
* | Allow multiple pushers for a single app ID & pushkey, honouring the 'append' ...David Baker2015-03-251-1/+12
* | 1) Pushers are now associated with an access tokenDavid Baker2015-03-242-2/+3
* | Make deleting other access tokens when you change your password actually workDavid Baker2015-03-241-1/+4
* | pep8 / pyflakesDavid Baker2015-03-231-2/+2
* | Implement password changing (finally) along with a start on making client/ser...David Baker2015-03-233-1/+91
|/
* Factor out user id validation checksErik Johnston2015-03-181-9/+5
* Do more validation of incoming requestErik Johnston2015-03-181-3/+3
* Use 403 instead of 400Erik Johnston2015-03-161-1/+1
* Implement registering with shared secret.Erik Johnston2015-03-131-2/+55
* Add the master push rule for the break-my-push button. Allow server default r...David Baker2015-03-101-1/+4
* s/user_name/user/ as per mjark's commentDavid Baker2015-03-021-3/+3
* Oops, missed a replacement.David Baker2015-03-021-1/+1
* Blank linesDavid Baker2015-03-021-0/+1
* It's set_tweak now, not set_soundDavid Baker2015-02-271-1/+1
* Add API for getting/setting enabled-ness of push rules.David Baker2015-02-261-5/+49
* SYWEB-278 Don't allow rules with no rule_id.David Baker2015-02-251-1/+1
* Always allow AS to registerErik Johnston2015-02-201-3/+5
* Disable registration if config option was set.Erik Johnston2015-02-191-0/+4
* Merge pull request #50 from matrix-org/application-servicesMark Haines2015-02-132-14/+70
|\
| * Merge branch 'develop' into application-servicesKegan Dougal2015-02-114-9/+17
| |\
| * \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-092-2/+2
| |\ \
| * | | Grant ASes the ability to delete aliases in their own namespace.Kegan Dougal2015-02-061-2/+29
| * | | Grant ASes the ability to create alias in their own namespace.Kegan Dougal2015-02-061-11/+18
| * | | Add m.login.application_service registration procedure.Kegan Dougal2015-02-051-1/+23
* | | | Blunty replace json with simplejsonErik Johnston2015-02-119-9/+9
| |_|/ |/| |
* | | Fix code-styleMark Haines2015-02-102-2/+2
* | | Code-style fixesMark Haines2015-02-102-7/+15
| |/ |/|
* | Log when we receive a request, when we send a response and how long it took t...Erik Johnston2015-02-092-2/+2
|/
* priority class now dealt with in namespaced rule_idDavid Baker2015-02-051-4/+0
* Give server default rules the 'default' attribute and fix various brokenness.David Baker2015-02-051-1/+3
* Server default rules now of all kinds rather than all being at lowest prio.David Baker2015-02-051-39/+32
* namespace rule IDs to be unique within their scope and rule type.David Baker2015-02-051-123/+129
* More s/instance_handle/profile_tag/David Baker2015-02-041-5/+5
* s/instance_handle/profile_tag/David Baker2015-02-032-16/+16
* Spit out server default rules too.David Baker2015-01-301-4/+12
* Merge pull request #41 from matrix-org/client_v2_syncMark Haines2015-01-302-2/+209
|\
| * Pass client info to the sync_configMark Haines2015-01-301-1/+1
| * Filter the recent events before applying the limit when doing an incremental ...Mark Haines2015-01-301-1/+1
| * Add basic filtering supportMark Haines2015-01-291-5/+14
| * Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-291-1/+1
| |\
| * | Move typing notifs to an "emphermal" event list on the room objectMark Haines2015-01-291-2/+2
| * | Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-291-7/+22
| |\ \
| * \ \ Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-291-2/+2
| |\ \ \
| * \ \ \ Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-294-5/+110
| |\ \ \ \
| * | | | | Add typing notifications to syncMark Haines2015-01-291-10/+8
| * | | | | Include transaction ids in unsigned section of events in the sync results for...Mark Haines2015-01-291-7/+16
| * | | | | Add ports back to demo/start.shMark Haines2015-01-281-1/+1
| * | | | | Merge branch 'develop' into client_v2_syncMark Haines2015-01-2811-41/+520
| |\ \ \ \ \
| * | | | | | Fix FormattingMark Haines2015-01-271-3/+2
| * | | | | | Start implementing the non-incremental sync portion of the v2 /sync APIMark Haines2015-01-261-28/+77
| * | | | | | Merge branch 'develop' into client_v2_syncMark Haines2015-01-262-2/+15
| |\ \ \ \ \ \
| * | | | | | | Start implementing the v2_alpha sync APIMark Haines2015-01-233-0/+214
* | | | | | | | Add glob asterisks when running rules.David Baker2015-01-301-4/+1
* | | | | | | | Merge pull request #37 from matrix-org/client_v2_filterErik Johnston2015-01-302-1/+110
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Create a separate filter object to do the actual filtering, so that we canMark Haines2015-01-291-1/+1
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'develop' into client_v2_filterMark Haines2015-01-291-7/+22
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge in auth changes from developMark Haines2015-01-291-2/+2
| | |_|_|_|/ | |/| | | |
| * | | | | Merge changes from developMark Haines2015-01-2911-41/+520
| |\ \ \ \ \
| * | | | | | Add filter JSON sanity checks.Kegan Dougal2015-01-281-1/+1
| * | | | | | Have the Filtering API return Deferreds, so we can do the Datastore implement...Paul "LeoNerd" Evans2015-01-271-3/+5
| * | | | | | Initial trivial implementation of an actual 'Filtering' object; move storage ...Paul "LeoNerd" Evans2015-01-271-13/+12
| * | | | | | Merge branch 'develop' into client_v2_filterPaul "LeoNerd" Evans2015-01-272-2/+15
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Initial minimal attempt at /user/:user_id/filter API - in-memory storage, no ...Paul "LeoNerd" Evans2015-01-262-1/+109
* | | | | | | Renumber priority classes so we can use 0 for defaults.David Baker2015-01-291-5/+5
* | | | | | | Allow kind to be set to null to delete a pusher.David Baker2015-01-291-1/+10
| |_|_|/ / / |/| | | | |
* | | | | | Code style fixes.Mark Haines2015-01-291-7/+22
| |_|/ / / |/| | | |
* | | | | Change uses of get_user_by_req because it returns a tuple now.David Baker2015-01-282-4/+4
| |_|_|/ |/| | |
* | | | Merge pull request #36 from matrix-org/device_id_from_access_tokenMark Haines2015-01-288-39/+51
|\ \ \ \
| * | | | Extract the id token of the token when authing users, include the token and d...Mark Haines2015-01-288-39/+51