summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Fix units in testDaniel Wagner-Hall2015-08-181-1/+1
| | | | I made the non-test seconds instead of ms, but not the test
* Fix some formatting to use tuplesDaniel Wagner-Hall2015-08-182-5/+5
|
* Merge branch 'develop' into authDaniel Wagner-Hall2015-08-1838-455/+1346
|\
| * 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 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 branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-08-124-13/+18
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | erikj/dictionary_cache
| | | | * | | | 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 branch 'erikj/cache_varargs_interface' of ↵Erik Johnston2015-08-101-5/+5
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:matrix-org/synapse into erikj/dictionary_cache
| | | | * \ \ \ \ \ Merge branch 'erikj/cache_varargs_interface' of ↵Erik Johnston2015-08-101-9/+9
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:matrix-org/synapse into erikj/dictionary_cache
| | | | * | | | | | | 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 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-08-075-4/+27
| | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/dictionary_cache
| | | | * | | | | | | | | 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
| | | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge branch 'erikj/cache_deferreds' into erikj/dictionary_cacheErik 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
| | | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-08-052-5/+5
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/dictionary_cache
| | | | * | | | | | | | | | | | | Use dictionary cache to do group -> state fetchingErik Johnston2015-08-057-110/+195
| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Move DictionaryCacheErik Johnston2015-08-042-1/+1
| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Add basic dictionary cacheErik Johnston2015-08-042-0/+195
| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/acl_perfErik Johnston2015-08-042-2/+3
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | Add commentErik Johnston2015-08-041-0/+15
| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Speed up event filtering (for ACL) logicErik Johnston2015-08-045-43/+102
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Remove accidentally added fileDaniel Wagner-Hall2015-08-181-0/+0
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Issue macaroons as opaque auth tokensDaniel Wagner-Hall2015-08-186-6/+90
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | 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
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | | | | | | | 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
| | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | 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
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | / / 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-1012-72/+73
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | Change Cache to not use *args in its interface
| * | | | | | | | | | | | | Rename keyargs to args in CacheDescriptorErik Johnston2015-08-101-5/+5
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Rename keyargs to args in CacheErik Johnston2015-08-101-9/+9
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | 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 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
| |/ / / / / / / / / /
| * | | | | | | | | | 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/cached_keyword_args' into erikj/cache_deferredsErik Johnston2015-08-068-140/+305
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make @cached cache deferreds rather than the deferreds' valuesErik Johnston2015-08-063-19/+22
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | 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
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-08-068-140/+305
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / erikj/cached_keyword_args
* | | | | | | | 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
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | 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
| |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #210 from matrix-org/reg-v2a-password-skipDavid Baker2015-07-293-55/+208
|\ \ \ \ \ \ | | | | | | | | | | | | | | v2_alpha /register fixes for Application Services
| * | | | | | Use the same reg paths as register v1 for ASes.Kegan Dougal2015-07-292-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Namely this means using registration_handler.appservice_register.
| * | | | | | Fix v2_alpha registration. Add unit tests.Kegan Dougal2015-07-283-55/+204
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | improve OS X instructions and remove all the leading $'s to make it easier ↵Matthew Hodgson2015-07-291-45/+47
|/ / / / / / | | | | | | | | | | | | | | | | | | to c+p commands
* | | | | | Merge pull request #207 from ↵Erik Johnston2015-07-271-34/+43
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/erikj/generate_local_thumbnails_on_thread Generate local thumbnails on a thread
| * | | | | | Generate local thumbnails on a threadErik Johnston2015-07-231-34/+43
|/ / / / / /
| * / / / / Add support for using keyword arguments with cached functionsErik Johnston2015-07-276-23/+45
|/ / / / /
* | | | | Merge pull request #205 from matrix-org/erikj/pick_largest_thumbnailMark Haines2015-07-231-1/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | Pick larger than desired thumbnail for 'crop'
| * | | | 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
| | | |
* | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-07-214-4/+30
|\ \ \ \
| * | | | typoMatthew Hodgson2015-07-081-2/+2
| | | | |
| * | | | Merge branch 'release-v0.9.3' of github.com:matrix-org/synapse v0.9.3Erik Johnston2015-07-0125-481/+787
| |\ \ \ \
| | * | | | Bump changelog and version to v0.9.3Erik Johnston2015-07-012-2/+7
| | | | | |
| | * | | | Update change log v0.9.3-rc1Erik Johnston2015-06-231-0/+18
| | | | | |
| | * | | | Bumb versionErik Johnston2015-06-231-1/+1
| | | | | |
| * | | | | clarify readme a bit moreMatthew Hodgson2015-06-271-1/+4
| | | | | |
* | | | | | s/take/claim/ for end to end key APIsMark Haines2015-07-202-8/+8
| | | | | |
* | | | | | Merge pull request #204 from illicitonion/developErik Johnston2015-07-201-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Improve naming
| * | | | | | Improve namingDaniel Wagner-Hall2015-07-201-2/+2
|/ / / / / /
* | | | | | Remove semicolon.Kegan Dougal2015-07-201-1/+1
| | | | | |
* | | | | | Parse the ID given to /invite|ban|kick to make sure it looks like a user ID.Kegan Dougal2015-07-201-0/+2
| | | | | |
* | | | | | Up default cache size for _RoomStreamChangeCacheMatrix2015-07-181-1/+1
| | | | | |
* | | | | | Don't do any database hits in receipt handling if from_key == to_keyMatrix2015-07-181-0/+3
| | | | | |
* | | | | | Merge pull request #199 from matrix-org/erikj/receiptsErik Johnston2015-07-1619-48/+724
|\ \ \ \ \ \ | | | | | | | | | | | | | | Implement read receipts.
| * | | | | | DocsErik Johnston2015-07-142-6/+36
| | | | | | |
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receiptsErik Johnston2015-07-1323-221/+1329
| |\ \ \ \ \ \
| * | | | | | | CommentsErik Johnston2015-07-132-4/+23
| | | | | | | |
| * | | | | | | Handle error slightly betterErik Johnston2015-07-091-2/+2
| | | | | | | |
| * | | | | | | Remove spurious commentErik Johnston2015-07-091-2/+0
| | | | | | | |
| * | | | | | | Integer timestampsErik Johnston2015-07-091-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receiptsErik Johnston2015-07-092-3/+8
| |\ \ \ \ \ \ \
| * | | | | | | | Change format of receipts to allow inclusion of dataErik Johnston2015-07-093-37/+42
| | | | | | | | |
| * | | | | | | | Add blist to dependenciesErik Johnston2015-07-081-0/+1
| | | | | | | | |
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receiptsErik Johnston2015-07-087-18/+62
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Add a cache to fetching of receipt streamsErik Johnston2015-07-082-27/+96
| | | | | | | | | |
| * | | | | | | | | Split receipt events up into one per roomErik Johnston2015-07-081-30/+21
| | | | | | | | | |
| * | | | | | | | | Hook up receipts to v1 initialSyncErik Johnston2015-07-083-13/+77
| | | | | | | | | |
| * | | | | | | | | Fix test.Erik Johnston2015-07-071-1/+11
| | | | | | | | | |
| * | | | | | | | | Wire together receipts and the notifer/federationErik Johnston2015-07-074-33/+126
| | | | | | | | | |
| * | | | | | | | | Fix various typosErik Johnston2015-07-074-8/+16
| | | | | | | | | |
| * | | | | | | | | Add a ReceiptServletErik Johnston2015-07-072-1/+59
| | | | | | | | | |
| * | | | | | | | | Add stream_id indexErik Johnston2015-07-021-1/+5
| | | | | | | | | |
| * | | | | | | | | Consolidate duplicate code in notifierErik Johnston2015-07-025-38/+25
| | | | | | | | | |
| * | | | | | | | | Add receipts_key to StreamTokenErik Johnston2015-07-024-5/+10
| | | | | | | | | |
| * | | | | | | | | Add basic ReceiptHandlerErik Johnston2015-07-011-0/+130
| | | | | | | | | |
| * | | | | | | | | Add basic storage functions for handling of receiptsErik Johnston2015-07-014-17/+186
| | | | | | | | | |
| * | | | | | | | | Add tables for receiptsErik Johnston2015-06-302-1/+36
| | | | | | | | | |
* | | | | | | | | | Merge pull request #203 from matrix-org/erikj/room_creation_presetsErik Johnston2015-07-162-19/+82
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Implement presets at room creation
| * | | | | | | | | | Implement specifying custom initial state for /createRoomErik Johnston2015-07-161-40/+60
| | | | | | | | | | |
| * | | | | | | | | | s/everyone_ops/original_invitees_have_ops/Erik Johnston2015-07-141-3/+3
| | | | | | | | | | |
| * | | | | | | | | | Capitalize contantsErik Johnston2015-07-142-6/+6
| | | | | | | | | | |
| * | | | | | | | | | Implement presets at room creationErik Johnston2015-07-132-22/+65
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #202 from matrix-org/erikj/power_level_sanityErik Johnston2015-07-161-16/+25
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Change power level semantics.
| * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-07-1312-218/+726
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/power_level_sanity
| * | | | | | | | | | Sanitize power level checksErik Johnston2015-07-101-15/+21
| | | | | | | | | | |
| * | | | | | | | | | You shouldn't be able to ban/kick users with higher power levelsErik Johnston2015-07-101-2/+5
| | | | | | | | | | |
* | | | | | | | | | | pep8 + debug lineDavid Baker2015-07-151-6/+8
| | | | | | | | | | |
* | | | | | | | | | | Add back in support for remembering parameters submitted to a ↵David Baker2015-07-152-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user-interactive auth call.
* | | | | | | | | | | bump up image quality a bit more as it looks crapMatthew Hodgson2015-07-141-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #193 from matrix-org/erikj/bulk_persist_eventErik Johnston2015-07-147-376/+503
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add bulk insert events API
| * | | | | | | | | | | Remove commented out codeErik Johnston2015-07-101-14/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Add bulk insert events APIErik Johnston2015-06-258-374/+521
| | | | | | | | | | | |
* | | | | | | | | | | | Close, but no cigar.David Baker2015-07-141-2/+2
| |_|/ / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #196 from matrix-org/erikj/room_historyErik Johnston2015-07-108-4/+235
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add ability to restrict room history.
| * | | | | | | | | | | Add commentErik Johnston2015-07-091-0/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Add m.room.history_visibility to newly created rooms' m.room.power_levelsErik Johnston2015-07-062-0/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Rename key and values for m.room.history_visibility. Support 'invited' valueErik Johnston2015-07-064-24/+61
| | | | | | | | | | | |
| * | | | | | | | | | | Filter and redact events that the other server doesn't have permission to ↵Erik Johnston2015-07-031-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | see during backfill
| * | | | | | | | | | | Respect m.room.history_visibility in v2_alpha sync APIErik Johnston2015-07-031-0/+33
| | | | | | | | | | | |
| * | | | | | | | | | | Add m.room.history_visibility to list of auth eventsErik Johnston2015-07-032-1/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Make v1 initial syncs respect room history ACLErik Johnston2015-07-021-17/+34
| | | | | | | | | | | |
| * | | | | | | | | | | Add basic impl for room history ACL on GET /messages client APIErik Johnston2015-07-023-3/+95
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #194 from matrix-org/erikj/bulk_verify_sigsErik Johnston2015-07-104-214/+491
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | Implement bulk verify_signed_json API
| * | | | | | | | | | Wait for previous attempts at fetching keys for a given server before trying ↵Erik Johnston2015-06-261-15/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to fetch more
| * | | | | | | | | | Implement bulk verify_signed_json APIErik Johnston2015-06-264-217/+441
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Uniquely name unique constraintErik Johnston2015-07-101-2/+2
| | | | | | | | | |
* | | | | | | | | | Merge pull request #198 from matrix-org/markjh/client-end-to-end-key-managementErik Johnston2015-07-105-2/+441
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Client end to end key management API
| * | | | | | | | | | Assume that each device for a user has only one of each type of keyMark Haines2015-07-101-3/+3
| | | | | | | | | | |
| * | | | | | | | | | Don't bother with a timeout for one time keys on the server.Mark Haines2015-07-093-33/+13
| | | | | | | | | | |
| * | | | | | | | | | Only remove one time keys when new one time keys are addedMark Haines2015-07-081-7/+7
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'mjark/missing_regex_group' into ↵Mark Haines2015-07-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | markjh/client-end-to-end-key-management
| * | | | | | | | | | | Add client API for uploading and querying keys for end to end encryptionMark Haines2015-07-062-1/+290
| | | | | | | | | | | |
| * | | | | | | | | | | Add store for client end to end keysMark Haines2015-07-063-1/+171
| | | | | | | | | | | |
* | | | | | | | | | | | Small tweaks to SAML2 configuration.Erik Johnston2015-07-102-22/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add saml2 config docs to default config. - Use existence of saml2 config to indicate if saml2 should be enabled.
* | | | | | | | | | | | Add Muthu Subramanian to AUTHORSErik Johnston2015-07-101-0/+3
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #201 from EricssonResearch/msba/saml2-developErik Johnston2015-07-105-3/+149
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | Integrate SAML2 basic authentication - uses pysaml2
| * | | | | | | | | | | Make SAML2 optional and add some references/commentsMuthu Subramanian2015-07-092-4/+23
| | | | | | | | | | | |
| * | | | | | | | | | | code beautifyMuthu Subramanian2015-07-091-9/+4
| | | | | | | | | | | |
| * | | | | | | | | | | code beautifyMuthu Subramanian2015-07-083-2/+3
| | | | | | | | | | | |
| * | | | | | | | | | | code beautifyMuthu Subramanian2015-07-081-10/+23
| | | | | | | | | | | |
| * | | | | | | | | | | Integrate SAML2 basic authentication - uses pysaml2Muthu Subramanian2015-07-085-4/+122
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | We don't want semicolons.Erik Johnston2015-07-091-1/+1
| | | | | | | | | | |
* | | | | | | | | | | remove the tls_certificate_chain_path param and simply support ↵Matthew Hodgson2015-07-092-24/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tls_certificate_path pointing to a file containing a chain of certificates
* | | | | | | | | | | document tls_certificate_chain_path more clearlyMatthew Hodgson2015-07-091-0/+5
| | | | | | | | | | |
* | | | | | | | | | | oops, context.tls_certificate_chain_file() expects a file, not a certificate.Matthew Hodgson2015-07-082-6/+3
| | | | | | | | | | |
* | | | | | | | | | | typoMatthew Hodgson2015-07-081-1/+1
| | | | | | | | | | |
* | | | | | | | | | | *cough*Matthew Hodgson2015-07-081-2/+3
| | | | | | | | | | |
* | | | | | | | | | | add new optional config for tls_certificate_chain_path for folks with ↵Matthew Hodgson2015-07-082-3/+19
| |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | intermediary SSL certs
* | | | | | | | | | Merge pull request #197 from matrix-org/mjark/missing_regex_groupErik Johnston2015-07-071-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | | Don't 500 if a group is missing from the regex match
| * | | | | | | | Don't 500 if a group is missing from the regexMark Haines2015-07-061-1/+1
|/ / / / / / / /
* | | | | | | | Don't explode if we don't recognize one of the event_ids in the backfill requestErik Johnston2015-07-061-2/+4
| | | | | | | |
* | | | | | | | Merge pull request #195 from matrix-org/erikj/content_dispositionErik Johnston2015-07-035-15/+57
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Add Content-Disposition headers to media repo downloads
| * | | | | | | If user supplies filename in URL when downloading from media repo, use that ↵Erik Johnston2015-07-033-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name in Content Disposition
| * | | | | | | Enforce ascii filenames for uploadsErik Johnston2015-06-303-1/+15
| | | | | | | |
| * | | | | | | Add Content-Disposition headers to media repo v1 downloadsErik Johnston2015-06-303-7/+30
|/ / / / / / /
* / / / / / / Oops: underride rule had an identifier with override in it.David Baker2015-06-231-1/+1
|/ / / / / /
* | / / / / Batch SELECTs in _get_auth_chain_ids_txnErik Johnston2015-06-231-3/+11
| |/ / / / |/| | | |
* | | | | Fix typoErik Johnston2015-06-191-1/+1
| | | | |
* | | | | Merge pull request #192 from matrix-org/erikj/fix_log_contextErik Johnston2015-06-193-52/+68
|\ \ \ \ \ | | | | | | | | | | | | Fix log context when sending requests
| * | | | | Fix log context when sending requestsErik Johnston2015-06-193-52/+68
| | | | | |
* | | | | | Merge pull request #190 from matrix-org/erikj/syn-412Erik Johnston2015-06-193-73/+78
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix notifier leak
| * | | | | Add comment on cancellation of observersErik Johnston2015-06-191-0/+3
| | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-16 13:33:09 +0000