c044aca1fd
Merge branch 'erikj/reactor_metrics' into erikj/dictionary_cache
2015-08-13 11:39:38 +01:00
ba5d34a832
Add some metrics about the reactor
2015-08-13 11:38:59 +01:00
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
21ac8be5f7
Depend on Twisted>=15.1 rather than pining to a particular version
2015-08-12 17:25:13 +01:00
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
0fbed2a8fa
Comment
2015-08-12 17:22:54 +01:00
998a72d4d9
Merge branch 'develop' into markjh/twisted-15
...
Conflicts:
synapse/http/matrixfederationclient.py
2015-08-12 17:21:14 +01:00
c10ac7806e
Explain why we're prefilling dict with Nones
2015-08-12 17:16:30 +01:00
101ee3fd00
Better variable name
2015-08-12 17:08:05 +01:00
df361d08f7
Split _get_state_for_group_from_cache into two
2015-08-12 17:06:21 +01:00
7b0e797080
Fix _filter_events_for_client
2015-08-12 17:05:24 +01:00
2eb91e6694
enable registration in the demo servers
2015-08-12 16:53:30 +01:00
cfa62007a3
Docstring
2015-08-12 16:42:46 +01:00
5ce903e2f7
Merge password checking implementations
2015-08-12 16:09:19 +01:00
a7eeb34c64
Simplify staggered deferred lists
2015-08-12 16:02:05 +01:00
f7e2f981ea
Use list comprehension instead of filter
2015-08-12 16:01:10 +01:00
bcc1d34d35
Merge branch 'develop' into auth
2015-08-12 15:58:52 +01:00
f4122c64b5
Merge branch 'develop' of github.com:matrix-org/synapse into develop
2015-08-12 15:58:35 +01:00
415c2f0549
Simplify LoginHander and AuthHandler
...
* 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
2015-08-12 15:49:37 +01:00
f43041aacd
Check absent before trying to access keys
2015-08-12 15:44:08 +01:00
73605f8070
Just leaving off the $ is fine. r* == registerrrrrrrrr
2015-08-12 15:40:54 +01:00
de3b7b55d6
Doc-string for config ultility function
2015-08-12 14:29:17 +01:00
d46208c12c
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary_cache
2015-08-12 14:28:43 +01:00
4f11a5b2b5
Merge pull request #220 from matrix-org/markjh/generate_keys
...
Fix the --generate-keys option.
2015-08-12 14:23:54 +01:00
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
7b49236b37
Merge pull request #216 from matrix-org/auth
...
Clean up some docs and redundant fluff
2015-08-12 10:55:42 +01:00
fdb724cb70
Add config option for setting the list of thumbnail sizes to precalculate
2015-08-12 10:55:27 +01:00
7e3d1c7d92
Make a config option for whether to generate new thumbnail sizes dynamically
2015-08-12 10:54:38 +01:00
d7451e0f22
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary_cache
2015-08-12 10:30:30 +01:00
4807616e16
Wire up the dictionarycache to the metrics
2015-08-12 10:13:35 +01:00
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
b24d7ebd6e
Fix the cleanup script to use the right $DIR
2015-08-12 09:39:07 +01:00
2df8dd9b37
Move all the caches into their own package, synapse.util.caches
2015-08-11 18:00:59 +01:00
a23a760b3f
Merge branch 'develop' into auth
2015-08-11 17:41:29 +01:00
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
4ff0228c25
Remove call to recently removed function in mock
2015-08-11 16:56:30 +01:00
dcd5983fe4
Remove call to recently removed function in mock
2015-08-11 16:54:06 +01:00
45610305ea
Add missing space because linter
2015-08-11 16:43:27 +01:00
88e03da39f
Minor docs cleanup
2015-08-11 16:35:28 +01:00
9dba813234
Remove redundant if-guard
...
The startswith("@") does the job
2015-08-11 16:34:17 +01:00
53a817518b
Comments
2015-08-11 11:40:40 +01:00
6eaa116867
Comment
2015-08-11 11:35:24 +01:00
4762c276cb
Docs
2015-08-11 11:33:41 +01:00
dc8399ee00
Remove debug loggers
2015-08-11 11:30:59 +01:00
1b994a97dd
Fix application of ACLs
2015-08-11 10:41:40 +01:00
10b874067b
Fix state cache
2015-08-11 09:12:41 +01:00
017b798e4f
Clean up StateStore
2015-08-10 15:01:06 +01:00
2c019eea11
Remove unused function
2015-08-10 14:44:41 +01:00
bb0a475c30
Comments
2015-08-10 14:27:38 +01:00
dcefac3b06
Comments
2015-08-10 14:16:24 +01:00
Erik Johnston