Erik Johnston
|
5006c4b30d
|
Merge pull request #1005 from matrix-org/erikj/linearize_joins
Only process one local membership event per room at a time
|
2016-08-12 10:14:12 +01:00 |
|
Erik Johnston
|
448ac6cf0d
|
Only process one local membership event per room at a time
|
2016-08-12 09:32:19 +01:00 |
|
Erik Johnston
|
832799dbff
|
Merge pull request #997 from Half-Shot/develop
Don't change status_msg on /sync
|
2016-08-11 14:10:55 +01:00 |
|
Will Hunt
|
5b5148b7ec
|
Synced up synchrotron set_state with PresenceHandler set_state
|
2016-08-11 11:48:30 +01:00 |
|
Erik Johnston
|
c9c1541fd0
|
Merge pull request #1003 from matrix-org/erikj/redaction_prev_content
Include prev_content in redacted state events
|
2016-08-11 10:41:18 +01:00 |
|
Erik Johnston
|
1d40373c9d
|
Include prev_content in redacted state events
|
2016-08-11 10:24:41 +01:00 |
|
Erik Johnston
|
5202679edc
|
Merge pull request #1000 from matrix-org/erikj/contexts
Clean up TransactionQueue
|
2016-08-11 09:34:12 +01:00 |
|
Erik Johnston
|
c315922b5f
|
PEP8
|
2016-08-10 16:34:10 +01:00 |
|
Erik Johnston
|
ca8abfbf30
|
Clean up TransactionQueue
|
2016-08-10 16:24:16 +01:00 |
|
Erik Johnston
|
5aeadb7414
|
Merge pull request #999 from matrix-org/erikj/measure_more
Measure federation send transaction resources
|
2016-08-10 14:16:14 +01:00 |
|
Erik Johnston
|
c9f724caa4
|
Merge pull request #998 from matrix-org/erikj/pdu_fail_cache
Various federation /event/ improvements
|
2016-08-10 14:09:14 +01:00 |
|
Erik Johnston
|
487bc49bf8
|
Don't stop on 4xx series errors
|
2016-08-10 13:39:12 +01:00 |
|
Erik Johnston
|
739ea29d1e
|
Also check if server is in the room
|
2016-08-10 13:32:23 +01:00 |
|
Erik Johnston
|
ea8c4094db
|
Also pull out rejected events
|
2016-08-10 13:26:13 +01:00 |
|
Erik Johnston
|
7f41bcbeec
|
Correctly auth /event/ requests
|
2016-08-10 13:22:20 +01:00 |
|
Erik Johnston
|
11fdfaf03b
|
Only resign our own events
|
2016-08-10 13:16:58 +01:00 |
|
Will Hunt
|
2510db3e76
|
Don't change status_msg on /sync
|
2016-08-10 12:59:59 +01:00 |
|
Erik Johnston
|
f91df1f761
|
Store if we fail to fetch an event from a destination
|
2016-08-10 11:31:46 +01:00 |
|
Erik Johnston
|
3bc9629be5
|
Measure federation send transaction resources
|
2016-08-10 10:56:38 +01:00 |
|
Erik Johnston
|
d45489474d
|
Merge pull request #996 from matrix-org/erikj/tls_error
Don't print stack traces when failing to get remote keys
|
2016-08-10 10:56:08 +01:00 |
|
Erik Johnston
|
fa1ce4d8ad
|
Don't print stack traces when failing to get remote keys
|
2016-08-10 10:44:37 +01:00 |
|
Richard van der Hoff
|
79ebfbe7c6
|
/login: Respond with a 403 when we get an invalid m.login.token
|
2016-08-09 16:29:28 +01:00 |
|
David Baker
|
cd41c6ece2
|
Merge pull request #995 from matrix-org/rav/clean_up_cas_login
Clean up CAS login code
|
2016-08-09 10:21:56 +01:00 |
|
David Baker
|
27771b2495
|
Merge pull request #994 from matrix-org/rav/fix_cas_login
Fix CAS login
|
2016-08-08 17:47:45 +01:00 |
|
Richard van der Hoff
|
d3250499c1
|
Merge pull request #993 from matrix-org/rav/fix_token_login
Fix token login
|
2016-08-08 17:43:02 +01:00 |
|
Richard van der Hoff
|
a8bcc7274d
|
PEP8
|
2016-08-08 17:20:38 +01:00 |
|
Richard van der Hoff
|
65666fedd5
|
Clean up CAS login code
Remove some apparently unused code.
Clean up parse_cas_response, mostly to catch the exception if the CAS response
isn't valid XML.
|
2016-08-08 17:17:25 +01:00 |
|
Richard van der Hoff
|
0682ca04b3
|
Fix CAS login
Attempting to log in with CAS was giving a 500 error.
|
2016-08-08 17:01:30 +01:00 |
|
Richard van der Hoff
|
6fe6a6f029
|
Fix login with m.login.token
login with token (as used by CAS auth) was broken by 067596d, such that it
always returned a 401.
|
2016-08-08 16:40:39 +01:00 |
|
Erik Johnston
|
d330d45e2d
|
Merge branch 'release-v0.17.0' of github.com:matrix-org/synapse
|
2016-08-08 13:38:13 +01:00 |
|
Erik Johnston
|
ccd4290777
|
Capatailize HTML
|
2016-08-08 13:18:58 +01:00 |
|
Erik Johnston
|
9cb42507f8
|
Be bolder
|
2016-08-08 13:17:28 +01:00 |
|
Erik Johnston
|
d960910c72
|
Update changelog
|
2016-08-08 13:06:22 +01:00 |
|
Erik Johnston
|
b46b8a5efb
|
Update changelog
|
2016-08-08 11:34:33 +01:00 |
|
Erik Johnston
|
27fe3e2d4f
|
Bump changelog and version
|
2016-08-08 11:31:12 +01:00 |
|
Erik Johnston
|
3410142741
|
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0
|
2016-08-08 11:24:53 +01:00 |
|
Erik Johnston
|
e7674eb759
|
Merge pull request #992 from matrix-org/erikj/psutil_conditional
Make psutil optional
|
2016-08-08 11:24:11 +01:00 |
|
Erik Johnston
|
7c1a92274c
|
Make psutil optional
|
2016-08-08 11:12:21 +01:00 |
|
Erik Johnston
|
f5deaff424
|
Merge pull request #991 from matrix-org/erikj/retry_make
Retry joining via other servers if first one failed. Fix some other bugs.
|
2016-08-05 18:21:27 +01:00 |
|
Erik Johnston
|
5f360182c6
|
Fix a couple of python bugs
|
2016-08-05 18:08:32 +01:00 |
|
Erik Johnston
|
46453bfc2f
|
Retry joining via other servers if first one failed
|
2016-08-05 18:02:03 +01:00 |
|
Erik Johnston
|
6bf6bc1d1d
|
Merge pull request #990 from matrix-org/erikj/fed_vers
Add federation /version API
|
2016-08-05 16:59:16 +01:00 |
|
Erik Johnston
|
f45be05305
|
Print newline after result in federation_client script
|
2016-08-05 16:46:14 +01:00 |
|
Erik Johnston
|
24f36469bc
|
Add federation /version API
|
2016-08-05 16:36:07 +01:00 |
|
Erik Johnston
|
597c79be10
|
Change the way we specify if we require auth or not
|
2016-08-05 16:17:04 +01:00 |
|
Erik Johnston
|
e6021c370e
|
Merge pull request #989 from matrix-org/erikj/raise_404
Raise 404 when couldn't find event
|
2016-08-05 15:54:16 +01:00 |
|
Erik Johnston
|
a8b946decb
|
Raise 404 when couldn't find event
|
2016-08-05 15:31:02 +01:00 |
|
Erik Johnston
|
3f5ac150b2
|
Merge pull request #988 from matrix-org/erikj/ignore_comments_preview
Don't include html comments in description
|
2016-08-05 15:17:14 +01:00 |
|
Erik Johnston
|
5bcccfde6c
|
Don't include html comments in description
|
2016-08-05 14:45:11 +01:00 |
|
Erik Johnston
|
c95dd7a426
|
Update changelog
|
2016-08-05 13:20:25 +01:00 |
|