summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* Bump version/changelog v0.10.0-r1Erik Johnston2015-09-082-1/+6
|
* Merge pull request #269 from matrix-org/markjh/upgrading_setuptoolsMark Haines2015-09-071-0/+6
|\ | | | | Add instructions for upgrading setuptools for when people encounter a…
| * Add instructions for upgrading setuptools for when people encounter a ↵Mark Haines2015-09-071-0/+6
|/ | | | message "mock requires setuptools>=17.1"
* 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
| |
| * Merge pull request #261 from matrix-org/erikj/scripts_cleanErik Johnston2015-09-016-380/+6
| |\ | | | | | | Clean up scripts/
| | * Remove spurious .py from docsErik Johnston2015-09-011-1/+1
| | |
| | * Actually add config pathErik Johnston2015-08-281-0/+2
| | |
| | * Clean up scripts/Erik Johnston2015-08-275-380/+4
| | |
| * | Lower size of 'stateGroupCache' now that we have data from matrix.org to ↵Erik Johnston2015-09-011-1/+1
| |/ | | | | | | support doing so
| * Bump version and changelog v0.10.0-rc5Erik Johnston2015-08-272-1/+6
| |
| * Merge pull request #260 from matrix-org/erikj/filename_orderErik Johnston2015-08-271-8/+14
| |\ | | | | | | Check for an internationalised filename first
| | * ConsistencyErik Johnston2015-08-271-3/+3
| | |
| | * Check for an internationalised filename firstErik Johnston2015-08-271-8/+14
| |/
| * None check the correct variableErik Johnston2015-08-271-2/+3
| |
| * Check for NoneErik Johnston2015-08-271-1/+1
| |
| * Bump changelog and version v0.10.0-rc4Erik Johnston2015-08-272-4/+11
| |
| * Merge pull request #259 from matrix-org/markjh/unicode_content_dispositionErik Johnston2015-08-273-12/+43
| |\ | | | | | | Support unicode attachment filenames
| | * Give a sensible error message if the filename is invalid UTF-8Mark Haines2015-08-262-2/+8
| | |
| | * Handle unicode filenames given when downloading or received over federationMark Haines2015-08-261-5/+21
| | |
| | * Allow non-ascii filenames for attachmentsMark Haines2015-08-263-8/+17
| |/
| * Merge pull request #252 from matrix-org/erikj/typing_loopErik Johnston2015-08-261-9/+5
| |\ | | | | | | Don't loop over all rooms ever in typing.get_new_events_for_user
| | * Remove needless existence checksErik Johnston2015-08-261-7/+3
| | |
| | * Don't loop over all rooms ever in typing.get_new_events_for_userErik Johnston2015-08-261-2/+2
| |/
| * Bump changelog and version v0.10.0-rc3Erik Johnston2015-08-252-1/+18
| |
| * Merge pull request #250 from matrix-org/erikj/generated_directoryErik Johnston2015-08-251-2/+15
| |\ | | | | | | Add config option to specify where generated files should be dumped
| | * Update config docErik Johnston2015-08-251-1/+2
| | |
| | * s/--generated-directory/--keys-directory/Erik Johnston2015-08-251-7/+7
| | |
| | * Add config option to specify where generated files should be dumpedErik Johnston2015-08-251-2/+14
| | |
| * | Merge pull request #249 from matrix-org/erikj/allow_config_path_dirsErik Johnston2015-08-251-6/+34
| |\ \ | | | | | | | | Allow specifying directories as config paths
| | * | Warn if we encounter unexpected files in config directoriesErik Johnston2015-08-251-7/+17
| | |/
| | * Allow specifying directories as config filesErik Johnston2015-08-251-6/+24
| |/
| * Merge pull request #245 from matrix-org/erikj/configurable_client_locationErik Johnston2015-08-253-14/+30
| |\ | | | | | | Allow specifying a directory to host a web client from
| | * Print the correct pip install line when failing due to lack of ↵Erik Johnston2015-08-252-8/+9
| | | | | | | | | | | | matrix-angular-sdk
| | * Update the log messageErik Johnston2015-08-251-5/+10
| | |
| | * Revert previous commit. Instead, always download matrix-angular-sdk as a ↵Erik Johnston2015-08-251-3/+7
| | | | | | | | | | | | requirement, but don't complain (when we do check_requirements) if we don't have it when we start synapse.
| | * Remove dependency on matrix-angular-sdkErik Johnston2015-08-252-6/+9
| | |
| | * Allow specifying a directory to host a web client fromErik Johnston2015-08-252-3/+6
| | |
| * | Merge pull request #246 from matrix-org/erikj/config_helper_functionErik Johnston2015-08-251-0/+30
| |\ \ | | |/ | |/| Add utility to parse config and print out a key
| | * Fix typo when using sys.stderr.writeErik Johnston2015-08-251-1/+1
| | |
| | * Add utility to parse config and print out a keyErik Johnston2015-08-251-0/+30
| |/ | | | | | | | | | | | | | | | | Usage: ``` $ python -m synapse.config read server_name -c homeserver.yaml localhost ```
| * Bump version and changelog v0.10.0-rc2Erik Johnston2015-08-242-1/+11
| |
| * Do auth checks *before* persisting the eventErik Johnston2015-08-241-16/+16
| |
| * Merge pull request #242 from matrix-org/erikj/pushers_ephemeral_eventsErik Johnston2015-08-243-6/+19
| |\ | | | | | | Don't make pushers handle presence/typing events
| | * Don't make pushers handle presence/typing eventsErik Johnston2015-08-243-6/+19
| |/
| * Don't insert events into 'event_*_extremeties' tables if they're outliersErik Johnston2015-08-231-2/+8
| |
| * Actually check if event_id isn't returned by _get_state_groupsErik Johnston2015-08-211-2/+9
| |
| * Upate changelog v0.10.0-rc1Erik Johnston2015-08-211-1/+1
| |
| * Upate changelogErik Johnston2015-08-211-0/+3
| |
| * Merge branch 'erikj/user_dedup' into release-v0.10.0Erik Johnston2015-08-214-12/+48
| |\
| | * 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
| * 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
| |
| * Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.10.0Erik Johnston2015-08-204-4/+6
| |\
| | * 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
| |\ \ | | | | | | | | Clean up some of restructured text formatting in the README.rst
| | * | 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
| |\ \ \ | | | | | | | | | | Add generic update instructions to UPGRADE.rst
| | * | | 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
| | |/ / | | | | | | | | | | | | README.rst
| * / / 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.
| | | * Add m.room.avatar to default power levels. Change default required power ↵Erik Johnston2015-08-202-2/+4
| | |/ | |/| | | | | | | levels of such events to 50
| | * Merge pull request #238 from matrix-org/fix_set_passwordErik Johnston2015-08-202-2/+2
| |/| | | | | | | Fix set password
| | * 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-1334-368/+613
| | |\ \ | | | | | | | | | | | | | | | 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
| | | |_|/ | | |/| |
| * | | | Merge pull request #234 from matrix-org/email_loginDavid Baker2015-08-201-5/+12
| |\ \ \ \ | | | | | | | | | | | | Support logging in with email addresses (or other threepids)
| | * | | | 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
| |\ \ \ \ \ | | | | | | | | | | | | | | 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
| | | | | | |
| * | | | | | 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_users
| | * | | | | 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-133-51/+18
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1335-369/+615
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | markjh/end-to-end-key-federation
| | * | | | | | | | 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-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 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
| | * | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | Dictionary and list caches
| | * | | | | | | | | | Remove pointless mapErik Johnston2015-08-131-7/+3
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-08-131-0/+3
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | erikj/dictionary_cache
| * | | | | | | | | | | Merge pull request #224 from matrix-org/erikj/reactor_metricsErik Johnston2015-08-131-0/+29
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | Add some metrics about the reactor
| | * | | | | | | | | | 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 ↵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-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
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Update to Twisted-15.2.1.
| | * | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/http/matrixfederationclient.py
| | * | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | Merge pull request #223 from matrix-org/markjh/enable_demo_registrationErik Johnston2015-08-121-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | enable registration in the demo servers
| | * | | | | | | | | | 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
| | | | | | | | | | |
| | | | * | | | | | | 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
| * | | | | | | | | | | Merge pull request #216 from matrix-org/authDaniel Wagner-Hall2015-08-122-16/+21
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | | Clean up some docs and redundant fluff
| | * | | | | | | | | | 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-124-13/+18
| | | | | | |\ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | erikj/dictionary_cache
| * | | | | | | | | | Merge pull request #182 from ↵Mark Haines2015-08-122-10/+13
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/manu/fix_no_rate_limit_in_federation_demo Federation demo start.sh: Fixed --no-rate-limit param in the script
| | * | | | | | | | | Fix the cleanup script to use the right $DIRMark Haines2015-08-121-2/+2
| | | | | | | | | | |
| | * | | | | | | | | Federation demo start.sh: Fixed --no-rate-limit param in the scriptmanuroe2015-06-042-10/+13
| | | | | | | | | | |
| * | | | | | | | | | Merge pull request #218 from matrix-org/mockfixErik Johnston2015-08-111-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | Remove call to "recently" removed function in mock
| | * | | | | | | | | Remove call to recently removed function in mockDaniel Wagner-Hall2015-08-111-2/+2
| |/ / / / / / / / /
| * | | | | | | | | 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.
| | | | | * | | | | 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-1123-352/+408
| | | | | | | | | |
| | | | | * | | | | 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 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-08-100-0/+0
| | | | | |\ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | erikj/dictionary_cache
| * | | | | | | | | Merge pull request #215 from matrix-org/erikj/cache_varargs_interfaceErik Johnston2015-08-1012-72/+73
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Change Cache to not use *args in its interface
| | | | | | * \ \ \ \ 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-0711-67/+69
| | | | | | | | | | | | |
| | | | | | | | * | | | | 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-073-19/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | 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
| | |/ / / / / / / / /
| * | | | | | | | | | Merge pull request #213 from matrix-org/paul/SYN-420Paul Evans2015-08-074-1/+23
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Three small improvements to help debian package (SYN-420)
| | * | | | | | | | | | 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
| |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #209 from matrix-org/erikj/cached_keyword_argsErik Johnston2015-08-066-23/+45
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add support for using keyword arguments with cached functions
| | | | | | | * | | | | 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-0711-87/+73
| | | | | | | | | | | |
| | | | | | | * | | | | 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-063-19/+22
| | | | | | | |\ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge branch 'erikj/cached_keyword_args' into erikj/cache_deferredsErik Johnston2015-08-068-140/+305
| | | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-08-068-140/+305
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | erikj/cached_keyword_args
| | | * | | | | | | | | Make @cached cache deferreds rather than the deferreds' valuesErik Johnston2015-08-063-19/+22
| | |/ / / / / / / / /
| | | | | | * | | | | 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-057-110/+195
| | | | | | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-26 14:08:07 +0000