Matrix/synapse
Matrix/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse synced 2024-07-08 14:04:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
6047 commits 890 branches 702 tags 485 MiB
Commit graph

6047 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mark Haines b4a5002a6e Merge pull request #708 from matrix-org/markjh/remove_collect_presencelike_data 
Call profile handler get_displayname directly
 2016-04-08 09:51:36 +01:00
Mark Haines 86be915cce Call profile handler get_displayname directly rather than using collect_presencelike_data 2016-04-07 18:11:49 +01:00
Erik Johnston f942980c0b Merge pull request #701 from DoubleMalt/ldap-auth 
Add LDAP authentication
 2016-04-07 17:35:28 +01:00
Mark Haines da84fa3d74 Merge pull request #706 from matrix-org/markjh/slaveIV 
Add tests for redactions
 2016-04-07 17:30:37 +01:00
Mark Haines ceb599e789 Add tests for redactions 2016-04-07 16:52:07 +01:00
Mark Haines 8c82b06904 Merge pull request #704 from matrix-org/markh/slaveIII 
Add tests for get_latest_event_ids_in_room and get_current_state
 2016-04-07 16:49:34 +01:00
Mark Haines 57fa1801c3 Add sensible __eq__ operators inside the tests. 
Rather than adding them globally. This limits the changes to only
affect the tests.
 2016-04-07 16:41:37 +01:00
Erik Johnston a294b04bf0 Merge pull request #700 from matrix-org/erikj/deduplicate_joins 
Deduplicate membership changes
 2016-04-07 16:35:40 +01:00
Erik Johnston 95ac3078da Rename things 2016-04-07 16:07:16 +01:00
Erik Johnston ee5aef6c72 Log contexts and squash things together 2016-04-07 15:34:21 +01:00
Erik Johnston 639cd07d6d Add comment 2016-04-07 14:24:12 +01:00
Erik Johnston af03ecf352 Deduplicate joins 2016-04-07 14:19:02 +01:00
Mark Haines 60ec9793fb Add tests for get_latest_event_ids_in_room and get_current_state 2016-04-07 13:17:56 +01:00
Christoph Witzany 674379e673 Add myself to AUTHORS.rst 
Signed-off-by: Christoph Witzany <christoph@web.crofting.com>
 2016-04-07 13:01:09 +02:00
Erik Johnston 8495b6d365 Merge pull request #703 from matrix-org/erikj/member 
Set profile information when joining rooms remotely
 2016-04-07 11:08:15 +01:00
Erik Johnston 1ef0365670 Set profile information when joining rooms remotely 2016-04-07 09:42:52 +01:00
Richard van der Hoff 87a30890a3 Merge pull request #699 from matrix-org/rav/show_own_leave_event 
Let users see their own leave events
 2016-04-06 17:57:06 +01:00
Christoph Witzany ed4d18f516 fix check for failed authentication 2016-04-06 18:30:11 +02:00
Christoph Witzany 9c62fcdb68 remove line 2016-04-06 18:23:46 +02:00
Christoph Witzany 27a0c21c38 make tests for ldap more specific to not be fooled by Mocks 2016-04-06 18:23:46 +02:00
Christoph Witzany 3555a659ec output ldap version for info and to pacify pep8 2016-04-06 18:23:46 +02:00
Christoph Witzany 4c5e8adf8b conditionally import ldap 2016-04-06 18:23:46 +02:00
Christoph Witzany 875ed05bdc fix pep8 2016-04-06 18:23:46 +02:00
Christoph Witzany 67f3a50e9a fix exception handling 2016-04-06 18:23:46 +02:00
Christoph Witzany afff321e9a code style 2016-04-06 18:23:46 +02:00
Christoph Witzany 8f0e47fae8 cleanup 2016-04-06 18:23:45 +02:00
Christoph Witzany 823b8be4b7 add tls property and twist my head around twisted 2016-04-06 18:23:45 +02:00
Christoph Witzany 92767dd703 add tls property 2016-04-06 18:23:45 +02:00
Christoph Witzany 7b9319b1c8 move LDAP authentication to AuthenticationHandler 2016-04-06 18:23:45 +02:00
Christoph Witzany 3d95405e5f Introduce LDAP authentication 2016-04-06 18:23:45 +02:00
Mark Haines 8d2bca1a90 Merge pull request #702 from matrix-org/markjh/slaveII 
Test that room membership is replicated
 2016-04-06 16:52:39 +01:00
Mark Haines 6bfec56796 Test that room membership is replicated 2016-04-06 16:20:13 +01:00
Mark Haines e815763b7f Merge pull request #697 from matrix-org/markjh/slaveI 
Add a slaved events store class
 2016-04-06 16:19:25 +01:00
Richard van der Hoff 1e05637e37 Let users see their own leave events 
... otherwise clients get confused.

Fixes https://matrix.org/jira/browse/SYN-662,
https://github.com/vector-im/vector-web/issues/368
 2016-04-06 15:36:19 +01:00
Erik Johnston b713934b2e Merge pull request #698 from matrix-org/erikj/port_script_fix 
Don't require config to create database
 2016-04-06 14:32:45 +01:00
Mark Haines 75fb9ac1be Add a slaved events store class 
Add a test to check that get_room_names_and_aliases does the same
thing on both the master and on the slave data store.
 2016-04-06 14:18:35 +01:00
Erik Johnston 8aab9d87fa Don't require config to create database 2016-04-06 14:15:45 +01:00
Mark Haines 7d11f825aa Merge pull request #694 from matrix-org/markjh/caches 
Move _get_cache_dict into the SQLBaseStore
 2016-04-06 13:21:25 +01:00
Mark Haines 196ebaf662 Merge pull request #695 from matrix-org/markjh/cachesII 
Make the cache objects be per instance rather than being global
 2016-04-06 13:21:19 +01:00
Mark Haines 87f2dec8d4 Make the cache objects be per instance rather than being global 2016-04-06 13:08:05 +01:00
Mark Haines a1e0d316ea Move _get_cache_dict into the SQLBaseStore 2016-04-06 13:05:19 +01:00
Mark Haines 2e308a3a38 Merge pull request #692 from matrix-org/markjh/replicate_reshuffle 
Separate generating the replication response...
 2016-04-05 13:23:36 +01:00
Erik Johnston c2b429ab24 Merge pull request #693 from matrix-org/erikj/backfill_self 
Don't backfill from self
 2016-04-05 13:04:36 +01:00
Erik Johnston 6222ae51ce Don't backfill from self 2016-04-05 12:56:29 +01:00
Erik Johnston b29f98377d Merge pull request #691 from matrix-org/erikj/member 
Fix stuck invites
 2016-04-05 12:44:39 +01:00
Mark Haines 1d4deff25a Separate generating the replication response... 
from doing the http request parsing to make it easier
to write unit tests for replication.
 2016-04-05 11:23:57 +01:00
Erik Johnston df727f2126 Fix stuck invites 
If rejecting a remote invite fails with an error response don't fail
the entire request; instead mark the invite as locally rejected.

This fixes the bug where users can get stuck invites which they can
neither accept nor reject.
 2016-04-05 11:13:24 +01:00
Erik Johnston 7a77f8b6d5 Merge pull request #690 from matrix-org/erikj/member 
Store invites in a separate table.
 2016-04-05 09:12:27 +01:00
Erik Johnston 0c53d750e7 Docs and indents 2016-04-04 18:02:48 +01:00
Erik Johnston 92ab45a330 Add upgrade path, rename table 2016-04-04 17:07:43 +01:00