Daniel Wagner-Hall
|
9fc0aad567
|
Merge branch 'master' into daniel/insecureclient
|
2015-09-15 15:42:44 +01:00 |
|
Daniel Wagner-Hall
|
2c746382e0
|
Merge branch 'daniel/insecureclient' into develop
|
2015-09-09 14:27:30 +01:00 |
|
Daniel Wagner-Hall
|
ddfe30ba83
|
Better document the intent of the insecure SSL setting
|
2015-09-09 13:26:23 +01:00 |
|
Daniel Wagner-Hall
|
6485f03d91
|
Fix random formatting
|
2015-09-09 13:05:00 +01:00 |
|
Daniel Wagner-Hall
|
81a93ddcc8
|
Allow configuration to ignore invalid SSL certs
This will be useful for sytest, and sytest only, hence the aggressive
config key name.
|
2015-09-09 12:02:07 +01:00 |
|
Erik Johnston
|
2ff439cff7
|
Bump version/changelog
|
2015-09-08 11:01:48 +01:00 |
|
Mark Haines
|
73e4ad4b8b
|
Merge branch 'master' into develop
Conflicts:
setup.py
|
2015-09-07 15:06:46 +01:00 |
|
Erik Johnston
|
1002bbd732
|
Change log level to info
|
2015-09-03 09:51:01 +01:00 |
|
Erik Johnston
|
9ad38c9807
|
Bump version and changelog
|
2015-09-03 09:49:54 +01:00 |
|
Erik Johnston
|
fd0a919af3
|
Lists use 'append'
|
2015-09-02 17:27:59 +01:00 |
|
Erik Johnston
|
e90f32646f
|
Bump version and changelog
|
2015-09-02 17:17:40 +01:00 |
|
Daniel Wagner-Hall
|
77580addc3
|
Merge pull request #262 from matrix-org/redactyoself
Allow users to redact their own events
|
2015-09-02 10:02:36 +01:00 |
|
Mark Haines
|
57df6fffa7
|
Use the version of "matrix-angular-sdk" hosted on pypi
|
2015-09-01 14:47:57 +01:00 |
|
Erik Johnston
|
b62c1395d6
|
Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop
|
2015-09-01 13:11:55 +01:00 |
|
Erik Johnston
|
9c8eb4a809
|
Merge pull request #261 from matrix-org/erikj/scripts_clean
Clean up scripts/
|
2015-09-01 11:55:26 +01:00 |
|
Daniel Wagner-Hall
|
b854a375b0
|
Check domain of events properly
Federated servers still need to delegate authority to owning servers
|
2015-09-01 11:53:31 +01:00 |
|
Erik Johnston
|
cd800ad99a
|
Lower size of 'stateGroupCache' now that we have data from matrix.org to support doing so
|
2015-09-01 10:09:03 +01:00 |
|
Matthew Hodgson
|
d71af2ee12
|
don't log the whole DB config (including postgres password...)
|
2015-08-29 22:23:21 +01:00 |
|
Daniel Wagner-Hall
|
b143641b20
|
Merge pull request #258 from matrix-org/slowtestsmakemesad
Swap out bcrypt for md5 in tests
|
2015-08-28 15:42:25 +01:00 |
|
Daniel Wagner-Hall
|
4d1ea40008
|
Merge branch 'develop' into redactyoself
Conflicts:
synapse/handlers/_base.py
|
2015-08-28 15:35:39 +01:00 |
|
Daniel Wagner-Hall
|
8256a8ece7
|
Allow users to redact their own events
|
2015-08-28 15:31:49 +01:00 |
|
Mark Haines
|
a7122692d9
|
Merge branch 'release-v0.10.0' into develop
Conflicts:
synapse/handlers/auth.py
synapse/python_dependencies.py
synapse/rest/client/v1/login.py
|
2015-08-28 11:15:27 +01:00 |
|
Erik Johnston
|
b442217d91
|
Actually add config path
|
2015-08-28 10:37:17 +01:00 |
|
Erik Johnston
|
5371c2a1f7
|
Bump version and changelog
|
2015-08-27 11:21:11 +01:00 |
|
Erik Johnston
|
ddf4d2bd98
|
Consistency
|
2015-08-27 10:50:49 +01:00 |
|
Erik Johnston
|
66ec6cf9b8
|
Check for an internationalised filename first
|
2015-08-27 10:48:58 +01:00 |
|
Erik Johnston
|
53c2eed862
|
None check the correct variable
|
2015-08-27 10:38:22 +01:00 |
|
Erik Johnston
|
f02532baad
|
Check for None
|
2015-08-27 10:37:02 +01:00 |
|
Erik Johnston
|
25b32b63ae
|
Bump changelog and version
|
2015-08-27 10:09:32 +01:00 |
|
Mark Haines
|
c9cb354b58
|
Give a sensible error message if the filename is invalid UTF-8
|
2015-08-26 17:27:23 +01:00 |
|
Mark Haines
|
5a9e0c3682
|
Handle unicode filenames given when downloading or received over federation
|
2015-08-26 17:08:47 +01:00 |
|
Mark Haines
|
e85c7873dc
|
Allow non-ascii filenames for attachments
|
2015-08-26 16:26:37 +01:00 |
|
Daniel Wagner-Hall
|
86fac9c95e
|
Remove unused import
|
2015-08-26 16:03:17 +01:00 |
|
Daniel Wagner-Hall
|
3063383547
|
Swap out bcrypt for md5 in tests
This reduces our ~8 second sequential test time down to ~7 seconds
|
2015-08-26 15:59:32 +01:00 |
|
Daniel Wagner-Hall
|
d3c0e48859
|
Merge erikj/user_dedup to develop
|
2015-08-26 13:42:45 +01:00 |
|
Erik Johnston
|
da51acf0e7
|
Remove needless existence checks
|
2015-08-26 11:08:23 +01:00 |
|
Erik Johnston
|
f4d552589e
|
Don't loop over all rooms ever in typing.get_new_events_for_user
|
2015-08-26 10:51:08 +01:00 |
|
Erik Johnston
|
90fde4b8d7
|
Bump changelog and version
|
2015-08-25 17:49:58 +01:00 |
|
Erik Johnston
|
0de2aad061
|
Merge pull request #250 from matrix-org/erikj/generated_directory
Add config option to specify where generated files should be dumped
|
2015-08-25 17:40:19 +01:00 |
|
Erik Johnston
|
3f6f74686a
|
Update config doc
|
2015-08-25 17:37:21 +01:00 |
|
Erik Johnston
|
82145912c3
|
s/--generated-directory/--keys-directory/
|
2015-08-25 17:31:22 +01:00 |
|
Daniel Wagner-Hall
|
a2355fae7e
|
Merge pull request #251 from matrix-org/removeadmin
Stop looking up "admin", which we never read
|
2015-08-25 17:23:05 +01:00 |
|
Daniel Wagner-Hall
|
ee3fa1a99c
|
Merge pull request #248 from matrix-org/deviceid
Remove completely unused concepts from codebase
|
2015-08-25 17:19:06 +01:00 |
|
Erik Johnston
|
3e1029fe80
|
Warn if we encounter unexpected files in config directories
|
2015-08-25 17:08:23 +01:00 |
|
Erik Johnston
|
af7c1397d1
|
Add config option to specify where generated files should be dumped
|
2015-08-25 16:58:01 +01:00 |
|
Daniel Wagner-Hall
|
460cad7c11
|
Merge branch 'deviceid' into removeadmin
|
2015-08-25 16:37:59 +01:00 |
|
Daniel Wagner-Hall
|
825f0875bc
|
Fix up one more reference
|
2015-08-25 16:37:37 +01:00 |
|
Daniel Wagner-Hall
|
a9d8bd95e7
|
Stop looking up "admin", which we never read
|
2015-08-25 16:29:39 +01:00 |
|
Erik Johnston
|
bfb66773a4
|
Allow specifying directories as config files
|
2015-08-25 16:25:54 +01:00 |
|
Daniel Wagner-Hall
|
57619d6058
|
Re-wrap line
|
2015-08-25 16:25:46 +01:00 |
|