David Baker
|
c232780081
|
Merge pull request #456 from matrix-org/store_event_actions
Send unread notification counts
|
2016-01-08 14:47:15 +00:00 |
|
Matthew Hodgson
|
6c28ac260c
|
copyrights
|
2016-01-07 04:26:29 +00:00 |
|
Daniel Wagner-Hall
|
11a974da21
|
Add /_matrix/versions to report supported versions
|
2016-01-06 18:08:52 +00:00 |
|
David Baker
|
442fcc02f7
|
Merge remote-tracking branch 'origin/develop' into store_event_actions
|
2016-01-06 17:28:55 +00:00 |
|
Mark Haines
|
392773ccb2
|
Guest users must be joined to a room to see it in /sync
|
2016-01-06 16:44:13 +00:00 |
|
David Baker
|
c79f221192
|
Add is_guest flag to users db to track whether a user is a guest user or not. Use this so we can run _filter_events_for_client when calculating event_push_actions.
|
2016-01-06 11:38:09 +00:00 |
|
David Baker
|
eb03625626
|
Merge remote-tracking branch 'origin/develop' into store_event_actions
|
2016-01-05 18:39:50 +00:00 |
|
Daniel Wagner-Hall
|
cfd07aafff
|
Allow guests to upgrade their accounts
|
2016-01-05 18:01:18 +00:00 |
|
David Baker
|
c77e7e60fc
|
Only joined rooms have unread_notif_count
|
2016-01-04 15:49:06 +00:00 |
|
David Baker
|
928c575c6f
|
Merge remote-tracking branch 'origin/develop' into store_event_actions
|
2016-01-04 13:39:51 +00:00 |
|
Richard van der Hoff
|
32d9fd0b26
|
Expose /login under r0
The spec says /login should be available at r0 and 'unstable', so make it so.
|
2016-01-02 17:24:28 +00:00 |
|
David Baker
|
140a50f641
|
Merge remote-tracking branch 'origin/develop' into store_event_actions
|
2015-12-22 17:23:35 +00:00 |
|
Mark Haines
|
45a9e0ae0c
|
Allow guest access if the user provides a list of rooms in the filter
|
2015-12-22 10:25:46 +00:00 |
|
David Baker
|
c061b47c57
|
Merge remote-tracking branch 'origin/develop' into store_event_actions
|
2015-12-21 15:30:26 +00:00 |
|
Mark Haines
|
64b6606824
|
Remove accidentally committed debug logging
|
2015-12-21 15:22:03 +00:00 |
|
David Baker
|
42ad49f5b7
|
still very WIP, but now sends unread_notifications_count in the room object on sync (only actually corrrect in a full sync: hardcoded to 0 in incremental syncs).
|
2015-12-16 18:42:09 +00:00 |
|
Mark Haines
|
3ddf0b9722
|
Fix spacing
|
2015-12-14 15:20:59 +00:00 |
|
Mark Haines
|
2acae8300f
|
Fix logging to lie less
|
2015-12-14 15:19:37 +00:00 |
|
Mark Haines
|
28c5181dfe
|
Add commentary for fix in PR#442
|
2015-12-14 14:50:51 +00:00 |
|
Mark Haines
|
070e28e203
|
Combine the prev content tests
|
2015-12-14 14:34:04 +00:00 |
|
Mark Haines
|
834924248f
|
Check whether prev_content or prev_sender is set before trying to rollback state
|
2015-12-14 14:09:21 +00:00 |
|
Mark Haines
|
515548a47a
|
Missing yield
|
2015-12-10 17:54:23 +00:00 |
|
Mark Haines
|
e4bfe50e8f
|
Allow filter JSON object in the filter query parameter in /sync
Documented by matrix-org/matrix-doc#224
|
2015-12-09 12:56:50 +00:00 |
|
Daniel Wagner-Hall
|
7a8ba4c9a0
|
Actually host r0 and unstable prefixes
|
2015-12-08 15:26:52 +00:00 |
|
David Baker
|
9c9b2829ae
|
also do more structured logging
|
2015-12-07 12:01:00 +00:00 |
|
David Baker
|
50e5886de1
|
pep8
|
2015-12-07 11:57:48 +00:00 |
|
David Baker
|
ba1d740239
|
Add logging to pushers API to log the body of the request
|
2015-12-07 11:52:20 +00:00 |
|
Daniel Wagner-Hall
|
41905784f7
|
Take object not bool
Allows bool as legacy fallback
See https://github.com/matrix-org/matrix-doc/pull/212
|
2015-12-07 10:44:33 +00:00 |
|
Daniel Wagner-Hall
|
ac213c2e08
|
Merge pull request #415 from matrix-org/daniel/endpoints
Merge pull request #415 from matrix-org/daniel/endpoints
|
2015-12-03 12:19:12 +00:00 |
|
Daniel Wagner-Hall
|
526bc33e02
|
Fix implementation of /admin/whois
|
2015-12-02 17:29:47 +00:00 |
|
Daniel Wagner-Hall
|
872c134807
|
Update endpoints to reflect current spec
|
2015-12-02 15:45:04 +00:00 |
|
Mark Haines
|
37b2d69bbc
|
Reuse a single http client, rather than creating new ones
|
2015-12-02 11:36:02 +00:00 |
|
Mark Haines
|
95f30ecd1f
|
Add API for setting account_data globaly or on a per room basis
|
2015-12-01 18:41:32 +00:00 |
|
Daniel Wagner-Hall
|
14d7acfad4
|
Host /unstable and /r0 versions of r0 APIs
|
2015-12-01 17:34:32 +00:00 |
|
Mark Haines
|
31069ecf6a
|
Rename presence_handler.send_invite to presence_handler.send_presence_invite to distinguish it from normal invites
|
2015-12-01 15:59:45 +00:00 |
|
Mark Haines
|
c6a15f5026
|
Merge pull request #385 from matrix-org/daniel/forgetrooms
Allow users to forget rooms
|
2015-11-20 18:07:26 +00:00 |
|
Richard van der Hoff
|
1d9c1d4166
|
Merge pull request #389 from matrix-org/rav/flatten_sync_response
v2 sync: Get rid of the event_map, and rename the keys of the rooms obj
|
2015-11-20 15:18:55 +00:00 |
|
Erik Johnston
|
3f151da314
|
Merge pull request #391 from matrix-org/erikj/remove_token_from_flow
Remove m.login.token from advertised flows.
|
2015-11-20 14:16:59 +00:00 |
|
Erik Johnston
|
e3dae653e8
|
Comment
|
2015-11-20 14:05:22 +00:00 |
|
Paul "LeoNerd" Evans
|
dd11bf8a79
|
Merge branch 'develop' into rav/flatten_sync_response
|
2015-11-19 17:21:03 +00:00 |
|
Paul "LeoNerd" Evans
|
1cfda3d2d8
|
Merge branch 'develop' into daniel/forgetrooms
|
2015-11-19 16:53:13 +00:00 |
|
Erik Johnston
|
37de8a7f4a
|
Remove m.login.token from advertised flows.
|
2015-11-19 16:16:49 +00:00 |
|
Richard van der Hoff
|
f6e092f6cc
|
Put back the 'state.events' subobject
We're keeping 'events', in case we decide to add more keys later.
|
2015-11-19 12:23:42 +00:00 |
|
Richard van der Hoff
|
24ae0eee8e
|
v2 /sync: Rename the keys of the 'rooms' object to match member states
joined->join
invited->invite
archived->leave
|
2015-11-19 10:51:12 +00:00 |
|
Richard van der Hoff
|
3c3fc6b268
|
Flatten the /sync response to remove the event_map
|
2015-11-19 10:51:11 +00:00 |
|
Mark Haines
|
1c960fbb80
|
s/private_user_data/account_data/
|
2015-11-18 15:31:04 +00:00 |
|
Daniel Wagner-Hall
|
ba26eb3d5d
|
Allow users to forget rooms
|
2015-11-17 17:17:30 -05:00 |
|
Steven Hammerton
|
f5e25c5f35
|
Merge branch 'develop' into sh-cas-auth-via-homeserver
|
2015-11-17 10:55:41 +00:00 |
|
Daniel Wagner-Hall
|
9c3f4f8dfd
|
Allow guests to /room/:room_id/{join,leave}
|
2015-11-13 11:56:58 +00:00 |
|
Richard van der Hoff
|
e4d622aaaf
|
Implementation of state rollback in /sync
Implementation of SPEC-254: roll back the state dictionary to how it looked at
the start of the timeline.
Merged PR https://github.com/matrix-org/synapse/pull/373
|
2015-11-13 10:58:56 +00:00 |
|