summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* 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
|/ / / / /
* | | | | 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
| * | | | | 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-283-4/+39
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove unused importDaniel Wagner-Hall2015-08-261-1/+0
| * | | | Swap out bcrypt for md5 in testsDaniel Wagner-Hall2015-08-263-3/+39
| | |/ / | |/| |
* | | | Merge branch 'release-v0.10.0' into developMark Haines2015-08-2817-73/+262
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | 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
| |\ \
| | * | 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
| |\ \
| | * | 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
| |\ \
| | * | 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
| |\ \
| | * | 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
| |\ \ \
| | * | | 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
| * | | Merge pull request #246 from matrix-org/erikj/config_helper_functionErik Johnston2015-08-251-0/+30
| |\ \ \ | | |/ / | |/| |
| | * | 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-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 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
| |\ \
| | * | 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 pull request #254 from matrix-org/markjh/tox_setuptoolsMark Haines2015-08-263-5/+37
|\ \ \
| * | | Pass an empty list of arguments to tox if no arguments are givenMark Haines2015-08-261-0/+2
| * | | Install tox locally if it wasn't already installed when running setup.py testMark Haines2015-08-261-2/+10
| * | | Make 'setup.py test' run toxMark Haines2015-08-263-5/+27
* | | | Merge pull request #255 from matrix-org/mergeeriksmadnessDaniel Wagner-Hall2015-08-264-12/+50
|\ \ \ \ | |/ / / |/| | |
| * | | Merge erikj/user_dedup to developDaniel Wagner-Hall2015-08-264-12/+50
* | | | Merge pull request #253 from matrix-org/toxDaniel Wagner-Hall2015-08-261-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Allow tests to be filter when using toxDaniel Wagner-Hall2015-08-261-1/+1
|/ / /
* | | Merge pull request #251 from matrix-org/removeadminDaniel Wagner-Hall2015-08-259-24/+5
|\ \ \
| * \ \ Merge branch 'deviceid' into removeadminDaniel Wagner-Hall2015-08-252-4/+2
| |\ \ \
| * | | | Stop looking up "admin", which we never readDaniel Wagner-Hall2015-08-259-24/+5
* | | | | Merge pull request #248 from matrix-org/deviceidDaniel Wagner-Hall2015-08-2530-95/+64
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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-2529-90/+63
* | | | Merge pull request #247 from matrix-org/markjh/toxMark Haines2015-08-254-8/+38
|\ \ \ \
| * | | | Add .tox to .gitignoreMark Haines2015-08-251-0/+1
| * | | | Set PYTHONDONTWRITEBYTECODE in the tox environment so that we don't spew .pyc...Mark Haines2015-08-251-0/+2
| * | | | Prod jenkinsMark Haines2015-08-250-0/+0
| * | | | Prod jenkinsMark Haines2015-08-250-0/+0
| * | | | Prod jenkinsMark Haines2015-08-250-0/+0
| * | | | Only include demo/demo.tls.dh. Don't include any other dh fileMark Haines2015-08-251-3/+5
| * | | | Add tox.ini file for synapseMark Haines2015-08-253-5/+30
|/ / / /
* | | | Merge pull request #243 from matrix-org/markjh/remove_syutilMark Haines2015-08-2522-93/+84
|\ \ \ \ | |/ / / |/| | |
| * | | Fix typo in module imports and package dependenciesMark Haines2015-08-252-2/+2
| * | | Fix indentMark Haines2015-08-241-1/+1
| * | | Replace syutil references in scriptsMark Haines2015-08-245-22/+15
| * | | Remove syutil dependency in favour of smaller single-purpose librariesMark Haines2015-08-2417-71/+69
* | | | Merge pull request #244 from matrix-org/markjh/refresh_tokensMark Haines2015-08-251-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | 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
| * | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.10.0Erik Johnston2015-08-204-4/+6
| |\ \
* | | | Return fully qualified user_id as per specDavid Baker2015-08-201-1/+1
* | | | Merge pull request #240 from matrix-org/refreshDaniel Wagner-Hall2015-08-2019-76/+303
|\ \ \ \
| * | | | 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
| |\ \ \ \
| * \ \ \ \ Merge branch 'develop' into refreshDaniel Wagner-Hall2015-08-2019-80/+498
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | /tokenrefresh POST endpointDaniel Wagner-Hall2015-08-209-8/+232
| * | | | | s/by_token/by_access_token/gDaniel Wagner-Hall2015-08-2010-40/+40
| * | | | | Move token generation to auth handlerDaniel Wagner-Hall2015-08-203-31/+38
| * | | | | Merge branch 'auth' into refreshDaniel Wagner-Hall2015-08-207-24/+115
| |\ \ \ \ \
* | \ \ \ \ \ Merge pull request #229 from matrix-org/authDaniel Wagner-Hall2015-08-205-6/+90
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Remove incorrect whitespaceDaniel Wagner-Hall2015-08-201-3/+3
| * | | | | | Merge branch 'develop' into authDaniel Wagner-Hall2015-08-201-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' into authDaniel Wagner-Hall2015-08-2021-93/+531
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | / / / | | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'develop' into authDaniel Wagner-Hall2015-08-199-25/+128
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into authDaniel Wagner-Hall2015-08-192-18/+25
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Re-add whitespace around caveat operatorsDaniel Wagner-Hall2015-08-192-8/+8
| * | | | | | | Switch to pymacaroons-pynaclDaniel Wagner-Hall2015-08-191-1/+1
| * | | | | | | Remove padding space around caveat operatorsDaniel Wagner-Hall2015-08-182-8/+8
| * | | | | | | Fix units in testDaniel Wagner-Hall2015-08-181-1/+1
| * | | | | | | Fix some formatting to use tuplesDaniel Wagner-Hall2015-08-182-5/+5
| * | | | | | | Merge branch 'develop' into authDaniel Wagner-Hall2015-08-1838-455/+1346
| |\ \ \ \ \ \ \
| * | | | | | | | Remove accidentally added fileDaniel Wagner-Hall2015-08-181-0/+0
| * | | | | | | | Issue macaroons as opaque auth tokensDaniel Wagner-Hall2015-08-186-6/+90
* | | | | | | | | Merge remote-tracking branch 'origin/master' into developMark Haines2015-08-202-18/+25
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | / / / | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | hacky support for video for FS CC DDMatthew Hodgson2015-08-061-3/+0
| * | | | | | | hacky support for video for FS CC DDMatthew Hodgson2015-08-061-15/+25
* | | | | | | | Merge pull request #239 from matrix-org/pynaclDaniel Wagner-Hall2015-08-201-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Correct pynacl version to 0.3.0Daniel Wagner-Hall2015-08-201-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into developErik Johnston2015-08-204-45/+151
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge pull request #237 from matrix-org/markjh/readme-rst-formattingMark Haines2015-08-201-37/+39
| |\ \ \ \ \ \
| | * | | | | | Further formatting clean upsMark Haines2015-08-201-7/+7
| | * | | | | | Clean up some of restructured text formatting in the README.rstMark Haines2015-08-201-30/+32
| * | | | | | | Merge pull request #236 from matrix-org/markjh/upgrade-instructionsMark Haines2015-08-202-7/+37
| |\ \ \ \ \ \ \
| | * | | | | | | Tweak the wording a bitMark Haines2015-08-201-4/+4
| | * | | | | | | Add generic update instructions to UPGRADE.rst and add link to them from the ...Mark Haines2015-08-202-7/+37
| | |/ / / / / /
| * / / / / / / Update changelogErik Johnston2015-08-201-0/+1
| |/ / / / / /
| * | | | | | Bump version and changelogErik Johnston2015-08-202-1/+74
* | | | | | | 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
| |/ / / / / /
* | | | | | | Merge pull request #238 from matrix-org/fix_set_passwordErik Johnston2015-08-202-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | 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-1334-368/+613
| |\ \ \ \ \ \
| * | | | | | | 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
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #234 from matrix-org/email_loginDavid Baker2015-08-201-5/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Comma comma comma comma comma chameleonDavid Baker2015-08-201-1/+1
| * | | | | | | | Merge branch 'develop' into email_loginDavid Baker2015-08-2060-707/+1752
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #211 from matrix-org/email_in_useMark Haines2015-08-205-1/+75
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | 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
* | | | | | | | | Merge pull request #232 from matrix-org/erikj/appservice_joined_roomsErik Johnston2015-08-193-12/+32
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | 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
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts_t...Erik Johnston2015-08-1710-147/+105
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Batch _get_linearized_receipts_for_roomsErik Johnston2015-08-141-15/+64
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts_t...Erik Johnston2015-08-133-51/+18
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add metrics to the receipts cacheErik Johnston2015-08-132-0/+13
| * | | | | | | | | | Re-enable receiptsErik Johnston2015-08-131-2/+0
* | | | | | | | | | | Merge pull request #225 from matrix-org/erikj/reactor_metricsErik Johnston2015-08-181-3/+25
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Also check for presence of 'threadCallQueue' in reactorErik Johnston2015-08-181-1/+8
| * | | | | | | | | | | Use more helpful variable namesErik Johnston2015-08-181-3/+3
| * | | | | | | | | | | Fix pending_calls metric to not lieErik Johnston2015-08-141-3/+18
* | | | | | | | | | | | Bump size of get_presence_state cacheErik Johnston2015-08-181-1/+1
| |_|_|_|/ / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | TypoErik Johnston2015-08-181-1/+1
* | | | | | | | | | | None checkErik Johnston2015-08-181-0/+2
* | | | | | | | | | | Don't assume @cachedList function returns keys for everythingErik Johnston2015-08-181-1/+1
* | | | | | | | | | | Reduce cache size from obscenely large to quite largeErik Johnston2015-08-181-1/+1
* | | | | | | | | | | Merge pull request #226 from matrix-org/erikj/room_presenceErik Johnston2015-08-183-15/+122
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | More helpful variable namesErik Johnston2015-08-181-7/+7
| * | | | | | | | | | | Doc stringsErik Johnston2015-08-181-0/+28
| * | | | | | | | | | | Remove debug try/catchErik Johnston2015-08-181-47/+43
| * | | | | | | | | | | Remember to invalidate cachesErik Johnston2015-08-171-2/+8
| * | | | | | | | | | | Implement a batched presence_handler.get_state and use itErik Johnston2015-08-173-14/+73
| * | | | | | | | | | | Add batched version of store.get_presence_stateErik Johnston2015-08-171-1/+19
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #208 from matrix-org/markjh/end-to-end-key-federationMark Haines2015-08-185-30/+233
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'origin/develop' into markjh/end-to-end-key-fede...Mark Haines2015-08-1335-369/+615
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| * | | | | | | | | | Add a few strategic new lines to break up the on_query_client_keys and on_cla...Mark Haines2015-08-131-0/+6
| * | | | | | | | | | Get the end-to-end key federation workingMark Haines2015-07-244-21/+17
| * | | | | | | | | | Add federation support for end-to-end key requestsMark Haines2015-07-235-30/+231
* | | | | | | | | | | Fix bug where we were leaking None into state event listsErik Johnston2015-08-171-2/+3
* | | | | | | | | | | Merge pull request #221 from matrix-org/authDaniel Wagner-Hall2015-08-149-145/+102
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge password checking implementationsDaniel Wagner-Hall2015-08-121-20/+15
| * | | | | | | | | Merge branch 'develop' into authDaniel Wagner-Hall2015-08-123-55/+49
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into developDaniel Wagner-Hall2015-08-125-71/+70
| | |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Simplify LoginHander and AuthHandlerDaniel Wagner-Hall2015-08-129-131/+93
| * | | | | | | | | | | Merge branch 'develop' into authDaniel Wagner-Hall2015-08-111-2/+2
| |\| | | | | | | | | |
| | * | | | | | | | | | Remove call to recently removed function in mockDaniel Wagner-Hall2015-08-111-2/+2
* | | | | | | | | | | | Merge pull request #219 from matrix-org/erikj/dictionary_cacheErik Johnston2015-08-1327-356/+928
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Remove pointless mapErik Johnston2015-08-131-7/+3
| * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary...Erik Johnston2015-08-131-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #224 from matrix-org/erikj/reactor_metricsErik Johnston2015-08-131-0/+29
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'develop' into erikj/reactor_metricsMark Haines2015-08-132-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Add max-line-length to the flake8 section of setup.cfgMark Haines2015-08-131-0/+3
| | * | | | | | | | | | Remove some vertical spaceErik Johnston2015-08-131-36/+9
| | * | | | | | | | | | Replace list comprehensionErik Johnston2015-08-131-8/+3
| | | |_|_|_|/ / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary...Erik Johnston2015-08-131-1/+0
| | |\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | PEP8Erik Johnston2015-08-131-1/+0
| | * | | | | | | | | Merge branch 'erikj/reactor_metrics' into erikj/dictionary_cacheErik Johnston2015-08-131-1/+1
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Don't time getDelayedCallsErik Johnston2015-08-131-1/+1
| | * | | | | | | | | Merge branch 'erikj/reactor_metrics' into erikj/dictionary_cacheErik Johnston2015-08-135-56/+60
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Add some metrics about the reactorErik Johnston2015-08-131-0/+29
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #173 from matrix-org/markjh/twisted-15Mark Haines2015-08-123-55/+29
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Depend on Twisted>=15.1 rather than pining to a particular versionMark Haines2015-08-122-2/+2
| * | | | | | | | | | Merge branch 'develop' into markjh/twisted-15Mark Haines2015-08-1296-1673/+4524
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Bump the version of twisted needed for setup_requires to 15.2.1Mark Haines2015-06-151-1/+1
| * | | | | | | | | | Merge branch 'develop' into markjh/twisted-15Mark Haines2015-06-0111-21/+53
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use Twisted-15.2.1, Use Agent.usingEndpointFactory rather than implement our ...Mark Haines2015-06-012-51/+26
* | | | | | | | | | | | Merge pull request #223 from matrix-org/markjh/enable_demo_registrationErik Johnston2015-08-121-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | enable registration in the demo serversMark Haines2015-08-121-1/+2
|/ / / / / / / / / / /
| | | * | | | | | | | CommentErik Johnston2015-08-121-1/+2
| | | * | | | | | | | Explain why we're prefilling dict with NonesErik Johnston2015-08-121-0/+4
| | | * | | | | | | | Better variable nameErik Johnston2015-08-121-5/+5
| | | * | | | | | | | Split _get_state_for_group_from_cache into twoErik Johnston2015-08-121-32/+53
| | | * | | | | | | | Fix _filter_events_for_clientErik Johnston2015-08-122-6/+2
| | | * | | | | | | | DocstringErik Johnston2015-08-121-0/+27
| | | * | | | | | | | Simplify staggered deferred listsErik Johnston2015-08-121-2/+2
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-01 22:35:25 +0000