Kegan Dougal
|
c059c9fea5
|
Merge branch 'develop' into application-services
Conflicts:
synapse/handlers/__init__.py
synapse/storage/__init__.py
|
2015-02-02 15:57:59 +00:00 |
|
Erik Johnston
|
4c0da49d7c
|
Resign events when we return them via /query_auth/
|
2015-01-30 22:53:13 +00:00 |
|
Mark Haines
|
0b1cc7cc0b
|
Return empty list rather than None when there are no emphemeral events for a room
|
2015-01-30 16:56:13 +00:00 |
|
Erik Johnston
|
2cd29dbdd9
|
Fix bug where accepting invite over federation didn't work. Add logging.
|
2015-01-30 16:51:58 +00:00 |
|
Erik Johnston
|
7d897f5bfc
|
Merge pull request #43 from matrix-org/rejections
Rejections
|
2015-01-30 16:11:14 +00:00 |
|
Erik Johnston
|
b724a809c4
|
Only auth_events with event if event in event.auth_events
|
2015-01-30 15:57:53 +00:00 |
|
Mark Haines
|
017dfaef4c
|
Add doc string for __nonzero__ overrides for sync results, raise not implemented if the client attempts to do a gapless sync
|
2015-01-30 15:52:05 +00:00 |
|
Mark Haines
|
8fe39a0311
|
Check if the user has joined the room between incremental syncs
|
2015-01-30 13:38:34 +00:00 |
|
Erik Johnston
|
a70a801184
|
Fix bug where we superfluously asked for current state. Change API of /query_auth/ so that we don't duplicate events in the response.
|
2015-01-30 13:34:01 +00:00 |
|
Mark Haines
|
4a67834bc8
|
Pass client info to the sync_config
|
2015-01-30 11:50:15 +00:00 |
|
Mark Haines
|
8498d348d8
|
Fix token formatting
|
2015-01-30 11:42:09 +00:00 |
|
Mark Haines
|
e97de6d96a
|
Filter the recent events before applying the limit when doing an initial sync
|
2015-01-30 11:35:20 +00:00 |
|
Mark Haines
|
22dd1cde2d
|
Filter the recent events before applying the limit when doing an incremental sync with a gap
|
2015-01-30 11:32:35 +00:00 |
|
Erik Johnston
|
2ebf795c0a
|
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
Conflicts:
synapse/storage/__init__.py
synapse/storage/schema/delta/v12.sql
|
2015-01-30 11:10:37 +00:00 |
|
Erik Johnston
|
0c2d245fdf
|
Update the current state of an event if we update auth events.
|
2015-01-30 11:08:52 +00:00 |
|
Erik Johnston
|
c1d860870b
|
Fix regression where we no longer correctly handled the case of gaps in our event graph
|
2015-01-30 10:48:47 +00:00 |
|
Mark Haines
|
ece828a7b7
|
Update todo for the filtering on sync
|
2015-01-29 18:15:24 +00:00 |
|
Erik Johnston
|
78015948a7
|
Initial implementation of auth conflict resolution
|
2015-01-29 16:52:33 +00:00 |
|
Mark Haines
|
4ad45f2582
|
Fix indent
|
2015-01-29 16:41:49 +00:00 |
|
Mark Haines
|
722b65f461
|
Move typing notifs to an "emphermal" event list on the room object
|
2015-01-29 16:41:21 +00:00 |
|
Mark Haines
|
cc42d3f907
|
Fix check for empty room update
|
2015-01-29 16:27:38 +00:00 |
|
Mark Haines
|
4d9dd9bdc0
|
Fix v2 initial sync
|
2015-01-29 16:23:03 +00:00 |
|
Mark Haines
|
e016f4043b
|
Use get_room_events_stream to get changes to the rooms if the number of changes is small
|
2015-01-29 14:40:28 +00:00 |
|
Mark Haines
|
e3e72b8c5c
|
Remove typing TODO
|
2015-01-29 03:35:25 +00:00 |
|
Mark Haines
|
3dbce6f4a5
|
Add typing notifications to sync
|
2015-01-29 03:33:51 +00:00 |
|
Mark Haines
|
9c61556504
|
Merge branch 'develop' into client_v2_sync
|
2015-01-28 17:29:30 +00:00 |
|
Mark Haines
|
26c8fff19e
|
Merge pull request #36 from matrix-org/device_id_from_access_token
Extract the device id and token id from the access token when autheniticating users
|
2015-01-28 17:19:28 +00:00 |
|
Mark Haines
|
388581e087
|
Extract the id token of the token when authing users, include the token and device_id in the internal meta data for the event along with the transaction id when sending events
|
2015-01-28 16:58:23 +00:00 |
|
Erik Johnston
|
0ef5bfd6a9
|
Start implementing auth conflict res
|
2015-01-28 16:16:53 +00:00 |
|
David Baker
|
6840e7cece
|
Merge branch 'master' into develop
|
2015-01-28 16:03:35 +00:00 |
|
David Baker
|
c291a4d522
|
Merge branch 'develop' into pushers
Conflicts:
synapse/handlers/events.py
synapse/server.py
|
2015-01-28 12:51:05 +00:00 |
|
Kegan Dougal
|
42876969b9
|
Add basic application_services SQL, and hook up parts of the appservice store to read from it.
|
2015-01-28 11:59:38 +00:00 |
|
David Baker
|
273b12729b
|
Reset badge count to zero when last active time is bumped
|
2015-01-28 11:55:49 +00:00 |
|
David Baker
|
e32ded7b3e
|
Add matrix.org as a trusted ID server because it's now passed through on ports 80/443 and the web client defaults to that now. Fixes email validation (including signing up with an email address).
|
2015-01-28 10:09:54 +00:00 |
|
Mark Haines
|
e020574d65
|
Fix Formatting
|
2015-01-27 20:19:36 +00:00 |
|
Mark Haines
|
b19cf6a105
|
Wait for events if the incremental sync is empty and a timeout is given
|
2015-01-27 20:09:52 +00:00 |
|
Kegan Dougal
|
fbeaeb8689
|
Log when ASes are registered/unregistered.
|
2015-01-27 17:34:40 +00:00 |
|
Kegan Dougal
|
ec3719b583
|
Use ApplicationService when registering.
|
2015-01-27 17:15:06 +00:00 |
|
Kegan Dougal
|
92171f9dd1
|
Add stub methods, TODOs and docstrings for application services.
|
2015-01-27 16:53:59 +00:00 |
|
Mark Haines
|
a56008842b
|
Start implementing incremental initial sync
|
2015-01-27 16:24:22 +00:00 |
|
David Baker
|
f7c4daa8f9
|
Oops, remove debugging
|
2015-01-27 16:08:47 +00:00 |
|
David Baker
|
5eacaeb4a7
|
or of course we could just return the deferred
|
2015-01-27 16:05:23 +00:00 |
|
David Baker
|
eba89f093f
|
Need a defer.inlineCallbacks here as we yield in it: otherwise nothing in the cb gets executed.
|
2015-01-27 16:00:07 +00:00 |
|
David Baker
|
1d77969124
|
Unbreak bad presence merge - don't add these blocks together with an and: they're different things.
|
2015-01-27 15:58:27 +00:00 |
|
Kegan Dougal
|
51449e0665
|
Add appservice handler and store. Glue together rest > handler > store.
|
2015-01-27 15:50:28 +00:00 |
|
Mark Haines
|
436513068d
|
Start implementing the non-incremental sync portion of the v2 /sync API
|
2015-01-26 18:53:31 +00:00 |
|
Mark Haines
|
3186c5bdbc
|
Merge branch 'develop' into client_v2_sync
|
2015-01-26 16:32:40 +00:00 |
|
Mark Haines
|
7f6f3f9d62
|
Pass the current time to serialize event, rather than passing an
HS and getting a clock from it and calling time_msec on the clock.
Remove the serialize_event method from the HS since it is no longer
needed.
|
2015-01-26 16:11:28 +00:00 |
|
Mark Haines
|
0cfb4591a7
|
Add handler for /sync API
|
2015-01-26 15:46:31 +00:00 |
|
Mark Haines
|
ada711504e
|
Replace hs.parse_roomalias with RoomAlias.from_string
|
2015-01-23 13:21:58 +00:00 |
|