summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Add some docstringDaniel Wagner-Hall2015-10-131-0/+15
|
* Move event contents into third_party_layout fieldDaniel Wagner-Hall2015-10-137-21/+35
|
* Merge branch 'develop' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-1311-65/+292
|\
| * Merge pull request #299 from stevenhammerton/sh-cas-required-attributeErik Johnston2015-10-122-27/+61
| |\ | | | | | | SH CAS Required Attribute
| | * 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
| | |
| | * Default cas_required_attributes to empty dictionarySteven Hammerton2015-10-121-1/+1
| | |
| | * Remove not required parenthesisSteven Hammerton2015-10-121-1/+1
| | |
| | * Support multiple required attributes in CAS response, and in a nicer config ↵Steven Hammerton2015-10-122-22/+10
| | | | | | | | | | | | format too
| | * Allow optional config params for a required attribute and it's value, if ↵Steven Hammerton2015-10-122-1/+30
| | | | | | | | | | | | 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
| | |
| * | Merge pull request #296 from matrix-org/markjh/eventstream_presenceMark Haines2015-10-121-35/+52
| |\ \ | | | | | | | | Split the sections of EventStreamHandler.get_stream that handle presence
| | * | Split the sections of EventStreamHandler.get_stream that handle presenceMark Haines2015-10-091-35/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | into separate functions. This makes the code a bit easier to read, and means that we can reuse the logic when implementing the v2 sync API.
| * | | Merge pull request #297 from matrix-org/markjh/presence_racesMark Haines2015-10-121-3/+8
| |\ \ \ | | |_|/ | |/| | Fix some races in the synapse presence handler caused by not yielding…
| | * | Fix some races in the synapse presence handler caused by not yielding on ↵Mark Haines2015-10-091-3/+8
| | |/ | | | | | | | | | deferreds
| * | add steve to authorsMatthew Hodgson2015-10-101-1/+4
| | |
| * | Fix previous merge to s/version_string/user_agent/Erik Johnston2015-10-101-2/+2
| | |
| * | Merge pull request #295 from stevenhammerton/sh-cas-authErik Johnston2015-10-105-21/+184
| |\ \ | | | | | | | | Provide ability to login using CAS
| | * | 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-102-24/+44
| | | | | | | | | | | | | | | | requests
| | * | Formatting changesSteven Hammerton2015-10-102-6/+14
| | | |
| | * | Provide ability to login using CASSteven Hammerton2015-10-104-2/+135
| |/ /
| * | Merge pull request #294 from matrix-org/markjh/initial_sync_archived_flagMark Haines2015-10-092-6/+11
| |\ \ | | | | | | | | Add a flag to initial sync to include we want rooms that the user has left
| | * | 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-082-6/+11
| | |/
| * | Use raw string for regex here, otherwise \b is the backspace character. ↵David Baker2015-10-081-1/+1
| | | | | | | | | | | | Fixes displayname matching.
* | | Merge branch 'develop' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-061-1/+0
|\| |
| * | Merge pull request #292 from matrix-org/daniel/useragentDaniel Wagner-Hall2015-10-062-6/+10
| |\ \ | | | | | | | | Allow synapse's useragent to be customized
| * \ \ Merge pull request #293 from matrix-org/markjh/remove_spamy_error_loggingMark Haines2015-10-061-1/+0
| |\ \ \ | | |_|/ | |/| | Remove log line that was generated whenever an error was created.
| | * | Remove log line that was generated whenever an error was created. We are now ↵Mark Haines2015-10-061-1/+0
| |/ / | | | | | | | | | creating error objects that aren't raised so it's probably a bit too confusing to keep
* | | Remove merge thinkoDaniel Wagner-Hall2015-10-061-4/+0
| | |
* | | Add third party invites to auth_events for joinsDaniel Wagner-Hall2015-10-061-0/+5
| | |
* | | Fix lint errorsDaniel Wagner-Hall2015-10-062-4/+4
| | |
* | | Revert "Revert "Merge pull request #283 from ↵Daniel Wagner-Hall2015-10-061-76/+131
| | | | | | | | | | | | | | | | | | matrix-org/erikj/atomic_join_federation"" This reverts commit 34d26d36874ab0bc7fa4dab0db08bd37ba4936ae.
* | | Merge branch 'daniel/useragent' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-061-1/+1
|\ \ \ | | |/ | |/|
| * | Use space not dash as delimiterDaniel Wagner-Hall2015-10-061-1/+1
| | |
| * | Use space not dash as delimiterDaniel Wagner-Hall2015-10-061-1/+1
| | |
| * | Merge branch 'develop' into daniel/useragentDaniel Wagner-Hall2015-10-0610-88/+220
| |\|
* | | Merge branch 'develop' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-061-1/+2
|\ \ \ | | |/ | |/|
| * | Explicitly add Create event as auth eventErik Johnston2015-10-021-2/+3
| | |
* | | Merge branch 'daniel/useragent' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-052-6/+10
|\ \ \ | | |/ | |/|
| * | Preserve version string in user agentDaniel Wagner-Hall2015-10-052-4/+4
| | |
| * | Allow synapse's useragent to be customizedDaniel Wagner-Hall2015-10-022-6/+10
| | | | | | | | | | | | | | | This will allow me to write tests which verify which server made HTTP requests in a federation context.
* | | Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_federation"Daniel Wagner-Hall2015-10-051-131/+76
| | | | | | | | | | | | | | | This reverts commit 5879edbb097d19c2b5f5e064841909e67d6018fe, reversing changes made to b43930d4c9479973fb7225818e2e51bec022c4e6.
* | | Merge branch 'develop' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-0510-83/+218
|\ \ \ | | |/ | |/|
| * | Add 'trusted_private_chat' to room creation presetsErik Johnston2015-10-022-0/+6
| | |
| * | Merge pull request #275 from matrix-org/erikj/invite_stateErik Johnston2015-10-023-5/+34
| |\ \ | | | | | | | | Bundle in some room state in invites.
| | * | Also bundle in senderErik Johnston2015-10-021-0/+1
| | | |
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/invite_stateErik Johnston2015-09-2552-266/+1142
| | |\ \
| | * | | Bundle in some room state in the unsigned bit of the invite when sending to ↵Erik Johnston2015-09-104-7/+35
| | | | | | | | | | | | | | | | | | | | invited servers
| * | | | Merge pull request #279 from matrix-org/erikj/unfederatableErik Johnston2015-10-023-4/+32
| |\ \ \ \ | | | | | | | | | | | | Add flag which disables federation of the room
| | * \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatableErik Johnston2015-10-0262-947/+1423
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #283 from matrix-org/erikj/atomic_join_federationErik Johnston2015-10-021-76/+131
| |\ \ \ \ \ | | | | | | | | | | | | | | Atomically persist events when joining a room over federation/
| | * | | | | CommentErik Johnston2015-09-301-0/+8
| | | | | | |
| | * | | | | Rename varErik Johnston2015-09-301-3/+3
| | | | | | |
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-09-170-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | erikj/atomic_join_federation
| | * | | | | | Revert change of scripts/check_auth.pyErik Johnston2015-09-171-1/+1
| | | | | | | |
| | * | | | | | Fix getting an event for a room the server forgot it was inErik Johnston2015-09-171-47/+59
| | | | | | | |
| | * | | | | | Also persist stateErik Johnston2015-09-171-1/+1
| | | | | | | |
| | * | | | | | Capture errErik Johnston2015-09-171-2/+2
| | | | | | | |
| | * | | | | | Also handle stateErik Johnston2015-09-171-3/+3
| | | | | | | |
| | * | | | | | Don't bail out of joining if we encounter a rejected eventErik Johnston2015-09-172-14/+21
| | | | | | | |
| | * | | | | | Refactor do_invite_joinErik Johnston2015-09-172-31/+56
| | | | | | | |
| * | | | | | | Merge pull request #291 from matrix-org/receipt-validationKegsay2015-10-011-0/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Validate the receipt type before passing it on to the receipt handler
| | * | | | | | | Validate the receipt type before passing it on to the receipt handlerKegan Dougal2015-10-011-0/+4
| |/ / / / / / /
| * | | | | | | Don't change cwd in synctlErik Johnston2015-10-011-2/+2
| | | | | | | |
| * | | | | | | Merge pull request #287 from matrix-org/erikj/canonical_aliasErik Johnston2015-09-301-1/+10
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | Set m.room.canonical_alias on room creation.
| | * | | | | | Remove double indentationErik Johnston2015-09-301-7/+6
| | | | | | | |
| | * | | | | | Set m.room.canonical_alias on room creation.Erik Johnston2015-09-231-1/+11
| | | | | | | |
| | | | | * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatableErik Johnston2015-09-1415-36/+120
| | | | | |\ \ \
| | | | | * | | | Also check the domains for membership state_keysErik Johnston2015-09-011-0/+9
| | | | | | | | |
| | | | | * | | | Merge branch 'erikj/check_room_exists' into erikj/unfederatableErik Johnston2015-09-012-8/+37
| | | | | |\ \ \ \
| | | | | * | | | | Check against sender rather than event_idErik Johnston2015-09-012-4/+4
| | | | | | | | | |
| | | | | * | | | | Add flag which disables federation of the roomErik Johnston2015-09-012-3/+21
| | | | | | | | | |
* | | | | | | | | | Implement third party identifier invitesDaniel Wagner-Hall2015-10-0111-19/+275
|/ / / / / / / / /
* | | | | | | | | Merge pull request #288 from matrix-org/markjh/unused_definitionsMark Haines2015-09-2818-588/+162
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove some of the unused definitions from synapse
| * | | | | | | | | Fix scripts-dev/definitions.py argparse optionsMark Haines2015-09-231-1/+1
| | | | | | | | | |
| * | | | | | | | | Remove unused _execute_and_decode from scripts/synapse_port_dbMark Haines2015-09-231-2/+0
| | | | | | | | | |
| * | | | | | | | | synapse/storage/state.py: _make_group_id was unusedMark Haines2015-09-231-6/+0
| | | | | | | | | |
| * | | | | | | | | Remove unused functions from synapse/storage/signatures.pyMark Haines2015-09-231-112/+0
| | | | | | | | | |
| * | | | | | | | | synapse/storage/roommember.py:_get_members_query was unusedMark Haines2015-09-231-6/+0
| | | | | | | | | |
| * | | | | | | | | Remove unused functions from synapse/storage/events.pyMark Haines2015-09-231-11/+0
| | | | | | | | | |
| * | | | | | | | | Remove unused functions from synapse/storage/event_federation.pyMark Haines2015-09-231-71/+0
| | | | | | | | | |
| * | | | | | | | | synapse/storage/_base.py:_simple_max_id was unusedMark Haines2015-09-231-18/+0
| | | | | | | | | |
| * | | | | | | | | synapse/storage/_base.py:_simple_delete was unusedMark Haines2015-09-231-10/+0
| | | | | | | | | |
| * | | | | | | | | synapse/storage/_base.py:_simple_selectupdate_one was unusedMark Haines2015-09-232-51/+0
| | | | | | | | | |
| * | | | | | | | | synapse/state.py:_get_state_key_from_event was unusedMark Haines2015-09-231-4/+0
| | | | | | | | | |
| * | | | | | | | | synapse/handlers/room.py:_should_invite_join was unusedMark Haines2015-09-231-26/+0
| | | | | | | | | |
| * | | | | | | | | synapse/handlers/federation.py:_handle_auth_events was unusedMark Haines2015-09-231-49/+0
| | | | | | | | | |
| * | | | | | | | | Use argparse for definition finderMark Haines2015-09-231-26/+38
| | | | | | | | | |
| * | | | | | | | | synapse/storage/event_federation.py:_get_auth_events is unusedMark Haines2015-09-221-21/+0
| | | | | | | | | |
| * | | | | | | | | synapse/storage/_base.py:_execute_and_decode was unusedMark Haines2015-09-221-3/+0
| | | | | | | | | |
| * | | | | | | | | Move NullSource out of synapse and into tests since it is only used by the testsMark Haines2015-09-222-17/+17
| | | | | | | | | |
| * | | | | | | | | Note that GzipFile was removed in comment that referenced itMark Haines2015-09-221-0/+1
| | | | | | | | | |
| * | | | | | | | | synapse/app/homeserver.py:GzipFile was unusedMark Haines2015-09-221-6/+0
| | | | | | | | | |
| * | | | | | | | | synapse/streams/events.py:StreamSource was unusedMark Haines2015-09-221-12/+0
| | | | | | | | | |
| * | | | | | | | | synapse/api/errors.py:RoomError was unusedMark Haines2015-09-221-5/+0
| | | | | | | | | |
| * | | | | | | | | synapse/util/__init__.py:unwrap_deferred was unusedMark Haines2015-09-221-28/+0
| | | | | | | | | |
| * | | | | | | | | synapse/storage/_base.py:Table was unusedMark Haines2015-09-222-130/+2
| | | | | | | | | |
| * | | | | | | | | Add dev script for finding where functions are called from, and finding ↵Mark Haines2015-09-221-0/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functions that aren't called at all
* | | | | | | | | | Merge pull request #290 from matrix-org/daniel/synctlDaniel Wagner-Hall2015-09-281-26/+28
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | Allow config file path to be configurable in in synctl
| * | | | | | | | | Fix restartDaniel Wagner-Hall2015-09-241-2/+2
| | | | | | | | | |
| * | | | | | | | | Allow config file path to be configurable in in synctlDaniel Wagner-Hall2015-09-241-24/+26
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, allow it to be run from directories other than the synapse directory
* | | | | | | | | Merge pull request #289 from matrix-org/markjh/fix_sqlErik Johnston2015-09-241-6/+6
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Fix order of ON constraints in _get_rooms_for_user_where_membership
| * | | | | | | | Fix order of ON constraints in _get_rooms_for_user_where_membership_is_txnMark Haines2015-09-241-6/+6
| |/ / / / / / /
* | | | | | | | Fix demo/start.sh to work with --report-statsErik Johnston2015-09-231-0/+1
| | | | | | | |
* | | | | | | | Merge pull request #282 from matrix-org/erikj/missing_keysErik Johnston2015-09-231-4/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix bug where we sometimes didn't fetch all the keys requested for a server.
| * | | | | | | | Fix bug where we sometimes didn't fetch all the keys requested for aErik Johnston2015-09-171-4/+3
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | server.
* | | | | | | | Merge pull request #271 from matrix-org/erikj/default_historyErik Johnston2015-09-231-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Change default history visibility for private rooms
| * | | | | | | Change default history visibility for private roomsErik Johnston2015-09-091-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #286 from matrix-org/markjh/stream_config_reprMark Haines2015-09-221-3/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Define __repr__ methods for StreamConfig and PaginationConfig
| * | | | | | | | Define __repr__ methods for StreamConfig and PaginationConfigMark Haines2015-09-221-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that they can be used with "%r" log formats.
* | | | | | | | | Merge pull request #285 from matrix-org/daniel/metrics-2Daniel Wagner-Hall2015-09-2224-78/+438
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Implement configurable stats reporting
| * | | | | | | | Add some docstringsDaniel Wagner-Hall2015-09-222-0/+4
| | | | | | | | |
| * | | | | | | | Catch stats-reporting errorsDaniel Wagner-Hall2015-09-221-4/+7
| | | | | | | | |
| * | | | | | | | Add docstringDaniel Wagner-Hall2015-09-221-0/+6
| | | | | | | | |
| * | | | | | | | Front-load spacesDaniel Wagner-Hall2015-09-221-7/+7
| | | | | | | | |
| * | | | | | | | Implement configurable stats reportingDaniel Wagner-Hall2015-09-2224-78/+425
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SYN-287 This requires that HS owners either opt in or out of stats reporting. When --generate-config is passed, --report-stats must be specified If an already-generated config is used, and doesn't have the report_stats key, it is requested to be set.
* | | | | | | | Merge pull request #276 from ↵Mark Haines2015-09-219-122/+267
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/markjh/history_for_rooms_that_have_been_left SPEC-216: Allow users to view the history of rooms that they have left.
| * | | | | | | | Clarify that room_initial_sync returns a python dictMark Haines2015-09-211-1/+1
| | | | | | | | |
| * | | | | | | | Fix doc string to point at the right classMark Haines2015-09-211-2/+3
| | | | | | | | |
| * | | | | | | | Add explicit "elif event.membership == Membership.LEAVE" for clarityMark Haines2015-09-211-1/+2
| | | | | | | | |
| * | | | | | | | Clamp the "to" token for /rooms/{roomId}/messages to when the user leftMark Haines2015-09-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the room. There isn't a way for the client to learn a valid "to" token for a room that they have left in the C-S API but that doesn't stop a client making one up.
| * | | | | | | | Clarify which event is returned by check_user_was_in_roomMark Haines2015-09-211-2/+3
| | | | | | | | |
| * | | | | | | | Allow users to GET individual state events for rooms that they have leftMark Haines2015-09-102-12/+18
| | | | | | | | |
| * | | | | | | | Allow users that have left a room to get the messages that happend in the ↵Mark Haines2015-09-092-5/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | room before they left
| * | | | | | | | Remove undocumented and unimplemented 'feedback' parameter from the ↵Mark Haines2015-09-096-42/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Client-Server API
| * | | | | | | | Allow users that have left the room to view the member list from the point ↵Mark Haines2015-09-093-43/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | they left
| * | | | | | | | Allow rooms/{roomId}/state for a room that has been leftMark Haines2015-09-092-6/+15
| | | | | | | | |
| * | | | | | | | Allow room initialSync for users that have left the room, returning a ↵Mark Haines2015-09-093-9/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | snapshot of how the room was when they left it
| * | | | | | | | Include rooms that a user has left in an initialSync. Include the state and ↵Mark Haines2015-09-081-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | messages at the point they left the room
| * | | | | | | | Include the event_id and stream_ordering of membership events when looking ↵Mark Haines2015-09-081-2/+4
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | up which rooms a user is in
* | | | | | | | Merge pull request #267 from matrix-org/markjh/missing_requirementsMark Haines2015-09-182-11/+29
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Print an example "pip install" line for a missing requirement
| * | | | | | | Add nacl.bindings to the list of modules checked. Re-arrange import order to ↵Mark Haines2015-09-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check packages after the packages they depend on
| * | | | | | | Print an example "pip install" line for a missing requirementMark Haines2015-09-012-8/+26
| | |_|/ / / / | |/| | | | |
* | | | | | | Remove run_on_reactorErik Johnston2015-09-171-3/+0
| |_|/ / / / |/| | | | |
* | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-09-162-1/+10
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'hotfixes-v0.10.0-r2' of github.com:matrix-org/synapse v0.10.0-r2Erik Johnston2015-09-166-11/+39
| |\ \ \ \ \ \
| | * | | | | | Update changelogErik Johnston2015-09-161-1/+3
| | | | | | | |
| | * | | | | | Merge branch 'erikj/update_extremeties' into hotfixes-v0.10.0-r2Erik Johnston2015-09-162-0/+11
| | |\ \ \ \ \ \
| | * | | | | | | Bump change logErik Johnston2015-09-101-0/+1
| | | | | | | | |
| | * | | | | | | Fix adding threepids to an existing accountDavid Baker2015-09-101-0/+1
| | | | | | | | |
| | * | | | | | | Bump version and change logErik Johnston2015-09-102-1/+7
| | | | | | | | |
| | * | | | | | | Various bug fixes to crypto.keyringErik Johnston2015-09-101-10/+17
| |/ / / / / / /
* | | | | | | | Merge pull request #281 from matrix-org/erikj/update_extremetiesErik Johnston2015-09-152-0/+11
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | When updating a stored event from outlier to non-outlier, remember to update the extremeties
| * | | | | | | "Comments"Erik Johnston2015-09-151-0/+6
| | | | | | | |
| * | | | | | | When updating a stored event from outlier to non-outlier, remember to update ↵Erik Johnston2015-09-152-0/+5
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | the extremeties
* | | | | | | Merge pull request #272 from matrix-org/daniel/insecureclientDaniel Wagner-Hall2015-09-157-12/+55
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Allow configuration to ignore invalid SSL certs
| * | | | | | | Use shorter config key nameDaniel Wagner-Hall2015-09-152-4/+5
| | | | | | | |
| * | | | | | | Rename context factoryDaniel Wagner-Hall2015-09-152-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mjark is officially no fun.
| * | | | | | | Merge branch 'master' into daniel/insecureclientDaniel Wagner-Hall2015-09-152-1/+6
| |\| | | | | |
| * | | | | | | Merge branch 'daniel/insecureclient' into developDaniel Wagner-Hall2015-09-097-12/+54
| |\ \ \ \ \ \ \
| | * | | | | | | Better document the intent of the insecure SSL settingDaniel Wagner-Hall2015-09-091-2/+6
| | | | | | | | |
| | * | | | | | | Fix random formattingDaniel Wagner-Hall2015-09-092-2/+2
| | | | | | | | |
| | * | | | | | | Allow configuration to ignore invalid SSL certsDaniel Wagner-Hall2015-09-097-12/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be useful for sytest, and sytest only, hence the aggressive config key name.
* | | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-09-152-1/+6
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Bump version/changelog v0.10.0-r1Erik Johnston2015-09-082-1/+6
| | | | | | | | |
* | | | | | | | | Merge pull request #280 from matrix-org/paul/sighupPaul Evans2015-09-151-0/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Hacky attempt at catching SIGHUP and rotating the logfile around
| * | | | | | | | | Hacky attempt at catching SIGHUP and rotating the logfile aroundPaul "LeoNerd" Evans2015-09-141-0/+14
|/ / / / / / / / /
* | | | | | | | | Merge pull request #256 from matrix-org/authDaniel Wagner-Hall2015-09-147-19/+243
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | Attempt to validate macaroons
| * | | | | | | | s/user_id/user/g for consistencyDaniel Wagner-Hall2015-09-016-25/+25
| | | | | | | | |
| * | | | | | | | Turn TODO into thing which actually will failDaniel Wagner-Hall2015-08-261-6/+9
| | | | | | | | |
| * | | | | | | | Merge branch 'mergeeriksmadness' into authDaniel Wagner-Hall2015-08-264-12/+50
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Attempt to validate macaroonsDaniel Wagner-Hall2015-08-267-36/+257
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A couple of weird caveats: * If we can't validate your macaroon, we fall back to checking that your access token is in the DB, and ignoring the failure * Even if we can validate your macaroon, we still have to hit the DB to get the access token ID, which we pretend is a device ID all over the codebase. This mostly adds the interesting code, and points out the two pieces we need to delete (and necessary conditions) in order to fix the above caveats.
* | | | | | | | | | Merge pull request #265 from matrix-org/erikj/check_room_existsErik Johnston2015-09-142-8/+37
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | Check room exists when authenticating an event
| * | | | | | | | | Fix testsErik Johnston2015-09-012-9/+30
| | | | | | | | | |
| * | | | | | | | | Check room exists when authenticating an event, by asserting they reference ↵Erik Johnston2015-09-011-0/+8
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | a creation event
* | | | | | | | | Drop unused indexErik Johnston2015-09-141-0/+16
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | 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 pull request #270 from matrix-org/markjh/fix_metricsErik Johnston2015-09-101-4/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix the size reported by maxrss.
| * | | | | | | | | Check that /proc/self/fd exists before listing itMark Haines2015-09-071-0/+4
| | | | | | | | | |
| * | | | | | | | | The maxrss reported by getrusage is in kilobytes, not pagesMark Haines2015-09-071-4/+3
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #273 from matrix-org/erikj/key_fetch_fixErik Johnston2015-09-101-10/+17
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | Various bug fixes to crypto.keyring
| * | | | | | | | Various bug fixes to crypto.keyringErik Johnston2015-09-091-10/+17
|/ / / / / / / /
* / / / / / / / Don't require pdus in check_auth scriptErik Johnston2015-09-091-2/+1
|/ / / / / / /
* | | | | | | Merge branch 'master' into developMark Haines2015-09-071-0/+6
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge pull request #269 from matrix-org/markjh/upgrading_setuptoolsMark Haines2015-09-071-0/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Add instructions for upgrading setuptools for when people encounter a…
| | * | | | | | Add instructions for upgrading setuptools for when people encounter a ↵Mark Haines2015-09-071-0/+6
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | message "mock requires setuptools>=17.1"
* | | | | | / Merge branch 'master' into developMark Haines2015-09-077-10/+25
|\| | | | | | | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Conflicts: setup.py
| * | | | | DEPENDENCY_LINKS was turned to a listErik Johnston2015-09-041-1/+1
| | | | | |
| * | | | | Merge branch 'release-v0.10.0' v0.10.0Erik Johnston2015-09-03110-1914/+5472
| |\| | | |
| | * | | | Change log level to infoErik Johnston2015-09-031-1/+1
| | | | | |
| | * | | | Bump version and changelogErik Johnston2015-09-032-1/+6
| | | | | |
| | * | | | Lists use 'append'Erik Johnston2015-09-021-1/+1
| | | | | |
| | * | | | Bump version and changelog v0.10.0-rc6Erik Johnston2015-09-022-1/+7
| | | | | |
| | * | | | Update README to include RAM requirementsErik Johnston2015-09-021-0/+1
| | | | | |
| | * | | | Make port script handle empty sent_transactions tableErik Johnston2015-09-021-6/+9
| | | | | |
* | | | | | update logger to match new ambiguous script name...Matthew Hodgson2015-09-031-1/+1
| | | | | |
* | | | | | Merge pull request #262 from matrix-org/redactyoselfDaniel Wagner-Hall2015-09-022-9/+43
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow users to redact their own events
| * | | | | | Check domain of events properlyDaniel Wagner-Hall2015-09-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Federated servers still need to delegate authority to owning servers
| * | | | | | Merge branch 'develop' into redactyoselfDaniel Wagner-Hall2015-08-2817-73/+262
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/_base.py
| * | | | | | | Allow users to redact their own eventsDaniel Wagner-Hall2015-08-282-10/+42
| | | | | | | |
* | | | | | | | Merge pull request #266 from pztrn/developErik Johnston2015-09-021-0/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Ignore development virtualenv and generated logger configuration as well.
| * | | | | | | Ignore development virtualenv and generated logger configuration as well.pztrn2015-09-011-0/+3
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Stanislav Nikitin <pztrn@pztrn.name>
* | | | | | | Merge pull request #264 from matrix-org/markjh/syweb_on_pypiMark Haines2015-09-012-7/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use the version of "matrix-angular-sdk" hosted on pypi
| * | | | | | | Use the version of "matrix-angular-sdk" hosted on pypiMark Haines2015-09-012-7/+0
|/ / / / / / /
* | | | | | | Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into developErik Johnston2015-09-017-376/+7
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge pull request #261 from matrix-org/erikj/scripts_cleanErik Johnston2015-09-016-380/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Clean up scripts/
| | * | | | | | Remove spurious .py from docsErik Johnston2015-09-011-1/+1
| | | | | | | |
| | * | | | | | Actually add config pathErik Johnston2015-08-281-0/+2
| | | | | | | |
| | * | | | | | Clean up scripts/Erik Johnston2015-08-275-380/+4
| | | | | | | |
| * | | | | | | Lower size of 'stateGroupCache' now that we have data from matrix.org to ↵Erik Johnston2015-09-011-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | support doing so
* | | | | | | don't log the whole DB config (including postgres password...)Matthew Hodgson2015-08-291-2/+2
| | | | | | |
* | | | | | | Merge pull request #258 from matrix-org/slowtestsmakemesadDaniel Wagner-Hall2015-08-283-4/+39
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Swap out bcrypt for md5 in tests
| * | | | | | Remove unused importDaniel Wagner-Hall2015-08-261-1/+0
| | | | | | |
| * | | | | | Swap out bcrypt for md5 in testsDaniel Wagner-Hall2015-08-263-3/+39
| | |/ / / / | |/| | | | | | | | | | | | | | | | This reduces our ~8 second sequential test time down to ~7 seconds
* | | | | | Merge branch 'release-v0.10.0' into developMark Haines2015-08-2817-73/+262
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | | | | | | Conflicts: synapse/handlers/auth.py synapse/python_dependencies.py synapse/rest/client/v1/login.py
| * | | | Bump version and changelog v0.10.0-rc5Erik Johnston2015-08-272-1/+6
| | | | |
| * | | | Merge pull request #260 from matrix-org/erikj/filename_orderErik Johnston2015-08-271-8/+14
| |\ \ \ \ | | | | | | | | | | | | Check for an internationalised filename first
| | * | | | 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
| | | | |
| * | | | Bump changelog and version v0.10.0-rc4Erik Johnston2015-08-272-4/+11
| | | | |
| * | | | Merge pull request #259 from matrix-org/markjh/unicode_content_dispositionErik Johnston2015-08-273-12/+43
| |\ \ \ \ | | | | | | | | | | | | Support unicode attachment filenames
| | * | | | 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-263-8/+17
| |/ / / /
| * | | | Merge pull request #252 from matrix-org/erikj/typing_loopErik Johnston2015-08-261-9/+5
| |\ \ \ \ | | | | | | | | | | | | Don't loop over all rooms ever in typing.get_new_events_for_user
| | * | | | Remove needless existence checksErik Johnston2015-08-261-7/+3
| | | | | |
| | * | | | Don't loop over all rooms ever in typing.get_new_events_for_userErik Johnston2015-08-261-2/+2
| |/ / / /
| * | | | Bump changelog and version v0.10.0-rc3Erik Johnston2015-08-252-1/+18
| | | | |
| * | | | Merge pull request #250 from matrix-org/erikj/generated_directoryErik Johnston2015-08-251-2/+15
| |\ \ \ \ | | | | | | | | | | | | Add config option to specify where generated files should be dumped
| | * | | | Update config docErik Johnston2015-08-251-1/+2
| | | | | |
| | * | | | s/--generated-directory/--keys-directory/Erik Johnston2015-08-251-7/+7
| | | | | |
| | * | | | Add config option to specify where generated files should be dumpedErik Johnston2015-08-251-2/+14
| | | | | |
| * | | | | Merge pull request #249 from matrix-org/erikj/allow_config_path_dirsErik Johnston2015-08-251-6/+34
| |\ \ \ \ \ | | | | | | | | | | | | | | Allow specifying directories as config paths
| | * | | | | Warn if we encounter unexpected files in config directoriesErik Johnston2015-08-251-7/+17
| | |/ / / /
| | * / / / Allow specifying directories as config filesErik Johnston2015-08-251-6/+24
| |/ / / /
| * | | | Merge pull request #245 from matrix-org/erikj/configurable_client_locationErik Johnston2015-08-253-14/+30
| |\ \ \ \ | | | | | | | | | | | | Allow specifying a directory to host a web client from
| | * | | | Print the correct pip install line when failing due to lack of ↵Erik Johnston2015-08-252-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | matrix-angular-sdk
| | * | | | Update the log messageErik Johnston2015-08-251-5/+10
| | | | | |
| | * | | | Revert previous commit. Instead, always download matrix-angular-sdk as a ↵Erik Johnston2015-08-251-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | requirement, but don't complain (when we do check_requirements) if we don't have it when we start synapse.
| | * | | | Remove dependency on matrix-angular-sdkErik Johnston2015-08-252-6/+9
| | | | | |
| | * | | | Allow specifying a directory to host a web client fromErik Johnston2015-08-252-3/+6
| | | | | |
| * | | | | Merge pull request #246 from matrix-org/erikj/config_helper_functionErik Johnston2015-08-251-0/+30
| |\ \ \ \ \ | | |/ / / / | |/| | | | Add utility to parse config and print out a key
| | * | | | Fix typo when using sys.stderr.writeErik Johnston2015-08-251-1/+1
| | | | | |
| | * | | | Add utility to parse config and print out a keyErik Johnston2015-08-251-0/+30
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usage: ``` $ python -m synapse.config read server_name -c homeserver.yaml localhost ```
| * | | | Bump version and changelog v0.10.0-rc2Erik Johnston2015-08-242-1/+11
| | | | |
| * | | | Do auth checks *before* persisting the eventErik Johnston2015-08-241-16/+16
| | | | |
| * | | | Merge pull request #242 from matrix-org/erikj/pushers_ephemeral_eventsErik Johnston2015-08-243-6/+19
| |\ \ \ \ | | | | | | | | | | | | Don't make pushers handle presence/typing events
| | * | | | Don't make pushers handle presence/typing eventsErik Johnston2015-08-243-6/+19
| |/ / / /
| * | | | Don't insert events into 'event_*_extremeties' tables if they're outliersErik Johnston2015-08-231-2/+8
| | | | |
| * | | | Actually check if event_id isn't returned by _get_state_groupsErik Johnston2015-08-211-2/+9
| | | | |
| * | | | Upate changelog v0.10.0-rc1Erik Johnston2015-08-211-1/+1
| | | | |
| * | | | Upate changelogErik Johnston2015-08-211-0/+3
| | | | |
| * | | | Merge branch 'erikj/user_dedup' into release-v0.10.0Erik Johnston2015-08-214-12/+48
| |\ \ \ \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-11 20:25:14 +0000