Erik Johnston
|
5c41224a89
|
Filter room ids before hitting the database
|
2015-10-21 10:09:26 +01:00 |
|
Erik Johnston
|
c8baada94a
|
Filter search results
|
2015-10-21 10:08:53 +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 |
|
Erik Johnston
|
e0bf0258ee
|
Merge pull request #307 from matrix-org/erikj/search
Add basic search API
|
2015-10-19 13:37:15 +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
|
33646eb000
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
|
2015-10-16 15:35:35 +01:00 |
|
Erik Johnston
|
380f148db7
|
Remove unused import
|
2015-10-16 15:32:56 +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 |
|
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
|
b62da463e1
|
docstring
|
2015-10-16 11:52:16 +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 |
|
Daniel Wagner-Hall
|
643b5fcdc8
|
Look for keys on the right objects
|
2015-10-15 13:10:30 +01:00 |
|
Daniel Wagner-Hall
|
f38df51e8d
|
Merge branch 'develop' into daniel/3pidinvites
|
2015-10-15 11:51:55 +01:00 |
|
Mark Haines
|
a059760954
|
Merge pull request #305 from matrix-org/markjh/v2_sync_api
Update the v2 sync API to work as specified in the current spec.
|
2015-10-14 13:56:23 +01:00 |
|
Mark Haines
|
c185c1c413
|
Fix v2 sync polling
|
2015-10-14 13:16:53 +01:00 |
|
Erik Johnston
|
8c9df8774e
|
Make 'keys' optional
|
2015-10-14 10:35:50 +01:00 |
|
Erik Johnston
|
1d9e109820
|
More TODO markers
|
2015-10-14 09:49:00 +01:00 |
|
Erik Johnston
|
d25b0f65ea
|
Add TODO markers
|
2015-10-14 09:46:31 +01:00 |
|
Erik Johnston
|
858634e1d0
|
Remove unused room_id arg
|
2015-10-14 09:31:20 +01:00 |
|
Daniel Wagner-Hall
|
0c38e8637f
|
Remove unnecessary class-wrapping
|
2015-10-13 18:00:38 +01:00 |
|
Daniel Wagner-Hall
|
14edea1aff
|
Move logic into handler
|
2015-10-13 17:47:58 +01:00 |
|
Daniel Wagner-Hall
|
bb407cd624
|
Re-add accidentally removed code
|
2015-10-13 17:19:26 +01:00 |
|
Daniel Wagner-Hall
|
17dffef5ec
|
Move event contents into third_party_layout field
|
2015-10-13 15:48:12 +01:00 |
|
Erik Johnston
|
3e2a1297b5
|
Remove constraints in preperation of using filters
|
2015-10-13 15:22:14 +01:00 |
|
Mark Haines
|
cacf0688c6
|
Add a get_invites_for_user method to the storage to find out the rooms a user is invited to
|
2015-10-13 14:08:38 +01:00 |
|
Daniel Wagner-Hall
|
32a453d7ba
|
Merge branch 'develop' into daniel/3pidinvites
|
2015-10-13 13:32:43 +01:00 |
|
Mark Haines
|
54414221e4
|
Include invites in incremental sync
|
2015-10-13 11:43:12 +01:00 |
|
Mark Haines
|
ab9cf73258
|
Include invited rooms in the initial sync
|
2015-10-13 11:03:48 +01:00 |
|
Erik Johnston
|
30c2783d2f
|
Search left rooms too
|
2015-10-13 10:36:36 +01:00 |
|
Mark Haines
|
f96b480670
|
Merge branch 'develop' into markjh/v2_sync_api
|
2015-10-13 10:33:00 +01:00 |
|
Mark Haines
|
956509dfec
|
Start spliting out the rooms into joined and invited in v2 sync
|
2015-10-13 10:24:51 +01:00 |
|
Mark Haines
|
586beb8318
|
Update the filters to match the latest spec.
Apply the filter the 'timeline' and 'ephemeral' keys of rooms.
Apply the filter to the 'presence' key of a sync response.
|
2015-10-12 16:54:58 +01:00 |
|
Erik Johnston
|
ca53ad7425
|
Filter events to only thsoe that the user is allowed to see
|
2015-10-12 15:52:55 +01:00 |
|
Erik Johnston
|
f6fde343a1
|
Merge remote-tracking branch 'origin/develop' into erikj/search
|
2015-10-12 15:06:18 +01:00 |
|
Erik Johnston
|
927004e349
|
Remove unused room_id parameter
|
2015-10-12 15:06:14 +01:00 |
|
Mark Haines
|
54cb509d64
|
Merge pull request #296 from matrix-org/markjh/eventstream_presence
Split the sections of EventStreamHandler.get_stream that handle presence
|
2015-10-12 14:48:09 +01:00 |
|
Mark Haines
|
885301486c
|
Merge pull request #297 from matrix-org/markjh/presence_races
Fix some races in the synapse presence handler caused by not yielding…
|
2015-10-12 14:47:53 +01:00 |
|
Erik Johnston
|
ae72e247fa
|
PEP8
|
2015-10-12 10:50:46 +01:00 |
|
Erik Johnston
|
61561b9df7
|
Keep FTS indexes up to date. Only search through rooms currently joined
|
2015-10-12 10:49:53 +01:00 |
|
Steven Hammerton
|
22112f8d14
|
Formatting changes
|
2015-10-10 10:49:42 +01:00 |
|
Steven Hammerton
|
c33f5c1a24
|
Provide ability to login using CAS
|
2015-10-10 10:49:42 +01:00 |
|
Mark Haines
|
1a46daf621
|
Merge branch 'markjh/presence_races' into markjh/v2_sync_api
|
2015-10-09 20:02:30 +01:00 |
|
Mark Haines
|
987803781e
|
Fix some races in the synapse presence handler caused by not yielding on deferreds
|
2015-10-09 19:59:50 +01:00 |
|
Mark Haines
|
af7b214476
|
Merge branch 'markjh/eventstream_presence' into markjh/v2_sync_api
|
2015-10-09 19:18:09 +01:00 |
|
Mark Haines
|
1b9802a0d9
|
Split the sections of EventStreamHandler.get_stream that handle presence
into separate functions.
This makes the code a bit easier to read, and means that we can reuse
the logic when implementing the v2 sync API.
|
2015-10-09 19:13:08 +01:00 |
|