Erik Johnston
bf575ae20e
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2017-03-09 10:40:54 +00:00
Erik Johnston
929b005999
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2017-03-09 10:40:47 +00:00
David Baker
663396e45d
Merge pull request #1971 from matrix-org/dbkr/msisdn_signin
...
Support registration & login with phone number
2017-03-09 10:18:51 +00:00
David Baker
0e0aee25c4
Fix log line
2017-03-08 11:46:22 +00:00
David Baker
88df6c0c9a
Factor out msisdn canonicalisation
...
Plus a couple of other minor fixes
2017-03-08 11:03:39 +00:00
David Baker
402a7bf63d
Fix pep8
2017-03-08 09:33:40 +00:00
Erik Johnston
f2581ee8b8
Don't keep around old stream IDs forever
2017-03-03 16:02:53 +00:00
Erik Johnston
9834367eea
Spelling
2017-03-03 15:31:57 +00:00
David Baker
ad882cd54d
Just return the deferred straight off
...
defer.returnValue doth not maketh a generator: it would need a
yield to be a generator, and this doesn't need a yield.
2017-03-01 18:08:51 +00:00
David Baker
3557cf34dc
Merge remote-tracking branch 'origin/develop' into dbkr/msisdn_signin
2017-03-01 17:20:37 +00:00
Erik Johnston
36be39b8b3
Fix device list update to not constantly resync
2017-03-01 14:12:11 +00:00
Erik Johnston
f2c9e51d28
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2017-02-28 14:11:07 +00:00
Erik Johnston
848cf95ea0
Pop with default value to stop throwing
2017-02-28 10:02:54 +00:00
Erik Johnston
64a2cef9bb
Pop rather than del from dict
2017-02-27 19:15:36 +00:00
Matrix
8d910ff5b9
Local changes
2017-02-24 16:01:57 +00:00
Erik Johnston
cff886c47b
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2017-02-21 14:01:45 +00:00
Erik Johnston
17673404fb
Remove unused param
2017-02-20 15:02:01 +00:00
Erik Johnston
7f026792e1
Fix /context/ visibiltiy rules
2017-02-20 14:54:50 +00:00
David Baker
8c87bb550e
Merge pull request #1922 from matrix-org/dbkr/allow_forget_for_ban
...
Allow forgetting rooms you're banned from
2017-02-17 10:52:30 +00:00
Erik Johnston
c97d491649
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2017-02-16 15:12:52 +00:00
David Baker
474c9aadbe
Allow forgetting rooms you're banned from
2017-02-15 19:32:20 +00:00
Erik Johnston
3b42bb96e4
Merge commit ' d7457c7661' of github.com:matrix-org/synapse into matrix-org-hotfixes
2017-02-15 10:17:01 +00:00
Erik Johnston
738000971e
Merge branch 'develop' into matrix-org-hotfixes
2017-02-15 09:54:09 +00:00
David Baker
ce3e583d94
WIP support for msisdn 3pid proxy methods
2017-02-14 15:05:55 +00:00
Richard van der Hoff
fc2f29c1d0
Fix bugs in the /keys/changes api
...
* `get_forward_extremeties_for_room` takes a numeric `stream_ordering`. We were
passing a `RoomStreamToken`, which meant that it returned the *current*
extremities, rather than those corresponding to the `from_token`. However:
* `get_state_ids_for_events` required a second ('types') parameter; this meant
that a `TypeError` was thrown and we ended up acting as though there was *no*
prev state.
* `get_state_ids_for_events` actually returns a map from event_id to state
dictionary - just looking up the state keys in it again meant that we acted
as though there was no prev state. We now check if each member's state has
changed since *any* of the extremities.
Also add/fix some comments.
2017-02-14 13:59:50 +00:00
Erik Johnston
9e617cd4c2
Cache get_presence storage
2017-02-13 13:50:03 +00:00
Erik Johnston
af6da6db2d
Merge pull request #1784 from morteza-araby/user-admin
...
Administration functionalities
2017-02-06 16:21:10 +01:00
Erik Johnston
83c7b8ec91
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2017-02-02 19:26:05 +00:00
Erik Johnston
a597994fb6
Measure new device list stuff
2017-02-02 18:36:17 +00:00
Erik Johnston
1232ae41cf
Use new get_users_who_share_room_with_user
2017-02-02 15:25:00 +00:00
Erik Johnston
99fa03e8b5
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/device_list_fixes
2017-02-02 15:23:45 +00:00
Erik Johnston
a8331897aa
Merge pull request #1876 from matrix-org/erikj/shared_member_store
...
Make presence.get_new_events a bit faster
2017-02-02 15:20:14 +00:00
Erik Johnston
46ecd9fd6d
Use stream_ordering_to_exterm for /keys/changes
2017-02-02 14:27:19 +00:00
Erik Johnston
54a79c1d37
Make presence.get_new_events a bit faster
...
We do this by caching the set of users a user shares rooms with.
2017-02-02 13:07:18 +00:00
Morteza Araby
2849d3f29d
admin,storage: added more administrator functionalities
...
administrators can now:
- Set displayname of users
- Update user avatars
- Search for users by user_id
- Browse all users in a paginated API
- Reset user passwords
- Deactivate users
Helpers for doing paginated queries has also been added to storage
Signed-off-by: Morteza Araby <morteza.araby@ericsson.com>
2017-02-02 14:02:26 +01:00
Erik Johnston
51adaac953
Fix email push in pusher worker
...
This was broken when device list updates were implemented, as Mailer
could no longer instantiate an AuthHandler due to a dependency on
federation sending.
2017-02-02 10:53:36 +00:00
Erik Johnston
f57cb21952
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2017-02-02 09:30:20 +00:00
Erik Johnston
fbfe44bb4d
Doc args
2017-02-01 17:52:57 +00:00
Erik Johnston
7e919bdbd0
Include newly joined users in /keys/changes API
2017-02-01 17:33:16 +00:00
Erik Johnston
6d6591880e
Wake sync up for device changes
2017-02-01 15:15:16 +00:00
Erik Johnston
4abecb7b02
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2017-02-01 14:33:28 +00:00
Erik Johnston
97479d0c54
Implement /keys/changes
2017-02-01 10:30:03 +00:00
Erik Johnston
bfb3d255b1
Merge pull request #1862 from matrix-org/erikj/presence_update
...
Use DB cache of joined users for presence
2017-01-31 13:23:24 +00:00
Erik Johnston
010159365c
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2017-01-31 11:20:51 +00:00
Erik Johnston
c7a26b7c32
Fix unit tests
2017-01-30 17:11:24 +00:00
Erik Johnston
fd1c18c088
Use DB cache of joined users for presence
2017-01-30 17:00:24 +00:00
Erik Johnston
c2c9a78db9
Noop device key changes if they're the same
2017-01-30 16:55:04 +00:00
Erik Johnston
828db669ec
Use get_users_in_room and declare it iterable
2017-01-30 16:37:22 +00:00
Erik Johnston
717e4448c4
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2017-01-30 14:36:46 +00:00
Erik Johnston
9636b2407d
Merge pull request #1857 from matrix-org/erikj/device_list_stream
...
Implement device lists updates over federation
2017-01-30 14:35:21 +00:00
