summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #302 from matrix-org/daniel/3pidinvitesDaniel Wagner-Hall2015-10-1612-24/+392
|\
| * Add signing host and keyname to signaturesDaniel Wagner-Hall2015-10-162-6/+10
| * Verify third party ID server certificatesDaniel Wagner-Hall2015-10-164-9/+43
| * Use non-placeholder name for endpointDaniel Wagner-Hall2015-10-151-1/+1
| * Look for keys on the right objectsDaniel Wagner-Hall2015-10-153-4/+6
| * Merge branch 'develop' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-1517-588/+758
| |\
| * | Use more descriptive error codeDaniel Wagner-Hall2015-10-131-1/+1
| * | Remove unnecessary class-wrappingDaniel Wagner-Hall2015-10-138-91/+94
| * | Move logic into handlerDaniel Wagner-Hall2015-10-132-115/+150
| * | Add loggingDaniel Wagner-Hall2015-10-131-2/+2
| * | Re-add accidentally removed codeDaniel Wagner-Hall2015-10-131-1/+1
| * | 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 branch 'develop' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-061-1/+0
| |\ \ \
| * | | | 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 matrix-org/erikj/atomic_join_fed...Daniel Wagner-Hall2015-10-061-76/+131
| * | | | Merge branch 'daniel/useragent' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-061-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'develop' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-061-1/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'daniel/useragent' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-052-6/+10
| |\ \ \ \ \ \
| * | | | | | | Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_federation"Daniel Wagner-Hall2015-10-051-131/+76
| * | | | | | | Merge branch 'develop' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-0510-83/+218
| |\ \ \ \ \ \ \
| * | | | | | | | Implement third party identifier invitesDaniel Wagner-Hall2015-10-0111-19/+275
* | | | | | | | | Merge pull request #309 from matrix-org/erikj/_filter_events_for_clientErik Johnston2015-10-163-97/+51
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Amalgamate _filter_events_for_clientErik Johnston2015-10-163-97/+51
|/ / / / / / / / /
* | | | | | | | | Merge pull request #308 from matrix-org/markjh/v2_filter_encodingMark Haines2015-10-161-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Encode the filter JSON as UTF-8 before storing in the database.Mark Haines2015-10-161-2/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #305 from matrix-org/markjh/v2_sync_apiMark Haines2015-10-143-170/+211
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix v2 sync pollingMark Haines2015-10-141-3/+3
| * | | | | | | | Merge branch 'develop' into markjh/v2_sync_apiMark Haines2015-10-149-382/+485
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Add a get_invites_for_user method to the storage to find out the rooms a user...Mark Haines2015-10-132-6/+16
| * | | | | | | | | Include invites in incremental syncMark Haines2015-10-132-7/+26
| * | | | | | | | | Include invited rooms in the initial syncMark Haines2015-10-132-11/+26
| * | | | | | | | | Merge branch 'develop' into markjh/v2_sync_apiMark Haines2015-10-1311-34/+242
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Start spliting out the rooms into joined and invited in v2 syncMark Haines2015-10-132-27/+49
| * | | | | | | | | Update the filters to match the latest spec.Mark Haines2015-10-124-42/+55
| * | | | | | | | | Merge branch 'markjh/presence_races' into markjh/v2_sync_apiMark Haines2015-10-091-3/+8
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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-0911-123/+272
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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-082-21/+18
| * | | | | | | | | | | 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-053-32/+47
| * | | | | | | | | | | Start updating the sync API to match the specificationMark Haines2015-10-013-90/+54
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #304 from matrix-org/erikj/remove_unused_argErik Johnston2015-10-144-12/+12
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Remove unused room_id argErik Johnston2015-10-144-12/+12
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #303 from matrix-org/markjh/twisted_debuggingMark Haines2015-10-134-1/+83
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Enable stack traces for the demo scriptsMark Haines2015-10-131-0/+3
| * | | | | | | | | | Only turn on the twisted deferred debugging if full_twisted_stacktraces is se...Mark Haines2015-10-132-3/+8
| * | | | | | | | | | Fix pep8 warnings.Mark Haines2015-10-131-8/+12
| * | | | | | | | | | Bounce all deferreds through the reactor to make debugging easier.Mark Haines2015-10-132-0/+70
* | | | | | | | | | | Merge pull request #301 from matrix-org/markjh/v2_filteringErik Johnston2015-10-132-24/+50
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | update filtering testsMark Haines2015-10-131-6/+6
| * | | | | | | | | | Update the v2 filters to support filtering presence and remove support for pu...Mark Haines2015-10-131-18/+44
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #300 from matrix-org/erikj/store_engineErik Johnston2015-10-136-381/+402
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | rename schema_prepare to prepare_databaseErik Johnston2015-10-135-4/+4
| * | | | | | | | | Expose error more nicelyErik Johnston2015-10-136-9/+5
| * | | | | | | | | Split out the schema preparation and update logic into its own moduleErik Johnston2015-10-134-377/+402
|/ / / / / / / / /
* | | | | | | | | Merge pull request #299 from stevenhammerton/sh-cas-required-attributeErik Johnston2015-10-122-27/+61
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add a comment to clarify why we split on closing curly brace when reading CAS...Steven Hammerton2015-10-121-0/+5
| * | | | | | | | | Unpack dictionary in for loop for nicer syntaxSteven Hammerton2015-10-121-4/+4
| * | | | | | | | | 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 f...Steven Hammerton2015-10-122-22/+10
| * | | | | | | | | Allow optional config params for a required attribute and it's value, if spec...Steven Hammerton2015-10-122-1/+30
| * | | | | | | | | 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 presenceMark Haines2015-10-091-35/+52
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | 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 on defe...Mark Haines2015-10-091-3/+8
| |/ / / / / /
* | | | | | | 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
|\ \ \ \ \ \ \
| * | | | | | | Raise LoginError if CasResponse doensn't contain userSteven Hammerton2015-10-101-1/+1
| * | | | | | | Fix my broken line splittingSteven Hammerton2015-10-101-4/+6
| * | | | | | | Use UserId to create FQ user idSteven Hammerton2015-10-101-1/+1
| * | | | | | | Add get_raw method to SimpleHttpClient, use this in CAS auth rather than requ...Steven Hammerton2015-10-102-24/+44
| * | | | | | | 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
|\ \ \ \ \ \ \
| * | | | | | | 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. Fixes...David Baker2015-10-081-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #292 from matrix-org/daniel/useragentDaniel Wagner-Hall2015-10-062-6/+10
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | 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
| |\| | | | | | |_|_|/ | |/| | |
| * | | | 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
| | |/ / | |/| |
* | | | 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. We are now ...Mark Haines2015-10-061-1/+0
|/ / /
* | / Explicitly add Create event as auth eventErik Johnston2015-10-021-2/+3
| |/ |/|
* | 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
|\ \
| * | 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 i...Erik Johnston2015-09-104-7/+35
* | | | Merge pull request #279 from matrix-org/erikj/unfederatableErik Johnston2015-10-023-4/+32
|\ \ \ \
| * \ \ \ 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
|\ \ \ \ \
| * | | | | CommentErik Johnston2015-09-301-0/+8
| * | | | | Rename varErik Johnston2015-09-301-3/+3
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/atomic_joi...Erik Johnston2015-09-170-0/+0
| |\ \ \ \ \
| * | | | | | 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 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
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Remove double indentationErik Johnston2015-09-301-7/+6
| * | | | | | Set m.room.canonical_alias on room creation.Erik Johnston2015-09-231-1/+11
* | | | | | | Merge pull request #288 from matrix-org/markjh/unused_definitionsMark Haines2015-09-2818-588/+162
|\ \ \ \ \ \ \
| * | | | | | | 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 funct...Mark Haines2015-09-221-0/+130
* | | | | | | | Merge pull request #290 from matrix-org/daniel/synctlDaniel Wagner-Hall2015-09-281-26/+28
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Fix restartDaniel Wagner-Hall2015-09-241-2/+2
| * | | | | | | Allow config file path to be configurable in in synctlDaniel Wagner-Hall2015-09-241-24/+26
|/ / / / / / /
* | | | | | | 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_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 aErik Johnston2015-09-171-4/+3
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #271 from matrix-org/erikj/default_historyErik Johnston2015-09-231-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | 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 PaginationConfigMark Haines2015-09-221-3/+8
* | | | | | | Merge pull request #285 from matrix-org/daniel/metrics-2Daniel Wagner-Hall2015-09-2224-78/+438
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | 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
|/ / / / / /
* | | | | | Merge pull request #276 from matrix-org/markjh/history_for_rooms_that_have_be...Mark Haines2015-09-219-122/+267
|\ \ \ \ \ \
| * | | | | | 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
| * | | | | | 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 roo...Mark Haines2015-09-092-5/+45
| * | | | | | Remove undocumented and unimplemented 'feedback' parameter from the Client-Se...Mark Haines2015-09-096-42/+5
| * | | | | | Allow users that have left the room to view the member list from the point th...Mark Haines2015-09-093-43/+15
| * | | | | | 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 snapsho...Mark Haines2015-09-093-9/+140
| * | | | | | Include rooms that a user has left in an initialSync. Include the state and m...Mark Haines2015-09-081-6/+21
| * | | | | | Include the event_id and stream_ordering of membership events when looking up...Mark Haines2015-09-081-2/+4
| |/ / / / /
* | | | | | Merge pull request #267 from matrix-org/markjh/missing_requirementsMark Haines2015-09-182-11/+29
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add nacl.bindings to the list of modules checked. Re-arrange import order to ...Mark Haines2015-09-011-3/+3
| * | | | | 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
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | "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
| |/ / / / /
* | | | | | Merge pull request #272 from matrix-org/daniel/insecureclientDaniel Wagner-Hall2015-09-157-12/+55
|\ \ \ \ \ \
| * | | | | | Use shorter config key nameDaniel Wagner-Hall2015-09-152-4/+5
| * | | | | | Rename context factoryDaniel Wagner-Hall2015-09-152-5/+5
| * | | | | | 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
* | | | | | | | 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 aroundPaul "LeoNerd" Evans2015-09-141-0/+14
|/ / / / / / / /
* | | | | | | | Merge pull request #256 from matrix-org/authDaniel Wagner-Hall2015-09-147-19/+243
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
| | | | | | | | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatableErik Johnston2015-09-1415-36/+120
| | | | | | | | |\ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #265 from matrix-org/erikj/check_room_existsErik Johnston2015-09-142-8/+37
|\ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | 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 accountDavid Baker2015-09-101-0/+1
* | | | | | | | | | | Merge pull request #270 from matrix-org/markjh/fix_metricsErik Johnston2015-09-101-4/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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.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 message...Mark Haines2015-09-071-0/+6
| |/ / / / / / / /
* | | | | | / / / Merge branch 'master' into developMark Haines2015-09-077-10/+25
|\| | | | | | | | | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | Check domain of events properlyDaniel Wagner-Hall2015-09-011-1/+3
| * | | | | | | | Merge branch 'develop' into redactyoselfDaniel Wagner-Hall2015-08-2817-73/+262
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 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.pztrn2015-09-011-0/+3
|/ / / / / / / / /
| | | | | | | | * 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
| | | | | | | | |\ | | | | | | |_|_|/ | | | | | |/| | |
| | | | | * | | | Fix testsErik Johnston2015-09-012-9/+30
| | | | | * | | | Check room exists when authenticating an event, by asserting they reference a...Erik Johnston2015-09-011-0/+8
| |_|_|_|/ / / / |/| | | | | | |
| | | | | | | * 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
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | 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 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
| |\ \ \ \ \ \
| | * | | | | | 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
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-28 14:08:07 +0000