summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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-2539-181/+724
| |\
| * | Bundle in some room state in the unsigned bit of the invite when sending to i...Erik Johnston2015-09-104-7/+35
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatableErik Johnston2015-10-0247-847/+875
|\ \ \
| * \ \ 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
| | * | | 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-171-13/+20
| | * | | Refactor do_invite_joinErik Johnston2015-09-172-31/+56
| * | | | 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-2814-565/+3
| |\ \ \ \ \
| | * | | | | 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-231-31/+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
| | * | | | | 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-221-16/+0
| | * | | | | 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
| * | | | | | 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
| | |/ / /
| * | | | 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
| * | | | | 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-2220-24/+212
| |/ / / /
| * | | | Merge pull request #276 from matrix-org/markjh/history_for_rooms_that_have_be...Mark Haines2015-09-218-115/+260
| |\ \ \ \
| | * | | | 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-101-7/+13
| | * | | | 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-092-41/+13
| | * | | | 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-161-1/+1
| |\ \ \ \
| | * \ \ \ Merge branch 'erikj/update_extremeties' into hotfixes-v0.10.0-r2Erik Johnston2015-09-162-0/+11
| | |\ \ \ \
| | * | | | | Fix adding threepids to an existing accountDavid Baker2015-09-101-0/+1
| | * | | | | Bump version and change logErik Johnston2015-09-101-1/+1
| | * | | | | 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-151-1/+1
| | |\| | | |
| | * | | | | 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-151-1/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Bump version/changelog v0.10.0-r1Erik Johnston2015-09-081-1/+1
| * | | | | | 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-141-3/+89
| |\ \ \ \ \ \
| | * | | | | | s/user_id/user/g for consistencyDaniel Wagner-Hall2015-09-011-10/+10
| | * | | | | | Merge branch 'mergeeriksmadness' into authDaniel Wagner-Hall2015-08-264-12/+50
| | |\ \ \ \ \ \
| | * | | | | | | Attempt to validate macaroonsDaniel Wagner-Hall2015-08-261-9/+95
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatableErik Johnston2015-09-149-26/+87
|\| | | | | | | |
| * | | | | | | | Merge pull request #265 from matrix-org/erikj/check_room_existsErik Johnston2015-09-141-0/+8
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 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
| | | |_|_|_|/ / / | | |/| | | | | |
| * / | | | | | | Various bug fixes to crypto.keyringErik Johnston2015-09-091-10/+17
| |/ / / / / / /
| * | | | | / / Merge branch 'master' into developMark Haines2015-09-073-3/+3
| |\| | | | | | | | |_|_|_|/ / | |/| | | | |
| | * | | | | Change log level to infoErik Johnston2015-09-031-1/+1
| | * | | | | Bump version and changelogErik Johnston2015-09-031-1/+1
| | * | | | | Lists use 'append'Erik Johnston2015-09-021-1/+1
| | * | | | | Bump version and changelog v0.10.0-rc6Erik Johnston2015-09-021-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-2816-72/+219
| | |\ \ \ \ \
| | * | | | | | Allow users to redact their own eventsDaniel Wagner-Hall2015-08-282-10/+42
| | | |_|_|_|/ | | |/| | | |
* | | | | | | Also check the domains for membership state_keysErik Johnston2015-09-011-0/+9
* | | | | | | Merge branch 'erikj/check_room_exists' into erikj/unfederatableErik Johnston2015-09-011-0/+8
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Fix testsErik Johnston2015-09-011-1/+1
| * | | | | | 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-011-3/+3
* | | | | | Add flag which disables federation of the roomErik Johnston2015-09-012-3/+21
|/ / / / /
* | | | | Use the version of "matrix-angular-sdk" hosted on pypiMark Haines2015-09-011-5/+0
* | | | | Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into developErik Johnston2015-09-012-1/+3
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge pull request #261 from matrix-org/erikj/scripts_cleanErik Johnston2015-09-011-0/+2
| |\ \ \ \
| | * | | | Actually add config pathErik Johnston2015-08-281-0/+2
| * | | | | Lower size of 'stateGroupCache' now that we have data from matrix.org to supp...Erik Johnston2015-09-011-1/+1
| |/ / / /
* | | | | 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-282-4/+26
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove unused importDaniel Wagner-Hall2015-08-261-1/+0
| * | | | Swap out bcrypt for md5 in testsDaniel Wagner-Hall2015-08-262-3/+26
| | |/ / | |/| |
* | | | Merge branch 'release-v0.10.0' into developMark Haines2015-08-2816-72/+219
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Bump version and changelog v0.10.0-rc5Erik Johnston2015-08-271-1/+1
| * | 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-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-263-8/+17
| * | 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-251-1/+1
| * | Merge pull request #250 from matrix-org/erikj/generated_directoryErik Johnston2015-08-251-2/+15
| |\ \
| | * | 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
| * | | 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
| |\ \
| | * | Print the correct pip install line when failing due to lack of matrix-angular...Erik Johnston2015-08-252-8/+9
| | * | Update the log messageErik Johnston2015-08-251-5/+10
| | * | Revert previous commit. Instead, always download matrix-angular-sdk as a requ...Erik Johnston2015-08-251-3/+7
| | * | 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
| * | | 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
| |/ /
| * | Bump version and changelog v0.10.0-rc2Erik Johnston2015-08-241-1/+1
| * | Do auth checks *before* persisting the eventErik Johnston2015-08-241-16/+16
| * | 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
| * | Doc stringErik Johnston2015-08-211-0/+6
| * | When logging in fetch user by user_id case insensitively, *unless* there are ...Erik Johnston2015-08-213-12/+31
| * | Don't allow people to register user ids which only differ by case to an exist...Erik Johnston2015-08-212-2/+13
* | | Merge erikj/user_dedup to developDaniel Wagner-Hall2015-08-264-12/+50
| |/ |/|
* | Merge pull request #251 from matrix-org/removeadminDaniel Wagner-Hall2015-08-252-6/+3
|\ \
| * \ Merge branch 'deviceid' into removeadminDaniel Wagner-Hall2015-08-252-4/+2
| |\ \
| * | | Stop looking up "admin", which we never readDaniel Wagner-Hall2015-08-252-6/+3
* | | | Merge pull request #248 from matrix-org/deviceidDaniel Wagner-Hall2015-08-2523-75/+60
|\ \ \ \ | | |/ / | |/| |
| * | | Fix up one more referenceDaniel Wagner-Hall2015-08-252-4/+2
| |/ /
| * | Re-wrap lineDaniel Wagner-Hall2015-08-251-3/+1
| * | Remove completely unused concepts from codebaseDaniel Wagner-Hall2015-08-2522-70/+59
* | | Merge pull request #243 from matrix-org/markjh/remove_syutilMark Haines2015-08-2517-71/+69
|\ \ \ | |/ / |/| |
| * | Fix typo in module imports and package dependenciesMark Haines2015-08-252-2/+2
| * | Fix indentMark Haines2015-08-241-1/+1
| * | Remove syutil dependency in favour of smaller single-purpose librariesMark Haines2015-08-2417-71/+69
* | | Remove autoincrement since we incrementing the ID in the storage layerMark Haines2015-08-241-1/+1
|/ /
* | Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into developErik Johnston2015-08-213-2/+7
|\|
| * Fix bug where we didn't correctly serialize the redacted_because key over fed...Erik Johnston2015-08-212-1/+6
| * Add missing param in store.get_state_groups invocationErik Johnston2015-08-211-1/+1
* | Return fully qualified user_id as per specDavid Baker2015-08-201-1/+1
* | Fix bad mergeDaniel Wagner-Hall2015-08-201-8/+1
* | Fix indentationDaniel Wagner-Hall2015-08-201-1/+2
* | Fix flake8 warningsDaniel Wagner-Hall2015-08-201-4/+6
* | Merge branch 'auth' into refreshDaniel Wagner-Hall2015-08-202-4/+4
|\ \
| * | Remove incorrect whitespaceDaniel Wagner-Hall2015-08-201-3/+3
| * | Merge branch 'develop' into authDaniel Wagner-Hall2015-08-201-1/+1
| |\ \
| | * | Correct pynacl version to 0.3.0Daniel Wagner-Hall2015-08-201-1/+1
| | |/
| * | Merge branch 'develop' into authDaniel Wagner-Hall2015-08-2017-48/+379
| |\|
* | | Merge branch 'develop' into refreshDaniel Wagner-Hall2015-08-2015-35/+346
|\ \ \ | | |/ | |/|
| * | Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into developErik Johnston2015-08-201-1/+1
| |\ \
| | * | Bump version and changelogErik Johnston2015-08-201-1/+1
| * | | Merge pull request #235 from matrix-org/erikj/room_avatarsErik Johnston2015-08-202-2/+4
| |\ \ \
| | * | | Add m.room.avatar to default power levels. Change default required power leve...Erik Johnston2015-08-202-2/+4
| | |/ /
| * | | Remove spurious extra arg to set_passwordDavid Baker2015-08-201-1/+1
| * | | Another use of check_password that got missed in the yield fixDavid Baker2015-08-201-1/+1
| |/ /
| * | Merge pull request #231 from matrix-org/erikj/pushers_store_last_tokenErik Johnston2015-08-201-5/+11
| |\ \
| | * | Store the 'last_token' in the db, even if we processed no eventsErik Johnston2015-08-191-0/+6
| | * | Block on storing the current last_tokensErik Johnston2015-08-191-5/+5
| * | | Merge pull request #206 from matrix-org/erikj/generate_presice_thumbnailsMark Haines2015-08-203-21/+226
| |\ \ \
| | * | | Fix flake8 warningMark Haines2015-08-131-0/+1
| | * | | Merge remote-tracking branch 'origin/develop' into erikj/generate_presice_thu...Mark Haines2015-08-1326-300/+399
| | |\ \ \
| | * | | | Doc-string for config ultility functionMark Haines2015-08-121-0/+11
| | * | | | Add config option for setting the list of thumbnail sizes to precalculateMark Haines2015-08-122-16/+41
| | * | | | Make a config option for whether to generate new thumbnail sizes dynamicallyMark Haines2015-08-123-7/+27
| | * | | | 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
| * | | | | Merge pull request #233 from matrix-org/erikj/canonical_aliasErik Johnston2015-08-203-1/+19
| |\ \ \ \ \
| | * | | | | Check that the canonical room alias actually points to the roomErik Johnston2015-08-201-1/+17
| | * | | | | Add canonical alias to the default power levelsErik Johnston2015-08-192-0/+2
| | | |_|/ / | | |/| | |
| * | | | | Comma comma comma comma comma chameleonDavid Baker2015-08-201-1/+1
| * | | | | Merge branch 'develop' into email_loginDavid Baker2015-08-2051-679/+1615
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #211 from matrix-org/email_in_useMark Haines2015-08-204-0/+73
| | |\ \ \ \ \
| | | * | | | | 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
| * | | | | | Bump schema versionDavid Baker2015-08-041-1/+1
| * | | | | | Add endpoint that proxies ID server request token and errors if the given ema...David Baker2015-08-044-1/+71
* | | | | | | /tokenrefresh POST endpointDaniel Wagner-Hall2015-08-208-8/+177
* | | | | | | s/by_token/by_access_token/gDaniel Wagner-Hall2015-08-202-6/+6
* | | | | | | Move token generation to auth handlerDaniel Wagner-Hall2015-08-202-24/+31
* | | | | | | Merge branch 'auth' into refreshDaniel Wagner-Hall2015-08-203-6/+18
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'develop' into authDaniel Wagner-Hall2015-08-199-25/+128
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Re-add whitespace around caveat operatorsDaniel Wagner-Hall2015-08-191-4/+4
| * | | | | Switch to pymacaroons-pynaclDaniel Wagner-Hall2015-08-191-1/+1
| * | | | | Remove padding space around caveat operatorsDaniel Wagner-Hall2015-08-181-4/+4
| * | | | | Fix some formatting to use tuplesDaniel Wagner-Hall2015-08-181-4/+4
| * | | | | Merge branch 'develop' into authDaniel Wagner-Hall2015-08-1831-448/+1236
| |\ \ \ \ \
| * | | | | | Remove accidentally added fileDaniel Wagner-Hall2015-08-181-0/+0
| * | | | | | Issue macaroons as opaque auth tokensDaniel Wagner-Hall2015-08-184-6/+18
* | | | | | | Don't get apservice interested rooms in RoomHandler.get_joined_rooms_for_usersErik Johnston2015-08-193-12/+32
| |_|/ / / / |/| | | | |
* | | | | | Remove an access token log lineErik Johnston2015-08-191-1/+1
* | | | | | Fix regression where we incorrectly responded with a 200 to /loginErik Johnston2015-08-191-1/+2
* | | | | | Merge pull request #228 from matrix-org/erikj/_get_state_for_groupsErik Johnston2015-08-181-2/+5
|\ \ \ \ \ \
| * | | | | | Remove newline because vertical whitespace makes mjark sadErik Johnston2015-08-181-2/+1
| * | | | | | Rejig the code to make it nicerErik Johnston2015-08-181-3/+2
| * | | | | | Ensure we never return a None event from _get_state_for_groupsErik Johnston2015-08-181-3/+8
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #230 from matrix-org/erikj/appservice_auth_entityErik Johnston2015-08-181-0/+3
|\ \ \ \ \ \
| * | | | | | Set request.authenticated_entity for application servicesErik Johnston2015-08-181-0/+3
| |/ / / / /
* | | | | | Merge pull request #227 from matrix-org/erikj/receipts_take2Erik Johnston2015-08-184-17/+91
|\ \ \ \ \ \
| * | | | | | Rename unhelpful variable nameErik Johnston2015-08-181-7/+2
| * | | | | | CommentsErik Johnston2015-08-181-4/+14
| * | | | | | Add index receipts_linearized_room_streamErik Johnston2015-08-172-1/+19
| * | | | | | Remove unused importErik Johnston2015-08-171-2/+0
| * | | | | | Remove added unused methodsErik Johnston2015-08-171-7/+0
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-16 09:07:50 +0000