summary refs log tree commit diff
path: root/synapse/rest (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | | | | | | | | Apply the filter the 'timeline' and 'ephemeral' keys of rooms. Apply the filter to the 'presence' key of a sync response.
| * | 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 ↵Steven Hammerton2015-10-121-0/+5
| | | | | | | | | | | | | | | | CAS attribute tags
| * | | 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 ↵Steven Hammerton2015-10-121-7/+6
| | | | | | | | | | | | | | | | format too
| * | | Allow optional config params for a required attribute and it's value, if ↵Steven Hammerton2015-10-121-1/+15
| | | | | | | | | | | | | | | | specified any CAS user must have the given attribute and the value must equal
| * | | 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 ↵Steven Hammerton2015-10-101-5/+8
| | | | | | | | | | | | | | | | requests
| * | | 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 ↵Mark Haines2015-09-212-9/+13
|\ | | | | | | | | matrix-org/markjh/history_for_rooms_that_have_been_left SPEC-216: Allow users to view the history of rooms that they have left.
| * Remove undocumented and unimplemented 'feedback' parameter from the ↵Mark Haines2015-09-092-4/+0
| | | | | | | | Client-Server API
| * Allow users that have left the room to view the member list from the point ↵Mark Haines2015-09-091-5/+13
| | | | | | | | they left
* | Merge pull request #274 from matrix-org/add_threepid_fixDavid Baker2015-09-101-0/+1
|\ \ | |/ |/| Fix adding threepids to an existing account
| * Fix adding threepids to an existing accountDavid Baker2015-09-101-0/+1
| |
* | Merge branch 'release-v0.10.0' into developMark Haines2015-08-282-15/+51
|\| | | | | | | | | | | | | Conflicts: synapse/handlers/auth.py synapse/python_dependencies.py synapse/rest/client/v1/login.py
| * ConsistencyErik Johnston2015-08-271-3/+3
| |
| * Check for an internationalised filename firstErik Johnston2015-08-271-8/+14
| |
| * None check the correct variableErik Johnston2015-08-271-2/+3
| |
| * Check for NoneErik Johnston2015-08-271-1/+1
| |
| * Give a sensible error message if the filename is invalid UTF-8Mark Haines2015-08-262-2/+8
| |
| * Handle unicode filenames given when downloading or received over federationMark Haines2015-08-261-5/+21
| |
| * Allow non-ascii filenames for attachmentsMark Haines2015-08-262-8/+15
| |
| * When logging in fetch user by user_id case insensitively, *unless* there are ↵Erik Johnston2015-08-211-2/+3
| | | | | | | | multiple case insensitive matches, in which case require the exact user_id
* | Merge erikj/user_dedup to developDaniel Wagner-Hall2015-08-261-2/+3
| |
* | Merge pull request #248 from matrix-org/deviceidDaniel Wagner-Hall2015-08-2516-45/+44
|\ \ | | | | | | Remove completely unused concepts from codebase
| * | Fix up one more referenceDaniel Wagner-Hall2015-08-251-3/+2
| | |
| * | Remove completely unused concepts from codebaseDaniel Wagner-Hall2015-08-2516-43/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes device_id and ClientInfo device_id is never actually written, and the matrix.org DB has no non-null entries for it. Right now, it's just cluttering up code. This doesn't remove the columns from the database, because that's fiddly.
* | | Remove syutil dependency in favour of smaller single-purpose librariesMark Haines2015-08-244-8/+9
|/ /
* | Return fully qualified user_id as per specDavid Baker2015-08-201-1/+1
| |
* | Merge branch 'develop' into refreshDaniel Wagner-Hall2015-08-205-26/+207
|\| | | | | | | | | Conflicts: synapse/rest/client/v1/login.py
| * Remove spurious extra arg to set_passwordDavid Baker2015-08-201-1/+1
| |
| * Merge pull request #206 from matrix-org/erikj/generate_presice_thumbnailsMark Haines2015-08-202-21/+167
| |\ | | | | | | Always return a thumbnail of the requested size.
| | * Merge remote-tracking branch 'origin/develop' into ↵Mark Haines2015-08-132-88/+116
| | |\ | | | | | | | | | | | | erikj/generate_presice_thumbnails
| | * | Add config option for setting the list of thumbnail sizes to precalculateMark Haines2015-08-121-16/+2
| | | |
| | * | Make a config option for whether to generate new thumbnail sizes dynamicallyMark Haines2015-08-122-7/+19
| | | |
| | * | Factor out thumbnail()Erik Johnston2015-07-231-56/+40
| | | |
| | * | Fix remote thumbnailingErik Johnston2015-07-232-7/+11
| | | |
| | * | Always return a thumbnail of the requested size.Erik Johnston2015-07-232-2/+162
| | | | | | | | | | | | | | | | | | | | | | | | Before, we returned a thumbnail that was at least as big (if possible) as the requested size. Now, if we don't have a thumbnail of the given size we generate (and persist) one of that size.
| * | | 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
| | |\ \ \ | | | | | | | | | | | | Changes for unique emails
| | | * | | 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 ↵David Baker2015-08-041-1/+26
| | |_|/ | |/| | | | | | | | | | email is in use on this Home Server.
* | | | /tokenrefresh POST endpointDaniel Wagner-Hall2015-08-203-2/+62
| |/ / |/| | | | | | | | | | | | | | | | | | | | This allows refresh tokens to be exchanged for (access_token, refresh_token). It also starts issuing them on login, though no clients currently interpret them.
* | | Merge pull request #208 from matrix-org/markjh/end-to-end-key-federationMark Haines2015-08-181-30/+70
|\ \ \ | | | | | | | | Federation for end-to-end key requests.
| * | | Merge remote-tracking branch 'origin/develop' into ↵Mark Haines2015-08-133-89/+118
| |\| | | | | | | | | | | | | | markjh/end-to-end-key-federation
| * | | 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
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | * Merge LoginHandler -> AuthHandler * Add a bunch of documentation * Improve some naming * Remove unused branches I will start merging the actual logic of the two handlers shortly
* | | Don't try & check the username if we don't have one (which we won't if it's ↵David Baker2015-08-031-1/+2
| | | | | | | | | | | | been saved in the auth layer)
* | | Use the same reg paths as register v1 for ASes.Kegan Dougal2015-07-291-4/+6
| | | | | | | | | | | | Namely this means using registration_handler.appservice_register.
* | | Fix v2_alpha registration. Add unit tests.Kegan Dougal2015-07-281-54/+70
| | | | | | | | | | | | | | | | | | | | | | | | V2 Registration forced everyone (including ASes) to create a password for a user, when ASes should be able to omit passwords. Also unbreak AS registration in general which checked too early if the given username was claimed by an AS; it was checked before knowing if the AS was the one doing the registration! Add unit tests for AS reg, user reg and disabled_registration flag.
* | | Generate local thumbnails on a threadErik Johnston2015-07-231-34/+43
| |/ |/|
* | Pick larger than desired thumbnail for 'crop'Erik Johnston2015-07-231-1/+2
|/
* 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
|\ | | | | Implement read receipts.
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receiptsErik Johnston2015-07-133-1/+352
| |\
| * \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receiptsErik Johnston2015-07-084-15/+48
| |\ \
| * | | 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 ↵David Baker2015-07-151-2/+9
| | | | | | | | | | | | | | | | user-interactive auth call.
* | | | bump up image quality a bit more as it looks crapMatthew Hodgson2015-07-141-1/+1
| |_|/ |/| |
* | | Merge pull request #198 from matrix-org/markjh/client-end-to-end-key-managementErik Johnston2015-07-102-1/+279
|\ \ \ | | | | | | | | Client end to end key management API
| * | | 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
| | | | | | | | | | | | | | | - Add saml2 config docs to default config. - Use existence of saml2 config to indicate if saml2 should be enabled.
* | | Merge pull request #201 from EricssonResearch/msba/saml2-developErik Johnston2015-07-101-1/+74
|\ \ \ | |/ / |/| | Integrate SAML2 basic authentication - uses pysaml2
| * | 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
| |/
* | If user supplies filename in URL when downloading from media repo, use that ↵Erik Johnston2015-07-033-9/+14
| | | | | | | | name in Content Disposition
* | Enforce ascii filenames for uploadsErik Johnston2015-06-302-1/+6
| |
* | Add Content-Disposition headers to media repo v1 downloadsErik Johnston2015-06-303-7/+30
|/
* Remove access_token from synapse.rest.client.v1.transactions ↵Erik Johnston2015-06-161-3/+3
| | | | {get,store}_response logging
* Merge pull request #175 from matrix-org/erikj/thumbnail_threadErik Johnston2015-06-031-45/+53
|\ | | | | Thumbnail images on a seperate thread
| * Thumbnail images on a seperate threadErik Johnston2015-06-021-45/+53
| |
* | SYN-403: Make content repository use its own http client.Erik Johnston2015-06-031-1/+2
|/
* Add config option to turn off freezing events. Use new encode_json api and ↵Erik Johnston2015-05-292-2/+2
| | | | ujson.loads
* 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 store
| * 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
| |
* | Change the way we create observers to deferreds so that we don't get spammed ↵Erik Johnston2015-05-081-2/+6
|/ | | | by 'unhandled errors'
* user_id now in user_threepidsDavid Baker2015-05-011-3/+3
|
* Merge branch 'develop' into key_distributionMark Haines2015-04-297-4/+576
|\ | | | | | | | | Conflicts: synapse/config/homeserver.py
| * Merge pull request #126 from matrix-org/csauthMark Haines2015-04-287-4/+576
| |\ | | | | | | Client / Server Auth Refactor
| | * 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-245-140/+74
| | |\ | | | | | | | | | | | | | | | | Conflicts: synapse/http/server.py
| | * | 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
| | | |
| | * | Merge branch 'develop' into csauthDavid Baker2015-04-175-162/+93
| | |\ \
| | * | | 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 ↵David Baker2015-04-151-4/+14
| | | | | | | | | | | | | | | | | | | | it just succeeding
| | * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Now only the auth part goes to fallback, not the whole operation * Auth fallback is a normal API endpoint, not a static page * Params like the recaptcha pubkey can just live in the config Involves a little engineering on JsonResource so its servlets aren't always forced to return JSON. I should document this more, in fact I'll do that now.
| | * | | 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
| | | | | | | | | | | | | | | | | | | | flag in the API.
| | * | | 1) Pushers are now associated with an access tokenDavid Baker2015-03-242-2/+3
| | | | | | | | | | | | | | | | | | | | 2) Change places where we mean unauthenticated to 401, not 403, in C/S v2: hack so it stays as 403 in v1 because web client relies on it.
| | * | | 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 ↵David Baker2015-03-233-1/+91
| | | | | | | | | | | | | | | | | | | | client/server auth more general.
* | | | | Implement minimum_valid_until_ts in the remote key resourceMark Haines2015-04-291-4/+55
| | | | |
* | | | | Merge branch 'develop' into key_distributionMark Haines2015-04-271-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/crypto/keyring.py
| * | | | Implement locks using create_observer for fetching media and server keysErik Johnston2015-04-271-1/+3
| | | | |
* | | | | Copyright noticeMark Haines2015-04-241-0/+14
| | | | |
* | | | | Merge branch 'develop' into key_distributionMark Haines2015-04-241-0/+14
|\| | | |
| * | | | Copyright noticesMark Haines2015-04-241-0/+14
| | |_|/ | |/| |
* | | | Update to match the specification for key/v2Mark Haines2015-04-232-19/+24
| | | |
* | | | Implement remote key lookup apiMark Haines2015-04-223-8/+185
| | | |
* | | | Merge branch 'develop' into key_distributionMark Haines2015-04-215-140/+74
|\| | |
| * | | Set a version_string in BaseMediaResource so that the request_handler ↵Mark Haines2015-04-211-0/+1
| | | | | | | | | | | | | | | | wrapper works
| * | | Combine the request wrappers in rest/media/v1 and http/server into a single ↵Mark Haines2015-04-215-140/+73
| | |/ | |/| | | | | | | wrapper decorator
* | | Implement v2 key lookupMark Haines2015-04-201-1/+3
| | |
* | | Return a sha256 fingerprint rather than the entire tls certificateMark Haines2015-04-141-2/+8
| | |
* | | Add a version 2 of the key server apiMark Haines2015-04-142-0/+137
|/ /
* | Move server key api into rest/key/v1Mark Haines2015-04-143-0/+121
| |
* | Remove appservice REST servletsKegan Dougal2015-03-314-190/+0
|/
* 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
|
* bump dep on syweb 0.6.5Matthew Hodgson2015-03-121-2/+3
|
* Add the master push rule for the break-my-push button. Allow server default ↵David Baker2015-03-101-1/+4
| | | | rules to be disabled by default.
* Merge branch 'develop' into pushrules2David Baker2015-03-041-29/+6
|\
| * Convert expected format for AS regex to include exclusivity.Kegan Dougal2015-02-271-29/+6
| | | | | | | | | | Previously you just specified the regex as a string, now it expects a JSON object with a 'regex' key and an 'exclusive' boolean, as per spec.
* | 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
|
* SYN-282: Don't log tracebacks for client errorsMark Haines2015-02-181-1/+1
|
* Merge pull request #50 from matrix-org/application-servicesMark Haines2015-02-136-14/+282
|\ | | | | Application Services
| * Fix newline on __init__Kegan Dougal2015-02-111-1/+0
| |
| * PEP8-ifyKegan Dougal2015-02-111-1/+1
| |
| * Add newline to EOFKegan Dougal2015-02-111-0/+1
| |
| * Notify ASes for events sent by other users in a room which an AS user is a ↵Kegan Dougal2015-02-111-2/+2
| | | | | | | | part of.
| * Merge branch 'develop' into application-servicesKegan Dougal2015-02-115-14/+23
| |\
| * \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-095-28/+36
| |\ \
| * | | 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 a new errcode type M_EXCLUSIVE when users try to create aliases inside AS namespaces, and when ASes try to create aliases outside their own namespace.
| * | | Add m.login.application_service registration procedure.Kegan Dougal2015-02-051-1/+23
| | | | | | | | | | | | | | | | | | | | This allows known application services to register any user ID under their own user namespace(s).
| * | | Merge branch 'develop' into application-servicesKegan Dougal2015-02-051-4/+0
| |\ \ \
| * \ \ \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-051-149/+150
| |\ \ \ \
| * \ \ \ \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-052-20/+20
| |\ \ \ \ \
| * | | | | | Add hs_token column and generate a different token f.e application service.Kegan Dougal2015-02-051-2/+2
| | | | | | |
| * | | | | | Merge branch 'develop' into application-servicesKegan Dougal2015-02-042-0/+53
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-0216-44/+868
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/__init__.py synapse/storage/__init__.py
| * | | | | | | | Add basic application_services SQL, and hook up parts of the appservice ↵Kegan Dougal2015-01-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | store to read from it.
| * | | | | | | | Use ApplicationService when registering.Kegan Dougal2015-01-271-2/+6
| | | | | | | | |
| * | | | | | | | Add appservice handler and store. Glue together rest > handler > store.Kegan Dougal2015-01-272-3/+8
| | | | | | | | |
| * | | | | | | | Parse /register and /unregister request JSON.Kegan Dougal2015-01-271-2/+78
| | | | | | | | |
| * | | | | | | | Add stub application services REST API.Kegan Dougal2015-01-274-0/+127
| | | | | | | | |
* | | | | | | | | Blunty replace json with simplejsonErik Johnston2015-02-1110-10/+10
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Fix code-styleMark Haines2015-02-103-4/+4
| | | | | | | |
* | | | | | | | Code-style fixesMark Haines2015-02-103-10/+19
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Log when we receive a request, when we send a response and how long it took ↵Erik Johnston2015-02-092-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | to process it.
* | | | | | | ...and here's the actual impl. git fail.Matthew Hodgson2015-02-071-25/+32
| | | | | | |
* | | | | | | thou shalt specify a content-lengthMatthew Hodgson2015-02-071-0/+1
| | | | | | |
* | | | | | | i hate weakly typed languagesMatthew Hodgson2015-02-071-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | 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
| |_|/ |/| |
* | | Add Cache-Control header to identiconMark Haines2015-02-021-0/+3
| | |
* | | Fix setting identicon width and heightMark Haines2015-02-021-2/+2
| | |
* | | Spell height more correctlyMark Haines2015-02-021-1/+1
| | |
* | | Add a media/v1/identicon resource for generating identicons using pydenticonMark Haines2015-02-022-0/+50
| |/ |/|
* | 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
|\ \ | | | | | | Client v2 sync
| * | 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
| | | | | | | | | | | | sync with a gap
| * | 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-292-8/+23
| |\ \ \
| * \ \ \ 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
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/rest/client/v2_alpha/__init__.py
| * | | | | | Add typing notifications to syncMark Haines2015-01-291-10/+8
| | | | | | |
| * | | | | | Include transaction ids in unsigned section of events in the sync results ↵Mark Haines2015-01-291-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | for the clients that made those requests
| * | | | | | Add ports back to demo/start.shMark Haines2015-01-281-1/+1
| | | | | | |
| * | | | | | Merge branch 'develop' into client_v2_syncMark Haines2015-01-2814-44/+523
| |\ \ \ \ \ \
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Means that now you can't do exact matches even in override rules, but I think we can live with that. Advantage is that you'll now always get back what was put in to the API.
* | | | | | | | Merge pull request #37 from matrix-org/client_v2_filterErik Johnston2015-01-302-1/+110
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | Client v2 filter
| * | | | | | | Create a separate filter object to do the actual filtering, so that we canMark Haines2015-01-291-1/+1
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | split the storage and management of filters from the actual filter code and don't have to load a filter from the db each time we filter an event
| * | | | | | Merge branch 'develop' into client_v2_filterMark Haines2015-01-292-8/+23
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge in auth changes from developMark Haines2015-01-291-2/+2
| | |_|_|_|/ | |/| | | |
| * | | | | Merge changes from developMark Haines2015-01-2914-44/+523
| |\ \ \ \ \
| * | | | | | Add filter JSON sanity checks.Kegan Dougal2015-01-281-1/+1
| | | | | | |
| * | | | | | Have the Filtering API return Deferreds, so we can do the Datastore ↵Paul "LeoNerd" Evans2015-01-271-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | implementation nicely
| * | | | | | Initial trivial implementation of an actual 'Filtering' object; move storage ↵Paul "LeoNerd" Evans2015-01-271-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | of user filters into there
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | actual filter implementation
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-18 13:03:26 +0000