Erik Johnston
|
259d10f0e4
|
Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into develop
|
2015-10-23 11:11:56 +01:00 |
|
Erik Johnston
|
b0ac0a9438
|
Merge pull request #319 from matrix-org/erikj/filter_refactor
Refactor api.filtering to have a Filter API
|
2015-10-22 13:17:10 +01:00 |
|
Erik Johnston
|
5025ba959f
|
Add config option to disable password login
|
2015-10-22 10:37:04 +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 |
|
Kegan Dougal
|
ede07434e0
|
Use 403 and message to match handlers/auth
|
2015-10-21 09:42:07 +01:00 |
|
Erik Johnston
|
45cd2b0233
|
Refactor api.filtering to have a Filter API
|
2015-10-20 15:33:25 +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
|
68b7fc3e2b
|
Add rooms that the user has left under archived in v2 sync.
|
2015-10-19 17:26:18 +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
|
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 |
|
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
|
bcfb653816
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
|
2015-10-15 16:37:32 +01:00 |
|
Daniel Wagner-Hall
|
f38df51e8d
|
Merge branch 'develop' into daniel/3pidinvites
|
2015-10-15 11:51:55 +01:00 |
|
Mark Haines
|
1a934e8bfd
|
synapse.client.v1.login.LoginFallbackRestServlet and synapse.client.v1.login.PasswordResetRestServlet are unused
|
2015-10-15 11:09:57 +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
|
b68db61222
|
Add logging
|
2015-10-13 17:22:50 +01:00 |
|
Daniel Wagner-Hall
|
17dffef5ec
|
Move event contents into third_party_layout field
|
2015-10-13 15:48:12 +01:00 |
|
Daniel Wagner-Hall
|
32a453d7ba
|
Merge branch 'develop' into daniel/3pidinvites
|
2015-10-13 13:32:43 +01:00 |
|
Erik Johnston
|
f9340ea0d5
|
Merge branch 'erikj/store_engine' into erikj/search
|
2015-10-13 13:29:02 +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 |
|
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 |
|
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
|
f6fde343a1
|
Merge remote-tracking branch 'origin/develop' into erikj/search
|
2015-10-12 15:06:18 +01:00 |
|
Steven Hammerton
|
83b464e4f7
|
Unpack dictionary in for loop for nicer syntax
|
2015-10-12 15:05:34 +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
|
61561b9df7
|
Keep FTS indexes up to date. Only search through rooms currently joined
|
2015-10-12 10:49:53 +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
|
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
|
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
|
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 |
|
Mark Haines
|
e3d3205cd9
|
Update the sync response to match the latest spec
|
2015-10-07 15:55:20 +01:00 |
|
Daniel Wagner-Hall
|
fcd9ba8802
|
Fix lint errors
|
2015-10-06 10:13:05 -05:00 |
|
Mark Haines
|
471555b3a8
|
Move the rooms out into a room_map mapping from room_id to room.
|
2015-10-05 16:39:36 +01:00 |
|
Daniel Wagner-Hall
|
58e6a58eb7
|
Merge branch 'develop' into daniel/3pidinvites
|
2015-10-05 10:33:41 -05:00 |
|