Mark Haines
|
13a6e9beaf
|
Merge pull request #321 from matrix-org/markjh/v2_sync_typing
Include typing events in initial v2 sync
|
2015-10-21 16:47:19 +01:00 |
|
Mark Haines
|
5201c66108
|
Merge branch 'develop' into markjh/v2_sync_typing
Conflicts:
synapse/handlers/sync.py
|
2015-10-21 15:48:34 +01:00 |
|
Mark Haines
|
e94ffd89d6
|
Merge pull request #316 from matrix-org/markjh/v2_sync_archived
Add rooms that the user has left under archived in v2 sync.
|
2015-10-21 15:46:41 +01:00 |
|
Mark Haines
|
d63a0ca34b
|
Doc string for the SyncHandler.typing_by_room method
|
2015-10-21 15:45:37 +01:00 |
|
Mark Haines
|
e3d75f564a
|
Include banned rooms in the archived section of v2 sync
|
2015-10-21 11:15:48 +01:00 |
|
Kegsay
|
8627048787
|
Merge pull request #318 from matrix-org/syn-502-login-bad-emails
Don't 500 on /login when the email doesn't map to a valid user ID.
|
2015-10-21 10:16:33 +01:00 |
|
Kegan Dougal
|
ede07434e0
|
Use 403 and message to match handlers/auth
|
2015-10-21 09:42:07 +01:00 |
|
Mark Haines
|
7be06680ed
|
Include typing events in initial v2 sync
|
2015-10-20 16:36:20 +01:00 |
|
Daniel Wagner-Hall
|
f510586372
|
Merge branch 'develop' of github.com:matrix-org/synapse into develop
|
2015-10-20 12:00:22 +01:00 |
|
Daniel Wagner-Hall
|
137fafce4e
|
Allow rejecting invites
This is done by using the same /leave flow as you would use if you had
already accepted the invite and wanted to leave.
|
2015-10-20 11:58:58 +01:00 |
|
Kegan Dougal
|
b02a342750
|
Don't 500 when the email doesn't map to a valid user ID.
|
2015-10-20 11:07:50 +01:00 |
|
Mark Haines
|
51d03e65b2
|
Fix pep8
|
2015-10-19 17:48:58 +01:00 |
|
Paul Evans
|
3c7d6202ea
|
Merge pull request #315 from matrix-org/paul/test-vectors
Repeatable unit test of event hashing/signing algorithm
|
2015-10-19 17:47:57 +01:00 |
|
Paul "LeoNerd" Evans
|
9ed784098a
|
Invoke EventBuilder directly instead of going via the EventBuilderFactory
|
2015-10-19 17:42:34 +01:00 |
|
Paul "LeoNerd" Evans
|
531e3aa75e
|
Capture __init__.py
|
2015-10-19 17:37:35 +01:00 |
|
Mark Haines
|
68b7fc3e2b
|
Add rooms that the user has left under archived in v2 sync.
|
2015-10-19 17:26:18 +01:00 |
|
Daniel Wagner-Hall
|
9261ef3a15
|
Merge pull request #312 from matrix-org/daniel/3pidinvites
Stuff signed data in a standalone object
|
2015-10-19 15:52:34 +01:00 |
|
Paul "LeoNerd" Evans
|
a8795c9644
|
Use assertIn() instead of assertTrue on the 'in' operator
|
2015-10-19 15:24:49 +01:00 |
|
Paul "LeoNerd" Evans
|
07b58a431f
|
Another signing test vector using an 'm.room.message' with content, so that the implementation will have to redact it
|
2015-10-19 15:00:52 +01:00 |
|
Paul "LeoNerd" Evans
|
0aab34004b
|
Initial minimial hack at a test of event hashing and signing
|
2015-10-19 14:40:15 +01:00 |
|
Erik Johnston
|
e0bf0258ee
|
Merge pull request #307 from matrix-org/erikj/search
Add basic search API
|
2015-10-19 13:37:15 +01:00 |
|
Paul Evans
|
ae3082dd31
|
Merge pull request #313 from matrix-org/paul/tiny-fixes
Surely we don't need to preserve 'events_default' twice
|
2015-10-16 19:14:19 +01:00 |
|
Paul "LeoNerd" Evans
|
243a79d291
|
Surely we don't need to preserve 'events_default' twice
|
2015-10-16 18:25:19 +01:00 |
|
Mark Haines
|
9371a35e89
|
Merge pull request #306 from matrix-org/markjh/unused_methods
Remove some login classes from synapse.
|
2015-10-16 18:18:41 +01:00 |
|
Daniel Wagner-Hall
|
0e5239ffc3
|
Stuff signed data in a standalone object
Makes both generating it in sydent, and verifying it here, simpler at
the cost of some repetition
|
2015-10-16 17:45:48 +01:00 |
|
Mark Haines
|
b19b9535f6
|
Merge pull request #310 from matrix-org/markjh/bcrypt_rounds
Add config for how many bcrypt rounds to use for password hashes
|
2015-10-16 17:05:21 +01:00 |
|
Erik Johnston
|
46d39343d9
|
Explicitly check for Sqlite3Engine
|
2015-10-16 16:58:00 +01:00 |
|
Erik Johnston
|
f2d698cb52
|
Typing
|
2015-10-16 16:46:48 +01:00 |
|
Erik Johnston
|
33646eb000
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
|
2015-10-16 15:35:35 +01:00 |
|
Erik Johnston
|
524b708f98
|
Merge pull request #311 from matrix-org/markjh/postgres_fixes
Fix FilteringStore.get_user_filter to work with postgres
|
2015-10-16 15:35:26 +01:00 |
|
Erik Johnston
|
380f148db7
|
Remove unused import
|
2015-10-16 15:32:56 +01:00 |
|
Mark Haines
|
fc012aa8dc
|
Fix FilteringStore.get_user_filter to work with postgres
|
2015-10-16 15:28:43 +01:00 |
|
Daniel Wagner-Hall
|
e5acc8a47b
|
Merge pull request #302 from matrix-org/daniel/3pidinvites
Implement third party identifier invites
|
2015-10-16 15:23:30 +01:00 |
|
Erik Johnston
|
d4b5621e0a
|
Remove duplicate _filter_events_for_client
|
2015-10-16 15:19:52 +01:00 |
|
Erik Johnston
|
23ed7dc0e7
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
|
2015-10-16 15:18:42 +01:00 |
|
Erik Johnston
|
315b03b58d
|
Merge pull request #309 from matrix-org/erikj/_filter_events_for_client
Amalgamate _filter_events_for_client
|
2015-10-16 15:18:32 +01:00 |
|
Daniel Wagner-Hall
|
c225d63e9e
|
Add signing host and keyname to signatures
|
2015-10-16 15:07:56 +01:00 |
|
Daniel Wagner-Hall
|
b8dd5b1a2d
|
Verify third party ID server certificates
|
2015-10-16 14:54:54 +01:00 |
|
Erik Johnston
|
366af6b73a
|
Amalgamate _filter_events_for_client
|
2015-10-16 14:52:48 +01:00 |
|
Mark Haines
|
f2f031fd57
|
Add config for how many bcrypt rounds to use for password hashes
By default we leave it at the default value of 12. But now we can reduce
it for preparing users for loadtests or running integration tests.
|
2015-10-16 14:52:08 +01:00 |
|
Erik Johnston
|
12122bfc36
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
|
2015-10-16 14:46:32 +01:00 |
|
Erik Johnston
|
edb998ba23
|
Explicitly check for Sqlite3Engine
|
2015-10-16 14:37:14 +01:00 |
|
Mark Haines
|
5df54de801
|
Merge pull request #308 from matrix-org/markjh/v2_filter_encoding
Encode the filter JSON as UTF-8 before storing in the database.
|
2015-10-16 13:41:31 +01:00 |
|
Erik Johnston
|
b62da463e1
|
docstring
|
2015-10-16 11:52:16 +01:00 |
|
Erik Johnston
|
3cf9948b8d
|
Add docstring
|
2015-10-16 11:28:12 +01:00 |
|
Erik Johnston
|
73260ad01f
|
Comment on the LIMIT 500
|
2015-10-16 11:24:02 +01:00 |
|
Erik Johnston
|
22a8c91448
|
Split up run_upgrade
|
2015-10-16 11:19:44 +01:00 |
|
Mark Haines
|
6296590bf7
|
Encode the filter JSON as UTF-8 before storing in the database.
Because we are using a binary column type to store the filter JSON.
|
2015-10-16 10:50:32 +01:00 |
|
Erik Johnston
|
bcfb653816
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
|
2015-10-15 16:37:32 +01:00 |
|
Daniel Wagner-Hall
|
6ffbcf45c6
|
Use non-placeholder name for endpoint
|
2015-10-15 13:12:52 +01:00 |
|