Erik Johnston
|
f942980c0b
|
Merge pull request #701 from DoubleMalt/ldap-auth
Add LDAP authentication
|
2016-04-07 17:35:28 +01:00 |
|
David Baker
|
3fb35cbd6f
|
Oops, inequality fail
|
2016-04-07 17:33:37 +01:00 |
|
David Baker
|
15e0f1696f
|
Wrap process in a flag so we don't process whist already processing.
|
2016-04-07 17:31:08 +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 |
|
Matthew Hodgson
|
d6e7333ae4
|
Merge branch 'develop' into matthew/preview_urls
|
2016-04-07 17:26:44 +01:00 |
|
David Baker
|
6ec02e9ecf
|
indenting
|
2016-04-07 17:24:05 +01:00 |
|
David Baker
|
25cd5bb697
|
defer.gatherResults rather than doing all the pokes in series
|
2016-04-07 17:22:14 +01:00 |
|
David Baker
|
fa129ce5b5
|
Add measure blocks
|
2016-04-07 17:12:29 +01:00 |
|
David Baker
|
e1e042f2a1
|
Add comments on min_stream_id
saying that the min stream id won't be completely accurate all the time
|
2016-04-07 17:09:36 +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 |
|
David Baker
|
05d044aac3
|
pep8
|
2016-04-07 16:45:38 +01:00 |
|
David Baker
|
2d5c693fd3
|
Fix port script for changes merged from develop
|
2016-04-07 16:43:54 +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 |
|
David Baker
|
9c99ab4572
|
Merge remote-tracking branch 'origin/develop' into dbkr/pushers_use_event_actions
|
2016-04-07 16:35:22 +01:00 |
|
David Baker
|
d549fdfa22
|
Remove code that's now been obsoleted or moved elsewhere
|
2016-04-07 16:31:38 +01:00 |
|
Erik Johnston
|
95ac3078da
|
Rename things
|
2016-04-07 16:07:16 +01:00 |
|
David Baker
|
92e3071623
|
Send badge count pushes.
Also fix bugs with retrying.
|
2016-04-07 15:39:53 +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
|
a28d066732
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dns_cache
|
2016-04-07 11:11:17 +01: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 |
|
David Baker
|
0fd1cd2400
|
pep8
|
2016-04-06 16:50:47 +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 |
|
David Baker
|
7e2c89a37f
|
Make pushers use the event_push_actions table instead of listening on an event stream & running the rules again. Sytest passes, but remaining to do:
* Make badges work again
* Remove old, unused code
|
2016-04-06 15:42:15 +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 |
|