David Baker
|
cf7a40b08a
|
I think this was what was intended...
|
2015-07-21 16:08:00 -07:00 |
|
Erik Johnston
|
90dbd71c13
|
Merge branch 'master' of github.com:matrix-org/synapse into develop
|
2015-07-21 09:25:30 +01:00 |
|
Mark Haines
|
3b5823c74d
|
s/take/claim/ for end to end key APIs
|
2015-07-20 18:23:54 +01:00 |
|
Erik Johnston
|
bde97b988a
|
Merge pull request #204 from illicitonion/develop
Improve naming
|
2015-07-20 14:41:14 +01:00 |
|
Daniel Wagner-Hall
|
53d1174aa9
|
Improve naming
|
2015-07-20 06:32:12 -07:00 |
|
Kegan Dougal
|
ddef5ea126
|
Remove semicolon.
|
2015-07-20 14:02:36 +01:00 |
|
Kegan Dougal
|
b6ee0585bd
|
Parse the ID given to /invite|ban|kick to make sure it looks like a user ID.
|
2015-07-20 13:55:19 +01:00 |
|
Matrix
|
4f973eb657
|
Up default cache size for _RoomStreamChangeCache
|
2015-07-18 19:07:33 +01:00 |
|
Matrix
|
4cab2cfa34
|
Don't do any database hits in receipt handling if from_key == to_key
|
2015-07-18 19:07:12 +01:00 |
|
Erik Johnston
|
b6d4a4c6d8
|
Merge pull request #199 from matrix-org/erikj/receipts
Implement read receipts.
|
2015-07-16 18:18:36 +01:00 |
|
Erik Johnston
|
d155b318d2
|
Merge pull request #203 from matrix-org/erikj/room_creation_presets
Implement presets at room creation
|
2015-07-16 18:18:11 +01:00 |
|
Erik Johnston
|
a2ed7f437c
|
Merge pull request #202 from matrix-org/erikj/power_level_sanity
Change power level semantics.
|
2015-07-16 18:18:04 +01:00 |
|
Erik Johnston
|
c456d17daf
|
Implement specifying custom initial state for /createRoom
|
2015-07-16 15:25:29 +01:00 |
|
David Baker
|
09489499e7
|
pep8 + debug line
|
2015-07-15 19:39:18 +01:00 |
|
David Baker
|
4da05fa0ae
|
Add back in support for remembering parameters submitted to a user-interactive auth call.
|
2015-07-15 19:28:57 +01:00 |
|
Matthew Hodgson
|
8cedf3ce95
|
bump up image quality a bit more as it looks crap
|
2015-07-14 23:53:13 +01:00 |
|
Erik Johnston
|
baa55fb69e
|
Merge pull request #193 from matrix-org/erikj/bulk_persist_event
Add bulk insert events API
|
2015-07-14 10:49:24 +01:00 |
|
Erik Johnston
|
002a44ac1a
|
s/everyone_ops/original_invitees_have_ops/
|
2015-07-14 10:37:42 +01:00 |
|
David Baker
|
62b4b72fe4
|
Close, but no cigar.
|
2015-07-14 10:33:25 +01:00 |
|
Erik Johnston
|
b49a30a972
|
Capitalize contants
|
2015-07-14 10:20:31 +01:00 |
|
Erik Johnston
|
4624d6035e
|
Docs
|
2015-07-14 10:19:07 +01:00 |
|
Erik Johnston
|
d5cc794598
|
Implement presets at room creation
|
2015-07-13 16:56:08 +01:00 |
|
Erik Johnston
|
5989637f37
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts
|
2015-07-13 13:50:57 +01:00 |
|
Erik Johnston
|
016c089f13
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/power_level_sanity
|
2015-07-13 13:48:13 +01:00 |
|
Erik Johnston
|
e5991af629
|
Comments
|
2015-07-13 13:30:43 +01:00 |
|
Erik Johnston
|
17bb9a7eb9
|
Remove commented out code
|
2015-07-10 14:07:57 +01:00 |
|
Erik Johnston
|
a5ea22d468
|
Sanitize power level checks
|
2015-07-10 14:05:38 +01:00 |
|
Erik Johnston
|
7e3b14fe78
|
You shouldn't be able to ban/kick users with higher power levels
|
2015-07-10 14:05:38 +01:00 |
|
Erik Johnston
|
532fcc997a
|
Merge pull request #196 from matrix-org/erikj/room_history
Add ability to restrict room history.
|
2015-07-10 13:47:04 +01:00 |
|
Erik Johnston
|
0b3389bcd2
|
Merge pull request #194 from matrix-org/erikj/bulk_verify_sigs
Implement bulk verify_signed_json API
|
2015-07-10 13:46:53 +01:00 |
|
Erik Johnston
|
0d7f0febf4
|
Uniquely name unique constraint
|
2015-07-10 13:43:03 +01:00 |
|
Erik Johnston
|
b7cb37b189
|
Merge pull request #198 from matrix-org/markjh/client-end-to-end-key-management
Client end to end key management API
|
2015-07-10 13:36:17 +01:00 |
|
Mark Haines
|
a01097d60b
|
Assume that each device for a user has only one of each type of key
|
2015-07-10 13:26:18 +01:00 |
|
Erik Johnston
|
f3049d0b81
|
Small tweaks to SAML2 configuration.
- Add saml2 config docs to default config.
- Use existence of saml2 config to indicate if saml2 should be enabled.
|
2015-07-10 10:50:14 +01:00 |
|
Erik Johnston
|
a887efa07a
|
Add Muthu Subramanian to AUTHORS
|
2015-07-10 10:37:24 +01:00 |
|
Erik Johnston
|
9158ad1abb
|
Merge pull request #201 from EricssonResearch/msba/saml2-develop
Integrate SAML2 basic authentication - uses pysaml2
|
2015-07-10 10:25:56 +01:00 |
|
Erik Johnston
|
b5f0d73ea3
|
Add comment
|
2015-07-09 17:09:26 +01:00 |
|
Erik Johnston
|
ed88720952
|
Handle error slightly better
|
2015-07-09 16:14:46 +01:00 |
|
Erik Johnston
|
f0979afdb0
|
Remove spurious comment
|
2015-07-09 16:02:07 +01:00 |
|
Mark Haines
|
bf0d59ed30
|
Don't bother with a timeout for one time keys on the server.
|
2015-07-09 14:04:03 +01:00 |
|
Erik Johnston
|
c2d08ca62a
|
Integer timestamps
|
2015-07-09 13:15:34 +01:00 |
|
Erik Johnston
|
4019b48aaa
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts
|
2015-07-09 11:55:52 +01:00 |
|
Erik Johnston
|
294dbd712f
|
We don't want semicolons.
|
2015-07-09 11:47:24 +01:00 |
|
Erik Johnston
|
1af188209a
|
Change format of receipts to allow inclusion of data
|
2015-07-09 11:39:30 +01:00 |
|
Muthu Subramanian
|
8cd34dfe95
|
Make SAML2 optional and add some references/comments
|
2015-07-09 13:34:47 +05:30 |
|
Muthu Subramanian
|
d2caa5351a
|
code beautify
|
2015-07-09 12:58:15 +05:30 |
|
Matthew Hodgson
|
fb8d2862c1
|
remove the tls_certificate_chain_path param and simply support tls_certificate_path pointing to a file containing a chain of certificates
|
2015-07-09 00:45:41 +01:00 |
|
Matthew Hodgson
|
8ad2d2d1cb
|
document tls_certificate_chain_path more clearly
|
2015-07-09 00:06:01 +01:00 |
|
Matthew Hodgson
|
f26a3df1bf
|
oops, context.tls_certificate_chain_file() expects a file, not a certificate.
|
2015-07-08 21:33:02 +01:00 |
|
Matthew Hodgson
|
19fa3731ae
|
typo
|
2015-07-08 18:53:41 +01:00 |
|