Erik Johnston
|
03d415a6a2
|
Brief comment on why we do some things on every call to persist_event and not others
|
2015-02-04 10:40:59 +00:00 |
|
Erik Johnston
|
c0462dbf15
|
Rearrange persist_event so that do all the queries that need to be done before returning early if we have already persisted that event.
|
2015-02-04 10:16:51 +00:00 |
|
Erik Johnston
|
02be8da5e1
|
Add doc to get_event
|
2015-02-03 17:34:07 +00:00 |
|
Erik Johnston
|
e7ca813dd4
|
Try to ensure we don't persist an event we have already persisted. In persist_event check if we already have the event, if so then update instead of replacing so that we don't cause a bump of the stream_ordering.
|
2015-02-03 10:39:41 +00:00 |
|
Erik Johnston
|
941f59101b
|
Don't fail an entire request if one of the returned events fails a signature check. If an event does fail a signature check, look in the local database and request it from the originator.
|
2015-02-02 16:56:01 +00:00 |
|
Erik Johnston
|
7d897f5bfc
|
Merge pull request #43 from matrix-org/rejections
Rejections
|
2015-01-30 16:11:14 +00:00 |
|
Mark Haines
|
6dc92d3427
|
Merge pull request #41 from matrix-org/client_v2_sync
Client v2 sync
|
2015-01-30 15:54:25 +00:00 |
|
Erik Johnston
|
1bd540ef79
|
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
Conflicts:
synapse/storage/schema/im.sql
|
2015-01-30 15:16:38 +00:00 |
|
Mark Haines
|
9ec9d6f2cb
|
Merge pull request #42 from matrix-org/replication_split
Replication split
|
2015-01-30 15:14:10 +00:00 |
|
Erik Johnston
|
91015ad008
|
Remove merge conflict
|
2015-01-30 14:58:54 +00:00 |
|
Erik Johnston
|
4f7fe63b6d
|
Remember to add schema file to list
|
2015-01-30 14:57:53 +00:00 |
|
Erik Johnston
|
fdd2ac495a
|
Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage
Conflicts:
synapse/storage/__init__.py
|
2015-01-30 14:57:33 +00:00 |
|
Mark Haines
|
8bc3066e0b
|
Merge branch 'client_v2_filter' into client_v2_sync
|
2015-01-30 14:57:04 +00:00 |
|
Erik Johnston
|
471c47441d
|
Merge pull request #37 from matrix-org/client_v2_filter
Client v2 filter
|
2015-01-30 14:56:08 +00:00 |
|
Mark Haines
|
e97f756a05
|
Use 'in' to test if the key exists, remove unused _filters_for_user
|
2015-01-30 14:54:06 +00:00 |
|
Erik Johnston
|
2f4cb04f45
|
Be more specific in naming columns in selects.
|
2015-01-30 14:48:11 +00:00 |
|
Erik Johnston
|
472cf532b7
|
Put CREATE rejections into seperate .sql
|
2015-01-30 14:48:03 +00:00 |
|
David Baker
|
322a047502
|
Add room member count condition and default rule to make a noise on rooms of only 2 people.
|
2015-01-30 14:46:45 +00:00 |
|
Erik Johnston
|
c515d37797
|
Merge branch 'replication_split' of github.com:matrix-org/synapse into rejections
Conflicts:
synapse/storage/schema/delta/v12.sql
|
2015-01-30 14:19:49 +00:00 |
|
Erik Johnston
|
84b78c3b5f
|
Merge branch 'rejections_storage' of github.com:matrix-org/synapse into replication_split
|
2015-01-30 14:17:47 +00:00 |
|
Erik Johnston
|
e0b7c521cb
|
Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage
Conflicts:
synapse/storage/__init__.py
synapse/storage/schema/delta/v12.sql
|
2015-01-30 14:08:28 +00:00 |
|
Mark Haines
|
8498d348d8
|
Fix token formatting
|
2015-01-30 11:42:09 +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
|
78015948a7
|
Initial implementation of auth conflict resolution
|
2015-01-29 16:52:33 +00:00 |
|
Mark Haines
|
8e571cbed8
|
Merge branch 'client_v2_filter' into client_v2_sync
|
2015-01-29 16:18:59 +00:00 |
|
Mark Haines
|
295322048d
|
Merge branch 'develop' into client_v2_filter
|
2015-01-29 16:18:34 +00:00 |
|
Mark Haines
|
acb68a39e0
|
Code style fixes.
|
2015-01-29 16:12:40 +00:00 |
|
Mark Haines
|
396a67a09a
|
Merge branch 'client_v2_filter' into client_v2_sync
Conflicts:
synapse/rest/client/v2_alpha/__init__.py
|
2015-01-29 14:58:00 +00:00 |
|
Mark Haines
|
9d8f798a3f
|
Merge changes from develop
|
2015-01-29 14:55:27 +00:00 |
|
Mark Haines
|
e4f50fa0aa
|
Move bump schema delta
|
2015-01-29 14:53:18 +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 |
|
Kegan Dougal
|
3773759c0f
|
Also edit the filter column on the delta SQL
|
2015-01-29 09:15:33 +00:00 |
|
Mark Haines
|
b0b80074e0
|
SYN-252: Supply the stream and topological parts in the correct order to the constructor
|
2015-01-29 01:48:48 +00:00 |
|
David Baker
|
d5bdf3c0c7
|
Allow the push rule delete method to take more specifiers.
|
2015-01-28 18:06:04 +00:00 |
|
Kegan Dougal
|
11634017f4
|
s/definition/filter_json/ since definition is now used to mean a component of the filter, rather than the complete json
|
2015-01-28 17:42:19 +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 |
|
Kegan Dougal
|
c23e3db544
|
Add filter JSON sanity checks.
|
2015-01-28 16:45:18 +00:00 |
|
Erik Johnston
|
0ef5bfd6a9
|
Start implementing auth conflict res
|
2015-01-28 16:16:53 +00:00 |
|
David Baker
|
60b143a52e
|
Move pushers delta to v12 and bump schema version
|
2015-01-28 15:48:28 +00:00 |
|
David Baker
|
e78dd33292
|
Use %s instead of +
|
2015-01-28 14:52:58 +00:00 |
|
David Baker
|
93aac9bb7b
|
Newline
|
2015-01-28 14:51:01 +00:00 |
|
David Baker
|
445ad9941e
|
Redundant parens
|
2015-01-28 14:49:59 +00:00 |
|
David Baker
|
6d485dd1c7
|
unnecessary newlines
|
2015-01-28 14:48:42 +00:00 |
|
David Baker
|
fb0928097a
|
More magic commas (including the place I copied it from...)
|
2015-01-28 14:48:07 +00:00 |
|
David Baker
|
0cbb6b0f52
|
Google doc style
|
2015-01-28 14:44:41 +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 |
|
Mark Haines
|
e020574d65
|
Fix Formatting
|
2015-01-27 20:19:36 +00:00 |