Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add m.room.avatar to default power levels. Change default required power ↵ | Erik Johnston | 2015-08-20 | 2 | -2/+4 |
| | | | | levels of such events to 50 | ||||
* | Merge pull request #231 from matrix-org/erikj/pushers_store_last_token | Erik Johnston | 2015-08-20 | 1 | -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 events | Erik Johnston | 2015-08-19 | 1 | -0/+6 |
| | | |||||
| * | Block on storing the current last_tokens | Erik Johnston | 2015-08-19 | 1 | -5/+5 |
| | | |||||
* | | Merge pull request #206 from matrix-org/erikj/generate_presice_thumbnails | Mark Haines | 2015-08-20 | 3 | -21/+226 |
|\ \ | | | | | | | Always return a thumbnail of the requested size. | ||||
| * | | Fix flake8 warning | Mark Haines | 2015-08-13 | 1 | -0/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/develop' into ↵ | Mark Haines | 2015-08-13 | 26 | -300/+399 |
| |\ \ | | | | | | | | | | | | | erikj/generate_presice_thumbnails | ||||
| * | | | Doc-string for config ultility function | Mark Haines | 2015-08-12 | 1 | -0/+11 |
| | | | | |||||
| * | | | Add config option for setting the list of thumbnail sizes to precalculate | Mark Haines | 2015-08-12 | 2 | -16/+41 |
| | | | | |||||
| * | | | Make a config option for whether to generate new thumbnail sizes dynamically | Mark Haines | 2015-08-12 | 3 | -7/+27 |
| | | | | |||||
| * | | | Factor out thumbnail() | Erik Johnston | 2015-07-23 | 1 | -56/+40 |
| | | | | |||||
| * | | | Fix remote thumbnailing | Erik Johnston | 2015-07-23 | 2 | -7/+11 |
| | | | | |||||
| * | | | Always return a thumbnail of the requested size. | Erik Johnston | 2015-07-23 | 2 | -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_alias | Erik Johnston | 2015-08-20 | 3 | -1/+19 |
|\ \ \ \ | | | | | | | | | | | Add server side support for canonical aliases | ||||
| * | | | | Check that the canonical room alias actually points to the room | Erik Johnston | 2015-08-20 | 1 | -1/+17 |
| | | | | | |||||
| * | | | | Add canonical alias to the default power levels | Erik Johnston | 2015-08-19 | 2 | -0/+2 |
| | |_|/ | |/| | | |||||
* | | | | Comma comma comma comma comma chameleon | David Baker | 2015-08-20 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'develop' into email_login | David Baker | 2015-08-20 | 51 | -679/+1615 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #211 from matrix-org/email_in_use | Mark Haines | 2015-08-20 | 4 | -0/+73 |
| |\ \ \ \ | | | | | | | | | | | | | Changes for unique emails | ||||
| | * | | | | Check absent before trying to access keys | David Baker | 2015-08-12 | 1 | -3/+3 |
| | | | | | | |||||
| | * | | | | Just leaving off the $ is fine. r* == registerrrrrrrrr | David Baker | 2015-08-12 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Don't get apservice interested rooms in RoomHandler.get_joined_rooms_for_users | Erik Johnston | 2015-08-19 | 3 | -12/+32 |
| | |/ / / | |/| | | | |||||
| * | | | | Remove an access token log line | Erik Johnston | 2015-08-19 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix regression where we incorrectly responded with a 200 to /login | Erik Johnston | 2015-08-19 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Merge pull request #228 from matrix-org/erikj/_get_state_for_groups | Erik Johnston | 2015-08-18 | 1 | -2/+5 |
| |\ \ \ \ | | | | | | | | | | | | | Ensure we never return a None event from _get_state_for_groups | ||||
| | * | | | | Remove newline because vertical whitespace makes mjark sad | Erik Johnston | 2015-08-18 | 1 | -2/+1 |
| | | | | | | |||||
| | * | | | | Rejig the code to make it nicer | Erik Johnston | 2015-08-18 | 1 | -3/+2 |
| | | | | | | |||||
| | * | | | | Ensure we never return a None event from _get_state_for_groups | Erik Johnston | 2015-08-18 | 1 | -3/+8 |
| | | | | | | |||||
| * | | | | | Merge pull request #230 from matrix-org/erikj/appservice_auth_entity | Erik Johnston | 2015-08-18 | 1 | -0/+3 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Set request.authenticated_entity for application services | ||||
| | * | | | | | Set request.authenticated_entity for application services | Erik Johnston | 2015-08-18 | 1 | -0/+3 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #227 from matrix-org/erikj/receipts_take2 | Erik Johnston | 2015-08-18 | 4 | -17/+91 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Re-enable receipts API. | ||||
| | * | | | | | Rename unhelpful variable name | Erik Johnston | 2015-08-18 | 1 | -7/+2 |
| | | | | | | | |||||
| | * | | | | | Comments | Erik Johnston | 2015-08-18 | 1 | -4/+14 |
| | | | | | | | |||||
| | * | | | | | Add index receipts_linearized_room_stream | Erik Johnston | 2015-08-17 | 2 | -1/+19 |
| | | | | | | | |||||
| | * | | | | | Remove unused import | Erik Johnston | 2015-08-17 | 1 | -2/+0 |
| | | | | | | | |||||
| | * | | | | | Remove added unused methods | Erik Johnston | 2015-08-17 | 1 | -7/+0 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-08-17 | 10 | -147/+105 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | erikj/receipts_take2 | ||||
| | * | | | | | | Batch _get_linearized_receipts_for_rooms | Erik Johnston | 2015-08-14 | 1 | -15/+64 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-08-13 | 2 | -51/+15 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/receipts_take2 | ||||
| | * | | | | | | | Add metrics to the receipts cache | Erik Johnston | 2015-08-13 | 2 | -0/+13 |
| | | | | | | | | | |||||
| | * | | | | | | | Re-enable receipts | Erik Johnston | 2015-08-13 | 1 | -2/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #225 from matrix-org/erikj/reactor_metrics | Erik Johnston | 2015-08-18 | 1 | -3/+25 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix pending_calls metric to not lie | ||||
| | * | | | | | | | | Also check for presence of 'threadCallQueue' in reactor | Erik Johnston | 2015-08-18 | 1 | -1/+8 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Use more helpful variable names | Erik Johnston | 2015-08-18 | 1 | -3/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fix pending_calls metric to not lie | Erik Johnston | 2015-08-14 | 1 | -3/+18 |
| | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| * | | | | | | | | Bump size of get_presence_state cache | Erik Johnston | 2015-08-18 | 1 | -1/+1 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | Typo | Erik Johnston | 2015-08-18 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | None check | Erik Johnston | 2015-08-18 | 1 | -0/+2 |
| | | | | | | | | |||||
| * | | | | | | | Don't assume @cachedList function returns keys for everything | Erik Johnston | 2015-08-18 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Reduce cache size from obscenely large to quite large | Erik Johnston | 2015-08-18 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #226 from matrix-org/erikj/room_presence | Erik Johnston | 2015-08-18 | 3 | -15/+122 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add and use cached batched storage.get_state function. | ||||
| | * | | | | | | | More helpful variable names | Erik Johnston | 2015-08-18 | 1 | -7/+7 |
| | | | | | | | | | |||||
| | * | | | | | | | Doc strings | Erik Johnston | 2015-08-18 | 1 | -0/+28 |
| | | | | | | | | | |||||
| | * | | | | | | | Remove debug try/catch | Erik Johnston | 2015-08-18 | 1 | -47/+43 |
| | | | | | | | | | |||||
| | * | | | | | | | Remember to invalidate caches | Erik Johnston | 2015-08-17 | 1 | -2/+8 |
| | | | | | | | | | |||||
| | * | | | | | | | Implement a batched presence_handler.get_state and use it | Erik Johnston | 2015-08-17 | 3 | -14/+73 |
| | | | | | | | | | |||||
| | * | | | | | | | Add batched version of store.get_presence_state | Erik Johnston | 2015-08-17 | 1 | -1/+19 |
| | | |_|_|/ / / | | |/| | | | | | |||||
| * | | | | | | | Merge pull request #208 from matrix-org/markjh/end-to-end-key-federation | Mark Haines | 2015-08-18 | 5 | -30/+233 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | Federation for end-to-end key requests. | ||||
| | * | | | | | | Merge remote-tracking branch 'origin/develop' into ↵ | Mark Haines | 2015-08-13 | 27 | -301/+401 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | markjh/end-to-end-key-federation | ||||
| | | * | | | | | Merge branch 'develop' into erikj/reactor_metrics | Mark Haines | 2015-08-13 | 1 | -1/+0 |
| | | |\ \ \ \ \ | |||||
| | * | | | | | | | Add a few strategic new lines to break up the on_query_client_keys and ↵ | Mark Haines | 2015-08-13 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on_claim_client_keys methods in federation_server.py | ||||
| | * | | | | | | | Get the end-to-end key federation working | Mark Haines | 2015-07-24 | 4 | -21/+17 |
| | | | | | | | | | |||||
| | * | | | | | | | Add federation support for end-to-end key requests | Mark Haines | 2015-07-23 | 5 | -30/+231 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix bug where we were leaking None into state event lists | Erik Johnston | 2015-08-17 | 1 | -2/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #221 from matrix-org/auth | Daniel Wagner-Hall | 2015-08-14 | 9 | -145/+102 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | Simplify LoginHander and AuthHandler | ||||
| | * | | | | | | | Merge password checking implementations | Daniel Wagner-Hall | 2015-08-12 | 1 | -20/+15 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'develop' into auth | Daniel Wagner-Hall | 2015-08-12 | 1 | -45/+36 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Simplify LoginHander and AuthHandler | Daniel Wagner-Hall | 2015-08-12 | 9 | -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 map | Erik Johnston | 2015-08-13 | 1 | -7/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Remove some vertical space | Erik Johnston | 2015-08-13 | 1 | -36/+9 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Replace list comprehension | Erik Johnston | 2015-08-13 | 1 | -8/+3 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-08-13 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | erikj/dictionary_cache | ||||
| | * | | | | | | | PEP8 | Erik Johnston | 2015-08-13 | 1 | -1/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'erikj/reactor_metrics' into erikj/dictionary_cache | Erik Johnston | 2015-08-13 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | |||||
| | * | | | | | | | Don't time getDelayedCalls | Erik Johnston | 2015-08-13 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'erikj/reactor_metrics' into erikj/dictionary_cache | Erik Johnston | 2015-08-13 | 3 | -54/+57 |
| |\| | | | | | | | |||||
| | * | | | | | | | Add some metrics about the reactor | Erik Johnston | 2015-08-13 | 1 | -0/+29 |
| | |/ / / / / / | |||||
| | * | | | | | | Depend on Twisted>=15.1 rather than pining to a particular version | Mark Haines | 2015-08-12 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'develop' into markjh/twisted-15 | Mark Haines | 2015-08-12 | 79 | -1560/+4136 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/http/matrixfederationclient.py | ||||
| | * | | | | | | Merge branch 'develop' into markjh/twisted-15 | Mark Haines | 2015-06-01 | 10 | -21/+51 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/python_dependencies.py | ||||
| | * | | | | | | | Use Twisted-15.2.1, Use Agent.usingEndpointFactory rather than implement our ↵ | Mark Haines | 2015-06-01 | 2 | -51/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | own Agent | ||||
| * | | | | | | | | Comment | Erik Johnston | 2015-08-12 | 1 | -1/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Explain why we're prefilling dict with Nones | Erik Johnston | 2015-08-12 | 1 | -0/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Better variable name | Erik Johnston | 2015-08-12 | 1 | -5/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | Split _get_state_for_group_from_cache into two | Erik Johnston | 2015-08-12 | 1 | -32/+53 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix _filter_events_for_client | Erik Johnston | 2015-08-12 | 2 | -6/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Docstring | Erik Johnston | 2015-08-12 | 1 | -0/+27 |
| | | | | | | | | | |||||
| * | | | | | | | | Simplify staggered deferred lists | Erik Johnston | 2015-08-12 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Use list comprehension instead of filter | Erik Johnston | 2015-08-12 | 2 | -20/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-08-12 | 3 | -61/+57 |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | erikj/dictionary_cache | ||||
| | * | | | | | | | Merge pull request #220 from matrix-org/markjh/generate_keys | Erik Johnston | 2015-08-12 | 1 | -45/+36 |
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | Fix the --generate-keys option. | ||||
| | | * | | | | | | Fix the --generate-keys option. Make it do the same thing as ↵ | Mark Haines | 2015-08-12 | 1 | -45/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --generate-config does when the config file exists, but without printing a warning | ||||
| | * | | | | | | | Add missing space because linter | Daniel Wagner-Hall | 2015-08-11 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Minor docs cleanup | Daniel Wagner-Hall | 2015-08-11 | 2 | -3/+9 |
| | | | | | | | | | |||||
| | * | | | | | | | Remove redundant if-guard | Daniel Wagner-Hall | 2015-08-11 | 1 | -13/+12 |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | The startswith("@") does the job | ||||
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-08-12 | 1 | -1/+3 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/dictionary_cache | ||||
| | * | | | | | | Use TypeError instead of ValueError and give a nicer error mesasge | Mark Haines | 2015-08-10 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when someone calls Cache.invalidate with the wrong type. | ||||
| | * | | | | | | Merge pull request #215 from matrix-org/erikj/cache_varargs_interface | Erik Johnston | 2015-08-10 | 11 | -66/+67 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Change Cache to not use *args in its interface | ||||
| * | | | | | | | | Wire up the dictionarycache to the metrics | Erik Johnston | 2015-08-12 | 3 | -45/+41 |
| | | | | | | | | | |||||
| * | | | | | | | | Move all the caches into their own package, synapse.util.caches | Erik Johnston | 2015-08-11 | 20 | -347/+405 |
| | | | | | | | | | |||||
| * | | | | | | | | Comments | Erik Johnston | 2015-08-11 | 2 | -3/+13 |
| | | | | | | | | | |||||
| * | | | | | | | | Comment | Erik Johnston | 2015-08-11 | 1 | -0/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Docs | Erik Johnston | 2015-08-11 | 1 | -0/+9 |
| | | | | | | | | | |||||
| * | | | | | | | | Remove debug loggers | Erik Johnston | 2015-08-11 | 2 | -6/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix application of ACLs | Erik Johnston | 2015-08-11 | 4 | -17/+33 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix state cache | Erik Johnston | 2015-08-11 | 1 | -36/+49 |
| | | | | | | | | | |||||
| * | | | | | | | | Clean up StateStore | Erik Johnston | 2015-08-10 | 1 | -62/+11 |
| | | | | | | | | | |||||
| * | | | | | | | | Remove unused function | Erik Johnston | 2015-08-10 | 1 | -7/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | Comments | Erik Johnston | 2015-08-10 | 1 | -0/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | Comments | Erik Johnston | 2015-08-10 | 1 | -0/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'erikj/cache_varargs_interface' of ↵ | Erik Johnston | 2015-08-10 | 1 | -5/+5 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | github.com:matrix-org/synapse into erikj/dictionary_cache | ||||
| | * | | | | | | | Rename keyargs to args in CacheDescriptor | Erik Johnston | 2015-08-10 | 1 | -5/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'erikj/cache_varargs_interface' of ↵ | Erik Johnston | 2015-08-10 | 1 | -9/+9 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:matrix-org/synapse into erikj/dictionary_cache | ||||
| | * | | | | | | | Rename keyargs to args in Cache | Erik Johnston | 2015-08-10 | 1 | -9/+9 |
| | | | | | | | | | |||||
| * | | | | | | | | Do bounds check | Erik Johnston | 2015-08-10 | 1 | -1/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Line length | Erik Johnston | 2015-08-10 | 1 | -1/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'erikj/cache_varargs_interface' of ↵ | Erik Johnston | 2015-08-07 | 1 | -1/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:matrix-org/synapse into erikj/dictionary_cache | ||||
| | * | | | | | | | Merge branch 'erikj/cache_deferreds' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-08-07 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/cache_varargs_interface | ||||
| | * \ \ \ \ \ \ \ | Merge branch 'erikj/cache_deferreds' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-08-07 | 1 | -3/+4 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/cache_varargs_interface | ||||
| | * | | | | | | | | | Remove unnecessary cache | Erik Johnston | 2015-08-07 | 1 | -2/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Change Cache to not use *args in its interface | Erik Johnston | 2015-08-07 | 10 | -61/+63 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-08-07 | 5 | -4/+27 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | erikj/dictionary_cache | ||||
| | * | | | | | | | | | Merge pull request #212 from matrix-org/erikj/cache_deferreds | Erik Johnston | 2015-08-07 | 2 | -15/+40 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | | | Make CacheDescriptor cache deferreds rather than the deferreds' values | ||||
| | | * | | | | | | | | s/observed/observer/ | Erik Johnston | 2015-08-07 | 1 | -3/+3 |
| | | | |/ / / / / / | | | |/| | | | | | | |||||
| | | * | | | | | | | Propogate stale cache errors to calling functions | Erik Johnston | 2015-08-07 | 1 | -3/+4 |
| | | |/ / / / / / | |||||
| | * | | | | | | | Don't complain about extra .pyc files we find while hunting for database schemas | Paul "LeoNerd" Evans | 2015-08-07 | 1 | -0/+5 |
| | | | | | | | | | |||||
| | * | | | | | | | Add a --generate-keys option | Paul "LeoNerd" Evans | 2015-08-07 | 1 | -0/+9 |
| | | | | | | | | | |||||
| | * | | | | | | | Only print the pidfile path on startup if requested by a commandline flag | Paul "LeoNerd" Evans | 2015-08-07 | 2 | -1/+9 |
| | | | | | | | | | |||||
| * | | | | | | | | Batch up various DB requests for event -> state | Erik Johnston | 2015-08-07 | 1 | -77/+142 |
| | | | | | | | | | |||||
| * | | | | | | | | Implement a CacheListDescriptor | Erik Johnston | 2015-08-07 | 1 | -0/+106 |
| | | | | | | | | | |||||
| * | | | | | | | | Don't be too enthusiatic with defer.gatherResults | Erik Johnston | 2015-08-07 | 1 | -4/+8 |
| | | | | | | | | | |||||
| * | | | | | | | | Cache get_recent_events_for_room | Erik Johnston | 2015-08-07 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Remove unncessary cache | Erik Johnston | 2015-08-07 | 1 | -1/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | Change Cache to not use *args in its interface | Erik Johnston | 2015-08-07 | 10 | -81/+67 |
| | | | | | | | | | |||||
| * | | | | | | | | Store absence of state in cache | Erik Johnston | 2015-08-07 | 1 | -6/+16 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'erikj/cache_deferreds' into erikj/dictionary_cache | Erik Johnston | 2015-08-06 | 1 | -3/+27 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Docs | Erik Johnston | 2015-08-06 | 1 | -0/+3 |
| | | | | | | | | | |||||
| | * | | | | | | | Remove failed deferreds from cache | Erik Johnston | 2015-08-06 | 1 | -1/+7 |
| | | | | | | | | | |||||
| | * | | | | | | | Re-implement DEBUG_CACHES flag | Erik Johnston | 2015-08-06 | 1 | -2/+17 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'erikj/cache_deferreds' into erikj/dictionary_cache | Erik Johnston | 2015-08-06 | 2 | -15/+15 |
| |\| | | | | | | | |||||
| | * | | | | | | | Merge branch 'erikj/cached_keyword_args' into erikj/cache_deferreds | Erik Johnston | 2015-08-06 | 6 | -95/+124 |
| | |\| | | | | | | |||||
| | | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-08-06 | 6 | -95/+124 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/cached_keyword_args | ||||
| | * | | | | | | | | Make @cached cache deferreds rather than the deferreds' values | Erik Johnston | 2015-08-06 | 2 | -15/+15 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge branch 'erikj/cached_keyword_args' of github.com:matrix-org/synapse ↵ | Erik Johnston | 2015-08-05 | 6 | -23/+45 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into erikj/dictionary_cache | ||||
| | * | | | | | | | Add support for using keyword arguments with cached functions | Erik Johnston | 2015-07-27 | 6 | -23/+45 |
| | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-08-05 | 2 | -5/+5 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | erikj/dictionary_cache | ||||
| | * | | | | | | Up the cache size for 'get_joined_hosts_for_room' and 'get_users_in_room' | Erik Johnston | 2015-08-05 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Use LRU cache by default | Erik Johnston | 2015-08-05 | 1 | -3/+3 |
| | | | | | | | | |||||
| * | | | | | | | Use dictionary cache to do group -> state fetching | Erik Johnston | 2015-08-05 | 6 | -109/+194 |
| | | | | | | | | |||||
| * | | | | | | | Move DictionaryCache | Erik Johnston | 2015-08-04 | 1 | -0/+0 |
| | | | | | | | | |||||
| * | | | | | | | Add basic dictionary cache | Erik Johnston | 2015-08-04 | 1 | -0/+94 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/acl_perf | Erik Johnston | 2015-08-04 | 2 | -2/+3 |
| |\| | | | | | | |||||
| * | | | | | | | Add comment | Erik Johnston | 2015-08-04 | 1 | -0/+15 |
| | | | | | | | | |||||
| * | | | | | | | Speed up event filtering (for ACL) logic | Erik Johnston | 2015-08-04 | 5 | -43/+102 |
| | | | | | | | | |||||
* | | | | | | | | Allow sign in using email address | David Baker | 2015-08-04 | 1 | -5/+12 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Remember to yield: not much point testing is a deferred is not None | David Baker | 2015-08-04 | 1 | -1/+2 |
| | | | | | | | |||||
* | | | | | | | splt long line | David Baker | 2015-08-04 | 1 | -1/+3 |
| | | | | | | | |||||
* | | | | | | | Bump schema version | David Baker | 2015-08-04 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Add endpoint that proxies ID server request token and errors if the given ↵ | David Baker | 2015-08-04 | 4 | -1/+71 |
| |/ / / / / |/| | | | | | | | | | | | | | | | | | email is in use on this Home Server. | ||||
* | | | | | | Don't try & check the username if we don't have one (which we won't if it's ↵ | David Baker | 2015-08-03 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | been saved in the auth layer) | ||||
* | | | | | | Add vector.im as trusted ID server | David Baker | 2015-08-03 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Use the same reg paths as register v1 for ASes. | Kegan Dougal | 2015-07-29 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | Namely this means using registration_handler.appservice_register. | ||||
* | | | | | Fix v2_alpha registration. Add unit tests. | Kegan Dougal | 2015-07-28 | 2 | -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 thread | Erik Johnston | 2015-07-23 | 1 | -34/+43 |
|/ / / / | |||||
* | | / | Pick larger than desired thumbnail for 'crop' | Erik Johnston | 2015-07-23 | 1 | -1/+2 |
| |_|/ |/| | | |||||
* | | | Disable receipts for now | Matrix | 2015-07-22 | 1 | -0/+2 |
| | | | |||||
* | | | Query for all the ones we were asked about, not just the last... | David Baker | 2015-07-21 | 1 | -1/+1 |
| | | | |||||
* | | | Dodesn't seem to make any difference: guess it does work with the object ↵ | David Baker | 2015-07-21 | 1 | -1/+0 |
| | | | | | | | | | | | | reference | ||||
* | | | I think this was what was intended... | David Baker | 2015-07-21 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-07-21 | 2 | -3/+3 |
|\ \ \ | |||||
| * | | | typo | Matthew Hodgson | 2015-07-08 | 1 | -2/+2 |
| | | | | |||||
| * | | | Bump changelog and version to v0.9.3 | Erik Johnston | 2015-07-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | Bumb version | Erik Johnston | 2015-06-23 | 1 | -1/+1 |
| | | | | |||||
* | | | | s/take/claim/ for end to end key APIs | Mark Haines | 2015-07-20 | 2 | -8/+8 |
| | | | | |||||
* | | | | Improve naming | Daniel Wagner-Hall | 2015-07-20 | 1 | -2/+2 |
| | | | | |||||
* | | | | Remove semicolon. | Kegan Dougal | 2015-07-20 | 1 | -1/+1 |
| | | | | |||||
* | | | | Parse the ID given to /invite|ban|kick to make sure it looks like a user ID. | Kegan Dougal | 2015-07-20 | 1 | -0/+2 |
| | | | | |||||
* | | | | Up default cache size for _RoomStreamChangeCache | Matrix | 2015-07-18 | 1 | -1/+1 |
| | | | | |||||
* | | | | Don't do any database hits in receipt handling if from_key == to_key | Matrix | 2015-07-18 | 1 | -0/+3 |
| | | | | |||||
* | | | | Merge pull request #199 from matrix-org/erikj/receipts | Erik Johnston | 2015-07-16 | 16 | -35/+701 |
|\ \ \ \ | | | | | | | | | | | Implement read receipts. | ||||
| * | | | | Docs | Erik Johnston | 2015-07-14 | 2 | -6/+36 |
| | | | | | |||||
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts | Erik Johnston | 2015-07-13 | 22 | -221/+1326 |
| |\ \ \ \ | |||||
| * | | | | | Comments | Erik Johnston | 2015-07-13 | 2 | -4/+23 |
| | | | | | | |||||
| * | | | | | Handle error slightly better | Erik Johnston | 2015-07-09 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Remove spurious comment | Erik Johnston | 2015-07-09 | 1 | -2/+0 |
| | | | | | | |||||
| * | | | | | Integer timestamps | Erik Johnston | 2015-07-09 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts | Erik Johnston | 2015-07-09 | 2 | -3/+8 |
| |\ \ \ \ \ | |||||
| * | | | | | | Change format of receipts to allow inclusion of data | Erik Johnston | 2015-07-09 | 3 | -37/+42 |
| | | | | | | | |||||
| * | | | | | | Add blist to dependencies | Erik Johnston | 2015-07-08 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts | Erik Johnston | 2015-07-08 | 7 | -18/+62 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Add a cache to fetching of receipt streams | Erik Johnston | 2015-07-08 | 2 | -27/+96 |
| | | | | | | | | |||||
| * | | | | | | | Split receipt events up into one per room | Erik Johnston | 2015-07-08 | 1 | -30/+21 |
| | | | | | | | | |||||
| * | | | | | | | Hook up receipts to v1 initialSync | Erik Johnston | 2015-07-08 | 3 | -13/+77 |
| | | | | | | | | |||||
| * | | | | | | | Wire together receipts and the notifer/federation | Erik Johnston | 2015-07-07 | 4 | -33/+126 |
| | | | | | | | | |||||
| * | | | | | | | Fix various typos | Erik Johnston | 2015-07-07 | 4 | -8/+16 |
| | | | | | | | | |||||
| * | | | | | | | Add a ReceiptServlet | Erik Johnston | 2015-07-07 | 2 | -1/+59 |
| | | | | | | | | |||||
| * | | | | | | | Add stream_id index | Erik Johnston | 2015-07-02 | 1 | -1/+5 |
| | | | | | | | | |||||
| * | | | | | | | Consolidate duplicate code in notifier | Erik Johnston | 2015-07-02 | 4 | -28/+15 |
| | | | | | | | | |||||
| * | | | | | | | Add receipts_key to StreamToken | Erik Johnston | 2015-07-02 | 3 | -3/+8 |
| | | | | | | | | |||||
| * | | | | | | | Add basic ReceiptHandler | Erik Johnston | 2015-07-01 | 1 | -0/+130 |
| | | | | | | | | |||||
| * | | | | | | | Add basic storage functions for handling of receipts | Erik Johnston | 2015-07-01 | 4 | -17/+186 |
| | | | | | | | | |||||
| * | | | | | | | Add tables for receipts | Erik Johnston | 2015-06-30 | 2 | -1/+36 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #203 from matrix-org/erikj/room_creation_presets | Erik Johnston | 2015-07-16 | 2 | -19/+82 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Implement presets at room creation | ||||
| * | | | | | | | | Implement specifying custom initial state for /createRoom | Erik Johnston | 2015-07-16 | 1 | -40/+60 |
| | | | | | | | | | |||||
| * | | | | | | | | s/everyone_ops/original_invitees_have_ops/ | Erik Johnston | 2015-07-14 | 1 | -3/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Capitalize contants | Erik Johnston | 2015-07-14 | 2 | -6/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | Implement presets at room creation | Erik Johnston | 2015-07-13 | 2 | -22/+65 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #202 from matrix-org/erikj/power_level_sanity | Erik Johnston | 2015-07-16 | 1 | -16/+25 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Change power level semantics. | ||||
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-07-13 | 12 | -218/+726 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/power_level_sanity | ||||
| * | | | | | | | | Sanitize power level checks | Erik Johnston | 2015-07-10 | 1 | -15/+21 |
| | | | | | | | | | |||||
| * | | | | | | | | You shouldn't be able to ban/kick users with higher power levels | Erik Johnston | 2015-07-10 | 1 | -2/+5 |
| | | | | | | | | | |||||
* | | | | | | | | | pep8 + debug line | David Baker | 2015-07-15 | 1 | -6/+8 |
| | | | | | | | | | |||||
* | | | | | | | | | Add back in support for remembering parameters submitted to a ↵ | David Baker | 2015-07-15 | 2 | -4/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user-interactive auth call. | ||||
* | | | | | | | | | bump up image quality a bit more as it looks crap | Matthew Hodgson | 2015-07-14 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #193 from matrix-org/erikj/bulk_persist_event | Erik Johnston | 2015-07-14 | 7 | -376/+503 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add bulk insert events API | ||||
| * | | | | | | | | | Remove commented out code | Erik Johnston | 2015-07-10 | 1 | -14/+0 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Add bulk insert events API | Erik Johnston | 2015-06-25 | 8 | -374/+521 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Close, but no cigar. | David Baker | 2015-07-14 | 1 | -2/+2 |
| |_|/ / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge pull request #196 from matrix-org/erikj/room_history | Erik Johnston | 2015-07-10 | 8 | -4/+235 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add ability to restrict room history. | ||||
| * | | | | | | | | | Add comment | Erik Johnston | 2015-07-09 | 1 | -0/+4 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Add m.room.history_visibility to newly created rooms' m.room.power_levels | Erik Johnston | 2015-07-06 | 2 | -0/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Rename key and values for m.room.history_visibility. Support 'invited' value | Erik Johnston | 2015-07-06 | 4 | -24/+61 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Filter and redact events that the other server doesn't have permission to ↵ | Erik Johnston | 2015-07-03 | 1 | -0/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | see during backfill | ||||
| * | | | | | | | | | Respect m.room.history_visibility in v2_alpha sync API | Erik Johnston | 2015-07-03 | 1 | -0/+33 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Add m.room.history_visibility to list of auth events | Erik Johnston | 2015-07-03 | 2 | -1/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Make v1 initial syncs respect room history ACL | Erik Johnston | 2015-07-02 | 1 | -17/+34 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Add basic impl for room history ACL on GET /messages client API | Erik Johnston | 2015-07-02 | 3 | -3/+95 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #194 from matrix-org/erikj/bulk_verify_sigs | Erik Johnston | 2015-07-10 | 4 | -214/+491 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | Implement bulk verify_signed_json API | ||||
| * | | | | | | | | Wait for previous attempts at fetching keys for a given server before trying ↵ | Erik Johnston | 2015-06-26 | 1 | -15/+68 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to fetch more | ||||
| * | | | | | | | | Implement bulk verify_signed_json API | Erik Johnston | 2015-06-26 | 4 | -217/+441 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Uniquely name unique constraint | Erik Johnston | 2015-07-10 | 1 | -2/+2 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #198 from matrix-org/markjh/client-end-to-end-key-management | Erik Johnston | 2015-07-10 | 5 | -2/+441 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Client end to end key management API | ||||
| * | | | | | | | | Assume that each device for a user has only one of each type of key | Mark Haines | 2015-07-10 | 1 | -3/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Don't bother with a timeout for one time keys on the server. | Mark Haines | 2015-07-09 | 3 | -33/+13 |
| | | | | | | | | | |||||
| * | | | | | | | | Only remove one time keys when new one time keys are added | Mark Haines | 2015-07-08 | 1 | -7/+7 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'mjark/missing_regex_group' into ↵ | Mark Haines | 2015-07-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | markjh/client-end-to-end-key-management | ||||
| * | | | | | | | | Add client API for uploading and querying keys for end to end encryption | Mark Haines | 2015-07-06 | 2 | -1/+290 |
| | | | | | | | | | |||||
| * | | | | | | | | Add store for client end to end keys | Mark Haines | 2015-07-06 | 3 | -1/+171 |
| | | | | | | | | | |||||
* | | | | | | | | | Small tweaks to SAML2 configuration. | Erik Johnston | 2015-07-10 | 2 | -22/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add saml2 config docs to default config. - Use existence of saml2 config to indicate if saml2 should be enabled. | ||||
* | | | | | | | | | Merge pull request #201 from EricssonResearch/msba/saml2-develop | Erik Johnston | 2015-07-10 | 5 | -3/+149 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | Integrate SAML2 basic authentication - uses pysaml2 | ||||
| * | | | | | | | | Make SAML2 optional and add some references/comments | Muthu Subramanian | 2015-07-09 | 2 | -4/+23 |
| | | | | | | | | | |||||
| * | | | | | | | | code beautify | Muthu Subramanian | 2015-07-09 | 1 | -9/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | code beautify | Muthu Subramanian | 2015-07-08 | 3 | -2/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | code beautify | Muthu Subramanian | 2015-07-08 | 1 | -10/+23 |
| | | | | | | | | | |||||
| * | | | | | | | | Integrate SAML2 basic authentication - uses pysaml2 | Muthu Subramanian | 2015-07-08 | 5 | -4/+122 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | We don't want semicolons. | Erik Johnston | 2015-07-09 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | remove the tls_certificate_chain_path param and simply support ↵ | Matthew Hodgson | 2015-07-09 | 2 | -24/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tls_certificate_path pointing to a file containing a chain of certificates | ||||
* | | | | | | | | document tls_certificate_chain_path more clearly | Matthew Hodgson | 2015-07-09 | 1 | -0/+5 |
| | | | | | | | | |||||
* | | | | | | | | oops, context.tls_certificate_chain_file() expects a file, not a certificate. | Matthew Hodgson | 2015-07-08 | 2 | -6/+3 |
| | | | | | | | | |||||
* | | | | | | | | typo | Matthew Hodgson | 2015-07-08 | 1 | -1/+1 |
| | | | | | | | |