Mark Haines
|
c5966b2a97
|
Merge remote-tracking branch 'origin/develop' into markjh/end-to-end-key-federation
|
2015-08-13 17:27:53 +01:00 |
|
Mark Haines
|
0cceb2ac92
|
Add a few strategic new lines to break up the on_query_client_keys and on_claim_client_keys methods in federation_server.py
|
2015-08-13 17:27:46 +01:00 |
|
Erik Johnston
|
d884047d34
|
Merge pull request #224 from matrix-org/erikj/reactor_metrics
Add some metrics about the reactor
|
2015-08-13 17:17:07 +01:00 |
|
Mark Haines
|
3d1cdda762
|
Merge branch 'develop' into erikj/reactor_metrics
|
2015-08-13 17:03:58 +01:00 |
|
Mark Haines
|
7eb4d626ba
|
Add max-line-length to the flake8 section of setup.cfg
|
2015-08-13 13:12:33 +01:00 |
|
Erik Johnston
|
adbd720fab
|
PEP8
|
2015-08-13 11:47:38 +01:00 |
|
Erik Johnston
|
a6c27de1aa
|
Don't time getDelayedCalls
|
2015-08-13 11:41:57 +01:00 |
|
Erik Johnston
|
ba5d34a832
|
Add some metrics about the reactor
|
2015-08-13 11:38:59 +01:00 |
|
Mark Haines
|
6a191d62ed
|
Merge pull request #173 from matrix-org/markjh/twisted-15
Update to Twisted-15.2.1.
|
2015-08-12 17:28:47 +01:00 |
|
Mark Haines
|
21ac8be5f7
|
Depend on Twisted>=15.1 rather than pining to a particular version
|
2015-08-12 17:25:13 +01:00 |
|
Erik Johnston
|
3e4e367f09
|
Merge pull request #223 from matrix-org/markjh/enable_demo_registration
enable registration in the demo servers
|
2015-08-12 17:24:16 +01:00 |
|
Mark Haines
|
998a72d4d9
|
Merge branch 'develop' into markjh/twisted-15
Conflicts:
synapse/http/matrixfederationclient.py
|
2015-08-12 17:21:14 +01:00 |
|
Mark Haines
|
2eb91e6694
|
enable registration in the demo servers
|
2015-08-12 16:53:30 +01:00 |
|
Erik Johnston
|
4f11a5b2b5
|
Merge pull request #220 from matrix-org/markjh/generate_keys
Fix the --generate-keys option.
|
2015-08-12 14:23:54 +01:00 |
|
Mark Haines
|
7bbaab9432
|
Fix the --generate-keys option. Make it do the same thing as --generate-config does when the config file exists, but without printing a warning
|
2015-08-12 11:57:37 +01:00 |
|
Daniel Wagner-Hall
|
7b49236b37
|
Merge pull request #216 from matrix-org/auth
Clean up some docs and redundant fluff
|
2015-08-12 10:55:42 +01:00 |
|
Mark Haines
|
275f7c987c
|
Merge pull request #182 from matrix-org/manu/fix_no_rate_limit_in_federation_demo
Federation demo start.sh: Fixed --no-rate-limit param in the script
|
2015-08-12 09:39:57 +01:00 |
|
Mark Haines
|
b24d7ebd6e
|
Fix the cleanup script to use the right $DIR
|
2015-08-12 09:39:07 +01:00 |
|
Erik Johnston
|
7568fe880d
|
Merge pull request #218 from matrix-org/mockfix
Remove call to "recently" removed function in mock
|
2015-08-11 17:00:17 +01:00 |
|
Daniel Wagner-Hall
|
4ff0228c25
|
Remove call to recently removed function in mock
|
2015-08-11 16:56:30 +01:00 |
|
Daniel Wagner-Hall
|
45610305ea
|
Add missing space because linter
|
2015-08-11 16:43:27 +01:00 |
|
Daniel Wagner-Hall
|
88e03da39f
|
Minor docs cleanup
|
2015-08-11 16:35:28 +01:00 |
|
Daniel Wagner-Hall
|
9dba813234
|
Remove redundant if-guard
The startswith("@") does the job
|
2015-08-11 16:34:17 +01:00 |
|
Mark Haines
|
559c51debc
|
Use TypeError instead of ValueError and give a nicer error mesasge
when someone calls Cache.invalidate with the wrong type.
|
2015-08-10 14:07:17 +01:00 |
|
Erik Johnston
|
8c3a62b5c7
|
Merge pull request #215 from matrix-org/erikj/cache_varargs_interface
Change Cache to not use *args in its interface
|
2015-08-10 13:47:45 +01:00 |
|
Erik Johnston
|
86eaaa885b
|
Rename keyargs to args in CacheDescriptor
|
2015-08-10 13:44:44 +01:00 |
|
Erik Johnston
|
2cd6cb9f65
|
Rename keyargs to args in Cache
|
2015-08-10 10:38:47 +01:00 |
|
Erik Johnston
|
06218ab125
|
Merge pull request #212 from matrix-org/erikj/cache_deferreds
Make CacheDescriptor cache deferreds rather than the deferreds' values
|
2015-08-07 19:28:05 +01:00 |
|
Erik Johnston
|
2352974aab
|
Merge branch 'erikj/cache_deferreds' of github.com:matrix-org/synapse into erikj/cache_varargs_interface
|
2015-08-07 19:26:54 +01:00 |
|
Erik Johnston
|
9c5385b53a
|
s/observed/observer/
|
2015-08-07 19:26:38 +01:00 |
|
Erik Johnston
|
ffab798a38
|
Merge branch 'erikj/cache_deferreds' of github.com:matrix-org/synapse into erikj/cache_varargs_interface
|
2015-08-07 19:18:47 +01:00 |
|
Erik Johnston
|
62126c996c
|
Propogate stale cache errors to calling functions
|
2015-08-07 19:17:58 +01:00 |
|
Erik Johnston
|
3213ff630c
|
Remove unnecessary cache
|
2015-08-07 19:14:05 +01:00 |
|
Erik Johnston
|
20addfa358
|
Change Cache to not use *args in its interface
|
2015-08-07 18:32:47 +01:00 |
|
Paul Evans
|
e69b669083
|
Merge pull request #213 from matrix-org/paul/SYN-420
Three small improvements to help debian package (SYN-420)
|
2015-08-07 17:49:54 +01:00 |
|
Paul "LeoNerd" Evans
|
0db40d3e93
|
Don't complain about extra .pyc files we find while hunting for database schemas
|
2015-08-07 17:22:11 +01:00 |
|
Paul "LeoNerd" Evans
|
e3c8e2c13c
|
Add a --generate-keys option
|
2015-08-07 16:42:27 +01:00 |
|
Paul "LeoNerd" Evans
|
efe60d5e8c
|
Only print the pidfile path on startup if requested by a commandline flag
|
2015-08-07 16:36:42 +01:00 |
|
Erik Johnston
|
63b1eaf32c
|
Docs
|
2015-08-06 14:02:50 +01:00 |
|
Erik Johnston
|
b811c98574
|
Remove failed deferreds from cache
|
2015-08-06 14:01:27 +01:00 |
|
Erik Johnston
|
433314cc34
|
Re-implement DEBUG_CACHES flag
|
2015-08-06 14:01:05 +01:00 |
|
Erik Johnston
|
8049c9a71e
|
Merge pull request #209 from matrix-org/erikj/cached_keyword_args
Add support for using keyword arguments with cached functions
|
2015-08-06 13:52:49 +01:00 |
|
Erik Johnston
|
2efb93af52
|
Merge branch 'erikj/cached_keyword_args' into erikj/cache_deferreds
|
2015-08-06 13:35:28 +01:00 |
|
Erik Johnston
|
953dbd28a7
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cached_keyword_args
|
2015-08-06 13:35:03 +01:00 |
|
Erik Johnston
|
7eea3e356f
|
Make @cached cache deferreds rather than the deferreds' values
|
2015-08-06 13:33:34 +01:00 |
|
Erik Johnston
|
1e62a3d3a9
|
Up the cache size for 'get_joined_hosts_for_room' and 'get_users_in_room'
|
2015-08-05 15:40:40 +01:00 |
|
Erik Johnston
|
a89559d797
|
Use LRU cache by default
|
2015-08-05 15:39:47 +01:00 |
|
David Baker
|
7148aaf5d0
|
Don't try & check the username if we don't have one (which we won't if it's been saved in the auth layer)
|
2015-08-03 17:03:27 +01:00 |
|
David Baker
|
28d07a02e4
|
Add vector.im as trusted ID server
|
2015-08-03 15:31:21 +01:00 |
|
David Baker
|
2c963054f8
|
Merge pull request #210 from matrix-org/reg-v2a-password-skip
v2_alpha /register fixes for Application Services
|
2015-07-29 14:46:17 +01:00 |
|