Daniel Wagner-Hall
|
f38df51e8d
|
Merge branch 'develop' into daniel/3pidinvites
|
2015-10-15 11:51:55 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Mark Haines
|
f31014b18f
|
Start updating the sync API to match the specification
|
2015-10-01 17:53:07 +01:00 |
|
Daniel Wagner-Hall
|
5b3e9713dd
|
Implement third party identifier invites
|
2015-10-01 17:49:52 +01:00 |
|
Kegan Dougal
|
bad780a197
|
Validate the receipt type before passing it on to the receipt handler
|
2015-10-01 14:01:52 +01:00 |
|
Mark Haines
|
ee2d722f0f
|
Merge pull request #276 from matrix-org/markjh/history_for_rooms_that_have_been_left
SPEC-216: Allow users to view the history of rooms that they have left.
|
2015-09-21 14:38:13 +01:00 |
|
David Baker
|
184a5c81f0
|
Merge pull request #274 from matrix-org/add_threepid_fix
Fix adding threepids to an existing account
|
2015-09-10 10:36:58 +01:00 |
|
David Baker
|
30768dcf40
|
Fix adding threepids to an existing account
|
2015-09-10 10:33:48 +01:00 |
|
Mark Haines
|
3c166a24c5
|
Remove undocumented and unimplemented 'feedback' parameter from the Client-Server API
|
2015-09-09 16:05:09 +01:00 |
|
Mark Haines
|
bc8b25eb56
|
Allow users that have left the room to view the member list from the point they left
|
2015-09-09 15:42:16 +01:00 |
|
Mark Haines
|
a7122692d9
|
Merge branch 'release-v0.10.0' into develop
Conflicts:
synapse/handlers/auth.py
synapse/python_dependencies.py
synapse/rest/client/v1/login.py
|
2015-08-28 11:15:27 +01:00 |
|
Erik Johnston
|
ddf4d2bd98
|
Consistency
|
2015-08-27 10:50:49 +01:00 |
|
Erik Johnston
|
66ec6cf9b8
|
Check for an internationalised filename first
|
2015-08-27 10:48:58 +01:00 |
|
Erik Johnston
|
53c2eed862
|
None check the correct variable
|
2015-08-27 10:38:22 +01:00 |
|
Erik Johnston
|
f02532baad
|
Check for None
|
2015-08-27 10:37:02 +01:00 |
|
Mark Haines
|
c9cb354b58
|
Give a sensible error message if the filename is invalid UTF-8
|
2015-08-26 17:27:23 +01:00 |
|
Mark Haines
|
5a9e0c3682
|
Handle unicode filenames given when downloading or received over federation
|
2015-08-26 17:08:47 +01:00 |
|
Mark Haines
|
e85c7873dc
|
Allow non-ascii filenames for attachments
|
2015-08-26 16:26:37 +01:00 |
|
Daniel Wagner-Hall
|
d3c0e48859
|
Merge erikj/user_dedup to develop
|
2015-08-26 13:42:45 +01:00 |