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
|
427943907f
|
Merge pull request #299 from stevenhammerton/sh-cas-required-attribute
SH CAS Required Attribute
|
2015-10-12 16:08:34 +01:00 |
|
Steven Hammerton
|
739464fbc5
|
Add a comment to clarify why we split on closing curly brace when reading CAS attribute tags
|
2015-10-12 16:02:17 +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 |
|
Steven Hammerton
|
83b464e4f7
|
Unpack dictionary in for loop for nicer syntax
|
2015-10-12 15:05:34 +01:00 |
|
Steven Hammerton
|
ab7f9bb861
|
Default cas_required_attributes to empty dictionary
|
2015-10-12 14:58:59 +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 |
|
Steven Hammerton
|
7f8fdc9814
|
Remove not required parenthesis
|
2015-10-12 14:45:24 +01:00 |
|
Steven Hammerton
|
01a5f1991c
|
Support multiple required attributes in CAS response, and in a nicer config format too
|
2015-10-12 14:43:17 +01:00 |
|
Steven Hammerton
|
76421c496d
|
Allow optional config params for a required attribute and it's value, if specified any CAS user must have the given attribute and the value must equal
|
2015-10-12 11:11:49 +01:00 |
|
Steven Hammerton
|
7845f62c22
|
Parse both user and attributes from CAS response
|
2015-10-12 10:55:13 +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 |
|
Matthew Hodgson
|
782f7fb489
|
add steve to authors
|
2015-10-10 18:24:44 +01:00 |
|
Erik Johnston
|
a80ef851f7
|
Fix previous merge to s/version_string/user_agent/
|
2015-10-10 12:35:39 +01:00 |
|
Erik Johnston
|
347aa3c225
|
Merge pull request #295 from stevenhammerton/sh-cas-auth
Provide ability to login using CAS
|
2015-10-10 12:18:33 +01:00 |
|
Steven Hammerton
|
95f7661170
|
Raise LoginError if CasResponse doensn't contain user
|
2015-10-10 10:54:19 +01:00 |
|
Steven Hammerton
|
a9c299c0be
|
Fix my broken line splitting
|
2015-10-10 10:54:19 +01:00 |
|
Steven Hammerton
|
e52f4dc599
|
Use UserId to create FQ user id
|
2015-10-10 10:54:19 +01:00 |
|
Steven Hammerton
|
625e13bfde
|
Add get_raw method to SimpleHttpClient, use this in CAS auth rather than requests
|
2015-10-10 10:54:19 +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
|
0a96a9a023
|
Set the user as online if they start polling the v2 sync
|
2015-10-09 19:57: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 |
|
Mark Haines
|
c15cf6ac06
|
Format the presence events correctly for v2
|
2015-10-09 18:50:15 +01:00 |
|
Erik Johnston
|
c85c912562
|
Add basic full text search impl.
|
2015-10-09 15:48:31 +01:00 |
|
Mark Haines
|
ce19fc0f11
|
Merge pull request #294 from matrix-org/markjh/initial_sync_archived_flag
Add a flag to initial sync to include we want rooms that the user has left
|
2015-10-09 10:32:27 +01:00 |
|
Mark Haines
|
51ef725647
|
Use 'true' rather than '1' for archived flag
|
2015-10-08 18:13:02 +01:00 |
|
Mark Haines
|
dc72021748
|
Add a flag to initial sync to indicate we want rooms that the user has left
|
2015-10-08 17:26:23 +01:00 |
|
Mark Haines
|
dfef2b41aa
|
Update the v2 room sync format to match the current v2 spec
|
2015-10-08 15:17:43 +01:00 |
|
David Baker
|
91482cd6a0
|
Use raw string for regex here, otherwise \b is the backspace character. Fixes displayname matching.
|
2015-10-08 11:22:15 +01:00 |
|
Mark Haines
|
e3d3205cd9
|
Update the sync response to match the latest spec
|
2015-10-07 15:55:20 +01:00 |
|
Daniel Wagner-Hall
|
7c809abe86
|
Merge branch 'develop' into daniel/3pidinvites
|
2015-10-06 10:24:32 -05:00 |
|
Daniel Wagner-Hall
|
db6e1e1fe3
|
Merge pull request #292 from matrix-org/daniel/useragent
Allow synapse's useragent to be customized
|
2015-10-06 10:23:21 -05:00 |
|
Daniel Wagner-Hall
|
61ee72517c
|
Remove merge thinko
|
2015-10-06 10:16:15 -05:00 |
|
Daniel Wagner-Hall
|
1cacc71050
|
Add third party invites to auth_events for joins
|
2015-10-06 10:13:28 -05:00 |
|
Mark Haines
|
fac990a656
|
Merge pull request #293 from matrix-org/markjh/remove_spamy_error_logging
Remove log line that was generated whenever an error was created.
|
2015-10-06 16:13:07 +01:00 |
|
Daniel Wagner-Hall
|
fcd9ba8802
|
Fix lint errors
|
2015-10-06 10:13:05 -05:00 |
|
Mark Haines
|
93cc60e805
|
Remove log line that was generated whenever an error was created. We are now creating error objects that aren't raised so it's probably a bit too confusing to keep
|
2015-10-06 16:10:19 +01:00 |
|
Daniel Wagner-Hall
|
d4bb28c59b
|
Revert "Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_federation""
This reverts commit 34d26d3687.
|
2015-10-06 09:58:21 -05:00 |
|
Daniel Wagner-Hall
|
ca6496c27c
|
Merge branch 'daniel/useragent' into daniel/3pidinvites
|
2015-10-06 09:55:21 -05:00 |
|
Daniel Wagner-Hall
|
492beb62a8
|
Use space not dash as delimiter
|
2015-10-06 09:53:33 -05:00 |
|
Daniel Wagner-Hall
|
e0b466bcfd
|
Use space not dash as delimiter
|
2015-10-06 09:32:26 -05:00 |
|
Daniel Wagner-Hall
|
287c81abf3
|
Merge branch 'develop' into daniel/useragent
|
2015-10-06 09:30:17 -05:00 |
|