summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #258 from matrix-org/slowtestsmakemesadDaniel Wagner-Hall2015-08-282-4/+26
|\ | | | | 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-262-3/+26
| | | | | | | | This reduces our ~8 second sequential test time down to ~7 seconds
* | Merge branch 'release-v0.10.0' into developMark Haines2015-08-2816-72/+219
|\ \ | |/ |/| | | | | | | | | 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-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
| |\ | | | | | | 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
| | |
| * | 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
| | |
| * | 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-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
| | | | | | | | multiple case insensitive matches, in which case require the exact user_id
| * Don't allow people to register user ids which only differ by case to an ↵Erik Johnston2015-08-212-2/+13
| | | | | | | | existing one
* | 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
|\ \ | | | | | | Stop looking up "admin", which we never read
| * \ 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
|\ \ \ \ | | |/ / | |/| | Remove completely unused concepts from codebase
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes device_id and ClientInfo device_id is never actually written, and the matrix.org DB has no non-null entries for it. Right now, it's just cluttering up code. This doesn't remove the columns from the database, because that's fiddly.
* | | Merge pull request #243 from matrix-org/markjh/remove_syutilMark Haines2015-08-2517-71/+69
|\ \ \ | |/ / |/| | Replace syutil dependency with smaller, single-purpose libraries
| * | 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 ↵Erik Johnston2015-08-212-1/+6
| | | | | | | | federation
| * 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
|\ \ | | | | | | | | | | | | Conflicts: synapse/handlers/register.py
| * | 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
| | |/ | | | | | | | | | 0.0.3 was a typo
| * | Merge branch 'develop' into authDaniel Wagner-Hall2015-08-2017-48/+379
| |\|
* | | Merge branch 'develop' into refreshDaniel Wagner-Hall2015-08-2015-35/+346
|\ \ \ | | |/ | |/| | | | | | | Conflicts: synapse/rest/client/v1/login.py
| * | 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.
| | * | | Add m.room.avatar to default power levels. Change default required power ↵Erik Johnston2015-08-202-2/+4
| | |/ / | | | | | | | | | | | | levels of such events to 50
| * | | 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
| |\ \ | | | | | | | | Push: store the 'last_token' in the db, even if we processed no events
| | * | 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
| |\ \ \ | | | | | | | | | | Always return a thumbnail of the requested size.
| | * | | Fix flake8 warningMark Haines2015-08-131-0/+1
| | | | |
| | * | | Merge remote-tracking branch 'origin/develop' into ↵Mark Haines2015-08-1326-300/+399
| | |\ \ \ | | | | | | | | | | | | | | | | | | erikj/generate_presice_thumbnails
| | * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, we returned a thumbnail that was at least as big (if possible) as the requested size. Now, if we don't have a thumbnail of the given size we generate (and persist) one of that size.
| * | | | | Merge pull request #233 from matrix-org/erikj/canonical_aliasErik Johnston2015-08-203-1/+19
| |\ \ \ \ \ | | | | | | | | | | | | | | Add server side support for canonical aliases
| | * | | | | 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
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Changes for unique emails
| | | * | | | | Check absent before trying to access keysDavid Baker2015-08-121-3/+3
| | | | | | | |
| | | * | | | | Just leaving off the $ is fine. r* == registerrrrrrrrrDavid Baker2015-08-121-1/+1
| | | | | | | |
| * | | | | | | Allow sign in using email addressDavid Baker2015-08-041-5/+12
| | |/ / / / / | |/| | | | |
| * | | | | | Remember to yield: not much point testing is a deferred is not NoneDavid Baker2015-08-041-1/+2
| | | | | | |
| * | | | | | splt long lineDavid Baker2015-08-041-1/+3
| | | | | | |
| * | | | | | Bump schema versionDavid Baker2015-08-041-1/+1
| | | | | | |
| * | | | | | Add endpoint that proxies ID server request token and errors if the given ↵David Baker2015-08-044-1/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | email is in use on this Home Server.
* | | | | | | /tokenrefresh POST endpointDaniel Wagner-Hall2015-08-208-8/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows refresh tokens to be exchanged for (access_token, refresh_token). It also starts issuing them on login, though no clients currently interpret them.
* | | | | | | s/by_token/by_access_token/gDaniel Wagner-Hall2015-08-202-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We're about to have two kinds of token, access and refresh
* | | | | | | Move token generation to auth handlerDaniel Wagner-Hall2015-08-202-24/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I prefer the auth handler to worry about all auth, and register to call into it as needed, than to smatter auth logic between the two.
* | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This just replaces random bytes with macaroons. The macaroons are not inspected by the client or server. In particular, they claim to have an expiry time, but nothing verifies that they have not expired. Follow-up commits will actually enforce the expiration, and allow for token refresh. See https://bit.ly/matrix-auth for more information
* | | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | Ensure we never return a None event from _get_state_for_groups
| * | | | | | 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 services
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | Re-enable receipts API.
| * | | | | | 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 ↵Erik Johnston2015-08-1710-147/+105
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | erikj/receipts_take2
| * | | | | | | Batch _get_linearized_receipts_for_roomsErik Johnston2015-08-141-15/+64
| | | | | | | |
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-08-132-51/+15
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/receipts_take2
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix pending_calls metric to not lie
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add and use cached batched storage.get_state function.
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Federation for end-to-end key requests.
| * | | | | | | Merge remote-tracking branch 'origin/develop' into ↵Mark Haines2015-08-1327-301/+401
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | markjh/end-to-end-key-federation
| | * | | | | | Merge branch 'develop' into erikj/reactor_metricsMark Haines2015-08-131-1/+0
| | |\ \ \ \ \ \
| * | | | | | | | Add a few strategic new lines to break up the on_query_client_keys and ↵Mark Haines2015-08-131-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on_claim_client_keys methods in federation_server.py
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | / / / | | |_|_|_|/ / / | |/| | | | | | Simplify LoginHander and AuthHandler
| * | | | | | | Merge password checking implementationsDaniel Wagner-Hall2015-08-121-20/+15
| | | | | | | |
| * | | | | | | Merge branch 'develop' into authDaniel Wagner-Hall2015-08-121-45/+36
| |\ \ \ \ \ \ \
| * | | | | | | | Simplify LoginHander and AuthHandlerDaniel Wagner-Hall2015-08-129-131/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Merge LoginHandler -> AuthHandler * Add a bunch of documentation * Improve some naming * Remove unused branches I will start merging the actual logic of the two handlers shortly
* | | | | | | | | Remove pointless mapErik Johnston2015-08-131-7/+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 ↵Erik Johnston2015-08-131-1/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | erikj/dictionary_cache
| * | | | | | | 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-133-54/+57
|\| | | | | | |
| * | | | | | | Add some metrics about the reactorErik Johnston2015-08-131-0/+29
| |/ / / / / /
| * | | | | | Depend on Twisted>=15.1 rather than pining to a particular versionMark Haines2015-08-121-1/+1
| | | | | | |
| * | | | | | Merge branch 'develop' into markjh/twisted-15Mark Haines2015-08-1279-1560/+4136
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | Conflicts: synapse/http/matrixfederationclient.py
| * | | | | | Merge branch 'develop' into markjh/twisted-15Mark Haines2015-06-0110-21/+51
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/python_dependencies.py
| * | | | | | | Use Twisted-15.2.1, Use Agent.usingEndpointFactory rather than implement our ↵Mark Haines2015-06-012-51/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | own Agent
* | | | | | | | 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
| | | | | | | |
* | | | | | | | Use list comprehension instead of filterErik Johnston2015-08-122-20/+6
| | | | | | | |
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-08-123-61/+57
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | erikj/dictionary_cache
| * | | | | | | Merge pull request #220 from matrix-org/markjh/generate_keysErik Johnston2015-08-121-45/+36
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | Fix the --generate-keys option.
| | * | | | | | Fix the --generate-keys option. Make it do the same thing as ↵Mark Haines2015-08-121-45/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --generate-config does when the config file exists, but without printing a warning
| * | | | | | | Add missing space because linterDaniel Wagner-Hall2015-08-111-1/+1
| | | | | | | |
| * | | | | | | Minor docs cleanupDaniel Wagner-Hall2015-08-112-3/+9
| | | | | | | |
| * | | | | | | Remove redundant if-guardDaniel Wagner-Hall2015-08-111-13/+12
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | The startswith("@") does the job
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-08-121-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/dictionary_cache
| * | | | | | Use TypeError instead of ValueError and give a nicer error mesasgeMark Haines2015-08-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | when someone calls Cache.invalidate with the wrong type.
| * | | | | | Merge pull request #215 from matrix-org/erikj/cache_varargs_interfaceErik Johnston2015-08-1011-66/+67
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Change Cache to not use *args in its interface
* | | | | | | | Wire up the dictionarycache to the metricsErik Johnston2015-08-123-45/+41
| | | | | | | |
* | | | | | | | Move all the caches into their own package, synapse.util.cachesErik Johnston2015-08-1120-347/+405
| | | | | | | |
* | | | | | | | CommentsErik Johnston2015-08-112-3/+13
| | | | | | | |
* | | | | | | | CommentErik Johnston2015-08-111-0/+2
| | | | | | | |
* | | | | | | | DocsErik Johnston2015-08-111-0/+9
| | | | | | | |
* | | | | | | | Remove debug loggersErik Johnston2015-08-112-6/+0
| | | | | | | |
* | | | | | | | Fix application of ACLsErik Johnston2015-08-114-17/+33
| | | | | | | |
* | | | | | | | Fix state cacheErik Johnston2015-08-111-36/+49
| | | | | | | |
* | | | | | | | Clean up StateStoreErik Johnston2015-08-101-62/+11
| | | | | | | |
* | | | | | | | Remove unused functionErik Johnston2015-08-101-7/+0
| | | | | | | |
* | | | | | | | CommentsErik Johnston2015-08-101-0/+6
| | | | | | | |
* | | | | | | | CommentsErik Johnston2015-08-101-0/+3
| | | | | | | |
* | | | | | | | Merge branch 'erikj/cache_varargs_interface' of ↵Erik Johnston2015-08-101-5/+5
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | github.com:matrix-org/synapse into erikj/dictionary_cache
| * | | | | | | Rename keyargs to args in CacheDescriptorErik Johnston2015-08-101-5/+5
| | | | | | | |
* | | | | | | | Merge branch 'erikj/cache_varargs_interface' of ↵Erik Johnston2015-08-101-9/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:matrix-org/synapse into erikj/dictionary_cache
| * | | | | | | Rename keyargs to args in CacheErik Johnston2015-08-101-9/+9
| | | | | | | |
* | | | | | | | Do bounds checkErik Johnston2015-08-101-1/+4
| | | | | | | |
* | | | | | | | Line lengthErik Johnston2015-08-101-1/+2
| | | | | | | |
* | | | | | | | Merge branch 'erikj/cache_varargs_interface' of ↵Erik Johnston2015-08-071-1/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:matrix-org/synapse into erikj/dictionary_cache
| * | | | | | | Merge branch 'erikj/cache_deferreds' of github.com:matrix-org/synapse into ↵Erik Johnston2015-08-071-3/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/cache_varargs_interface
| * \ \ \ \ \ \ \ Merge branch 'erikj/cache_deferreds' of github.com:matrix-org/synapse into ↵Erik Johnston2015-08-071-3/+4
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/cache_varargs_interface
| * | | | | | | | | Remove unnecessary cacheErik Johnston2015-08-071-2/+1
| | | | | | | | | |
| * | | | | | | | | Change Cache to not use *args in its interfaceErik Johnston2015-08-0710-61/+63
| | | | | | | | | |
* | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-08-075-4/+27
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | erikj/dictionary_cache
| * | | | | | | | | Merge pull request #212 from matrix-org/erikj/cache_deferredsErik Johnston2015-08-072-15/+40
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | Make CacheDescriptor cache deferreds rather than the deferreds' values
| | * | | | | | | | s/observed/observer/Erik Johnston2015-08-071-3/+3
| | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Propogate stale cache errors to calling functionsErik Johnston2015-08-071-3/+4
| | |/ / / / / /
| * | | | | | | Don't complain about extra .pyc files we find while hunting for database schemasPaul "LeoNerd" Evans2015-08-071-0/+5
| | | | | | | |
| * | | | | | | Add a --generate-keys optionPaul "LeoNerd" Evans2015-08-071-0/+9
| | | | | | | |
| * | | | | | | Only print the pidfile path on startup if requested by a commandline flagPaul "LeoNerd" Evans2015-08-072-1/+9
| | | | | | | |
* | | | | | | | Batch up various DB requests for event -> stateErik Johnston2015-08-071-77/+142
| | | | | | | |
* | | | | | | | Implement a CacheListDescriptorErik Johnston2015-08-071-0/+106
| | | | | | | |
* | | | | | | | Don't be too enthusiatic with defer.gatherResultsErik Johnston2015-08-071-4/+8
| | | | | | | |
* | | | | | | | Cache get_recent_events_for_roomErik Johnston2015-08-071-2/+2
| | | | | | | |
* | | | | | | | Remove unncessary cacheErik Johnston2015-08-071-1/+0
| | | | | | | |
* | | | | | | | Change Cache to not use *args in its interfaceErik Johnston2015-08-0710-81/+67
| | | | | | | |
* | | | | | | | Store absence of state in cacheErik Johnston2015-08-071-6/+16
| | | | | | | |
* | | | | | | | Merge branch 'erikj/cache_deferreds' into erikj/dictionary_cacheErik Johnston2015-08-061-3/+27
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | DocsErik Johnston2015-08-061-0/+3
| | | | | | | |
| * | | | | | | Remove failed deferreds from cacheErik Johnston2015-08-061-1/+7
| | | | | | | |
| * | | | | | | Re-implement DEBUG_CACHES flagErik Johnston2015-08-061-2/+17
| | | | | | | |
* | | | | | | | Merge branch 'erikj/cache_deferreds' into erikj/dictionary_cacheErik Johnston2015-08-062-15/+15
|\| | | | | | |
| * | | | | | | Merge branch 'erikj/cached_keyword_args' into erikj/cache_deferredsErik Johnston2015-08-066-95/+124
| |\| | | | | |
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-08-066-95/+124
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/cached_keyword_args
| * | | | | | | | Make @cached cache deferreds rather than the deferreds' valuesErik Johnston2015-08-062-15/+15
| |/ / / / / / /
* | | | | | | | Merge branch 'erikj/cached_keyword_args' of github.com:matrix-org/synapse ↵Erik Johnston2015-08-056-23/+45
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into erikj/dictionary_cache
| * | | | | | | Add support for using keyword arguments with cached functionsErik Johnston2015-07-276-23/+45
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-08-052-5/+5
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | erikj/dictionary_cache
| * | | | | | Up the cache size for 'get_joined_hosts_for_room' and 'get_users_in_room'Erik Johnston2015-08-051-2/+2
| | | | | | |
| * | | | | | Use LRU cache by defaultErik Johnston2015-08-051-3/+3
| | |_|_|_|/ | |/| | | |
* | | | | | Use dictionary cache to do group -> state fetchingErik Johnston2015-08-056-109/+194
| | | | | |
* | | | | | Move DictionaryCacheErik Johnston2015-08-041-0/+0
| | | | | |
* | | | | | Add basic dictionary cacheErik Johnston2015-08-041-0/+94
| | | | | |
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/acl_perfErik Johnston2015-08-042-2/+3
|\| | | | |
| * | | | | Don't try & check the username if we don't have one (which we won't if it's ↵David Baker2015-08-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | been saved in the auth layer)
| * | | | | Add vector.im as trusted ID serverDavid Baker2015-08-031-1/+1
| | | | | |
* | | | | | Add commentErik Johnston2015-08-041-0/+15
| | | | | |
* | | | | | Speed up event filtering (for ACL) logicErik Johnston2015-08-045-43/+102
|/ / / / /
* | | | | Use the same reg paths as register v1 for ASes.Kegan Dougal2015-07-291-4/+6
| | | | | | | | | | | | | | | | | | | | Namely this means using registration_handler.appservice_register.
* | | | | Fix v2_alpha registration. Add unit tests.Kegan Dougal2015-07-282-55/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | V2 Registration forced everyone (including ASes) to create a password for a user, when ASes should be able to omit passwords. Also unbreak AS registration in general which checked too early if the given username was claimed by an AS; it was checked before knowing if the AS was the one doing the registration! Add unit tests for AS reg, user reg and disabled_registration flag.
* | | | | Generate local thumbnails on a threadErik Johnston2015-07-231-34/+43
|/ / / /
* | | / Pick larger than desired thumbnail for 'crop'Erik Johnston2015-07-231-1/+2
| |_|/ |/| |
* | | Disable receipts for nowMatrix2015-07-221-0/+2
| | |
* | | Query for all the ones we were asked about, not just the last...David Baker2015-07-211-1/+1
| | |
* | | Dodesn't seem to make any difference: guess it does work with the object ↵David Baker2015-07-211-1/+0
| | | | | | | | | | | | reference
* | | I think this was what was intended...David Baker2015-07-211-0/+1
| | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-16 23:21:50 +0000