998a72d4d9
Merge branch 'develop' into markjh/twisted-15
...
Conflicts:
synapse/http/matrixfederationclient.py
2015-08-12 17:21:14 +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
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
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
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
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
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
86eaaa885b
Rename keyargs to args in CacheDescriptor
2015-08-10 13:44:44 +01:00
2cd6cb9f65
Rename keyargs to args in Cache
2015-08-10 10:38:47 +01:00
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
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
9c5385b53a
s/observed/observer/
2015-08-07 19:26:38 +01:00
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
62126c996c
Propogate stale cache errors to calling functions
2015-08-07 19:17:58 +01:00
3213ff630c
Remove unnecessary cache
2015-08-07 19:14:05 +01:00
20addfa358
Change Cache to not use *args in its interface
2015-08-07 18:32:47 +01:00
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
0db40d3e93
Don't complain about extra .pyc files we find while hunting for database schemas
2015-08-07 17:22:11 +01:00
e3c8e2c13c
Add a --generate-keys option
2015-08-07 16:42:27 +01:00
efe60d5e8c
Only print the pidfile path on startup if requested by a commandline flag
2015-08-07 16:36:42 +01:00
63b1eaf32c
Docs
2015-08-06 14:02:50 +01:00
b811c98574
Remove failed deferreds from cache
2015-08-06 14:01:27 +01:00
433314cc34
Re-implement DEBUG_CACHES flag
2015-08-06 14:01:05 +01:00
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
2efb93af52
Merge branch 'erikj/cached_keyword_args' into erikj/cache_deferreds
2015-08-06 13:35:28 +01:00
953dbd28a7
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cached_keyword_args
2015-08-06 13:35:03 +01:00
7eea3e356f
Make @cached cache deferreds rather than the deferreds' values
2015-08-06 13:33:34 +01:00
1e62a3d3a9
Up the cache size for 'get_joined_hosts_for_room' and 'get_users_in_room'
2015-08-05 15:40:40 +01:00
a89559d797
Use LRU cache by default
2015-08-05 15:39:47 +01:00
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
28d07a02e4
Add vector.im as trusted ID server
2015-08-03 15:31:21 +01:00
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
11b0a34074
Use the same reg paths as register v1 for ASes.
...
Namely this means using registration_handler.appservice_register.
2015-07-29 10:00:54 +01:00
c772dffc9f
improve OS X instructions and remove all the leading $'s to make it easier to c+p commands
2015-07-29 09:39:55 +01:00
a4d62ba36a
Fix v2_alpha registration. Add unit tests.
...
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.
2015-07-28 17:34:12 +01:00
c472d6107e
Merge pull request #207 from matrix-org/erikj/generate_local_thumbnails_on_thread
...
Generate local thumbnails on a thread
2015-07-27 14:57:25 +01:00
39e21ea51c
Add support for using keyword arguments with cached functions
2015-07-27 13:57:29 +01:00
2b4f47db9c
Generate local thumbnails on a thread
2015-07-23 14:52:29 +01:00
6886bba988
Merge pull request #205 from matrix-org/erikj/pick_largest_thumbnail
...
Pick larger than desired thumbnail for 'crop'
2015-07-23 11:16:02 +01:00
103e1c2431
Pick larger than desired thumbnail for 'crop'
2015-07-23 11:12:49 +01:00
4e2e67fd50
Disable receipts for now
2015-07-22 16:13:46 +01:00
a56eccbbfc
Query for all the ones we were asked about, not just the last...
2015-07-21 16:38:16 -07:00
20c0324e9c
Dodesn't seem to make any difference: guess it does work with the object reference
2015-07-21 16:21:37 -07:00
cf7a40b08a
I think this was what was intended...
2015-07-21 16:08:00 -07:00
Mark Haines