summary refs log tree commit diff
path: root/synapse/rest (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fix change_passwordErik Johnston2016-01-201-3/+2
|
* Whine if we give a from param to /syncErik Johnston2016-01-201-0/+7
|
* Allow non-guests to peek on rooms using /eventsDaniel Wagner-Hall2016-01-202-4/+3
|
* Only compute unread notifications for rooms we send down streamErik Johnston2016-01-191-2/+1
|
* Return highlight_count in /syncErik Johnston2016-01-191-0/+1
|
* Take a deepcopy of push rules before mutating themErik Johnston2016-01-191-1/+3
|
* Use static for const dictsErik Johnston2016-01-181-1/+7
|
* Remove internal idsErik Johnston2016-01-181-0/+4
|
* Require unbanning before other membership changesDaniel Wagner-Hall2016-01-151-39/+12
|
* Merge branch 'release-v0.12.1' into developRichard van der Hoff2016-01-141-0/+6
|\
| * Add 'event' result to 'context' endpointRichard van der Hoff2016-01-131-0/+6
| | | | | | | | ... because the context isn't much use without the event.
* | Fix enabling & disabling push rulesDavid Baker2016-01-141-1/+1
| |
* | Rename 'user_name' to 'user_id' in push to make it consistent with the rest ↵Mark Haines2016-01-132-7/+7
| | | | | | | | of the code
* | Merge pull request #478 from matrix-org/daniel/userobjectDaniel Wagner-Hall2016-01-1119-128/+159
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a User object I'm sick of passing around more and more things as tuple items around the whole world, and needing to edit every call site every time there is more information about a user. So pass them around together as an object. This object has incredibly poorly named fields because we have a convention that `user` indicates a UserID object, and `user_id` indicates a string. I tried to clean up the whole repo to fix this, but gave up. So instead, I introduce a second convention. A user_object is a User, and a user_id_object is a UserId. I may have cried a little bit.
| * | Introduce a Requester objectDaniel Wagner-Hall2016-01-1119-128/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | This tracks data about the entity which made the request. This is instead of passing around a tuple, which requires call-site modifications every time a new piece of optional context is passed around. I tried to introduce a User object. I gave up.
* | | Merge pull request #456 from matrix-org/store_event_actionsDavid Baker2016-01-082-1/+5
|\ \ \ | | | | | | | | Send unread notification counts
| * \ \ Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2016-01-061-6/+1
| |\ \ \
| * | | | Add is_guest flag to users db to track whether a user is a guest user or ↵David Baker2016-01-061-1/+4
| | | | | | | | | | | | | | | | | | | | not. Use this so we can run _filter_events_for_client when calculating event_push_actions.
| * | | | Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2016-01-052-8/+23
| |\ \ \ \
| * | | | | Only joined rooms have unread_notif_countDavid Baker2016-01-041-1/+1
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2016-01-041-1/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2015-12-221-1/+9
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2015-12-212-7/+22
| |\ \ \ \ \ \
| * | | | | | | still very WIP, but now sends unread_notifications_count in the room object ↵David Baker2015-12-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on sync (only actually corrrect in a full sync: hardcoded to 0 in incremental syncs).
* | | | | | | | Only use cropped thumbnails when asked for a cropped thumbnail.Mark Haines2016-01-071-1/+1
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Even though ones cropped with scale might be technically valid.
* | | | | | | copyrightsMatthew Hodgson2016-01-0743-43/+43
| | | | | | |
* | | | | | | Add /_matrix/versions to report supported versionsDaniel Wagner-Hall2016-01-062-0/+42
| |_|_|_|_|/ |/| | | | |
* | | | | | Guest users must be joined to a room to see it in /syncMark Haines2016-01-061-6/+1
| |_|_|_|/ |/| | | |
* | | | | Allow guests to upgrade their accountsDaniel Wagner-Hall2016-01-052-4/+10
| | | | |
* | | | | Use larger thumbnail rather than smaller.Erik Johnston2016-01-051-4/+13
| |_|_|/ |/| | |
* | | | Expose /login under r0Richard van der Hoff2016-01-021-1/+1
| |_|/ |/| | | | | | | | The spec says /login should be available at r0 and 'unstable', so make it so.
* | | Allow guest access if the user provides a list of rooms in the filterMark Haines2015-12-221-1/+9
| |/ |/|
* | Remove accidentally committed debug loggingMark Haines2015-12-211-1/+0
| |
* | Fix spacingMark Haines2015-12-141-1/+1
| |
* | Fix logging to lie lessMark Haines2015-12-141-2/+9
| |
* | Add commentary for fix in PR#442Mark Haines2015-12-141-0/+6
| |
* | Combine the prev content testsMark Haines2015-12-141-14/+12
| |
* | Check whether prev_content or prev_sender is set before trying to rollback stateMark Haines2015-12-141-8/+13
| |
* | Missing yieldMark Haines2015-12-101-1/+1
|/
* Allow filter JSON object in the filter query parameter in /syncMark Haines2015-12-091-9/+21
| | | | Documented by matrix-org/matrix-doc#224
* Actually host r0 and unstable prefixesDaniel Wagner-Hall2015-12-083-67/+67
|
* also do more structured loggingDavid Baker2015-12-071-0/+1
|
* pep8David Baker2015-12-071-0/+1
|
* Add logging to pushers API to log the body of the requestDavid Baker2015-12-071-0/+4
|
* Take object not boolDaniel Wagner-Hall2015-12-071-0/+5
| | | | | | Allows bool as legacy fallback See https://github.com/matrix-org/matrix-doc/pull/212
* Merge pull request #415 from matrix-org/daniel/endpointsDaniel Wagner-Hall2015-12-036-35/+11
|\ | | | | Merge pull request #415 from matrix-org/daniel/endpoints
| * Update endpoints to reflect current specDaniel Wagner-Hall2015-12-026-35/+11
| |
* | Fix implementation of /admin/whoisDaniel Wagner-Hall2015-12-021-1/+1
|/
* Reuse a single http client, rather than creating new onesMark Haines2015-12-021-5/+2
|
* 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
| | | | to distinguish it from normal invites
* Merge pull request #385 from matrix-org/daniel/forgetroomsMark Haines2015-11-201-3/+10
|\ | | | | Allow users to forget rooms
| * 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
|\ \ \ | | | | | | | | v2 sync: Get rid of the event_map, and rename the keys of the rooms obj
| * \ \ 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
| | | | | | | | | | | | | | | | We're keeping 'events', in case we decide to add more keys later.
| * | | v2 /sync: Rename the keys of the 'rooms' object to match member statesRichard van der Hoff2015-11-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | joined->join invited->invite archived->leave
| * | | 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
|\ \ \ | |_|/ |/| | Remove m.login.token from advertised flows.
| * | 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
| | | | | | | | | | | | | | Implementation of SPEC-254: roll back the state dictionary to how it looked at the start of the timeline. Merged PR https://github.com/matrix-org/synapse/pull/373
| * Make handlers.sync return a state dictionary, instead of an event list.Richard van der Hoff2015-11-131-1/+1
| | | | | | | | | | | | | | | | | | Basically this moves the process of flattening the existing dictionary into a list up to rest.client.*, instead of doing it in handlers.sync. This simplifies a bit of the code in handlers.sync, but it is also going to be somewhat beneficial in the next stage of my hacking on SPEC-254. Merged from PR #371
| * Update some commentsRichard van der Hoff2015-11-131-0/+56
| | | | | | | | | | | | | | Add a couple of type annotations, docstrings, and other comments, in the interest of keeping track of what types I have. Merged from pull request #370.
| * Merge pull request #360 from matrix-org/daniel/guestroominitialsyncDaniel Wagner-Hall2015-11-121-1/+2
| |\ | | | | | | | | | | | | Merge pull request #360 from matrix-org/daniel/guestroominitialsync Allow guest access to room initialSync
| | * 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
| | | | | | | | | | | | | | | Depends: https://github.com/matrix-org/synapse/pull/363 Tests in https://github.com/matrix-org/sytest/pull/66
| * | 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 client
| | * 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
| |/ | | | | | | ... merely because I was trying to figure out how it worked, and couldn't.
* | 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
| |\ | | | | | | Implement pagination, order by and groups in search
| | * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/searchErik Johnston2015-11-0519-47/+84
| | |\
| | * | 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
| | | | | | | | | | | | Squash-merge of PR #345 from daniel/anonymousevents
* | | Allow hs to do CAS login completely and issue the client with a login token ↵Steven Hammerton2015-11-051-1/+144
|/ / | | | | | | that can be redeemed for the usual successful login response
* / Allow guests to register and call /events?room_id=Daniel Wagner-Hall2015-11-0419-46/+72
|/ | | | | | | This follows the same flows-based flow as regular registration, but as the only implemented flow has no requirements, it auto-succeeds. In the future, other flows (e.g. captcha) may be required, so clients should treat this like the regular registration flow choices.
* 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 api
| | * Add room context apiErik Johnston2015-10-281-0/+36
| | |
| * | Implement full_state incremental syncRichard van der Hoff2015-10-261-2/+4
| |/ | | | | | | | | | | | | | | A hopefully-complete implementation of the full_state incremental sync, as specced at https://github.com/matrix-org/matrix-doc/pull/133. This actually turns out to be a relatively simple modification to the initial sync implementation.
* | 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 API
| * | 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.
| * | | 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
|\ \ \ | | | | | | | | Add basic search API
| * | | 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
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Remove some login classes from synapse.
| * | | | | synapse.client.v1.login.LoginFallbackRestServlet and ↵Mark Haines2015-10-151-30/+0
| | |_|_|/ | |/| | | | | | | | | | | | | synapse.client.v1.login.PasswordResetRestServlet are unused
* | | | | 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
| | | | |