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
David Baker
00466e2feb
Support new login format
...
https://docs.google.com/document/d/1-6ZSSW5YvCGhVFDyD2QExAUAdpCWjccvJT5xiyTTG2Y/edit#
2017-03-07 16:37:23 +00:00
David Baker
b0effa2160
Add msisdns as 3pids during registration
...
and support binding them with the bind_msisdn param
2017-03-03 18:34:39 +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
Paul "LeoNerd" Evans
856a18f7a8
kick jenkins
2017-03-01 16:24:11 +00:00
Paul Evans
0bf2c7f3bc
Merge pull request #1960 from matrix-org/paul/sytest-integration
...
Prepare a script for Jenkins to run sytest via dendron+haproxy
2017-03-01 15:08:09 +00:00
Paul "LeoNerd" Evans
6b1ffa5f3d
Added also a control script to run via the crazy dendron+haproxy hybrid we're temporarily using
2017-02-28 18:14:13 +00:00
Paul "LeoNerd" Evans
f4e7545d88
No longer need to request all the sub-components to be split when running sytest+dendron
2017-02-28 18:11:52 +00:00
Erik Johnston
e933a2712d
Don't log unknown cache warnings in workers
2017-02-28 16:22:41 +00:00
Erik Johnston
d638a7484b
Merge pull request #1959 from matrix-org/erikj/intern_once
...
Intern table column names once
2017-02-28 15:15:16 +00:00
Erik Johnston
7eff3afa05
Merge pull request #1957 from matrix-org/device_poke_index
...
Add stream_id index to device_lists_outbound_pokes
2017-02-28 14:48:32 +00:00
Erik Johnston
b84907bdbb
Intern table column names once
2017-02-28 14:38:16 +00:00
Erik Johnston
e4919b9329
Add stream_id index to device_lists_outbound_pokes
...
As this is used for replication streaming
2017-02-28 11:19:06 +00:00
Erik Johnston
8a12b6f1eb
Fix up txn name
2017-02-28 10:15:50 +00:00
Erik Johnston
848cf95ea0
Pop with default value to stop throwing
2017-02-28 10:02:54 +00:00
Matthew Hodgson
9037787f0b
merge in right archlinux package, thanks to @saram-kon from https://github.com/matrix-org/synapse/pull/1956
2017-02-28 00:30:25 +00:00
Erik Johnston
eda96586ca
Merge pull request #1955 from matrix-org/erikj/current_state_query_bypass
...
Don't fetch current state in common case
2017-02-27 19:15:59 +00:00
Erik Johnston
64a2cef9bb
Pop rather than del from dict
2017-02-27 19:15:36 +00:00
Erik Johnston
a41dce8f8a
Remove needless check
2017-02-27 18:54:43 +00:00
Erik Johnston
c0d6045776
It should be all
2017-02-27 18:45:24 +00:00
Erik Johnston
49f4bc4709
Don't fetch current state in common case
...
Currently we fetch the list of current state events whenever we send
something in a room. This is overkill for the common case of persisting
a simple chain of non-state events, so lets handle that case specially.
2017-02-27 18:33:41 +00:00
Erik Johnston
8eec652de5
Merge pull request #1904 from Pneumaticat/patch-1
...
Fix synapse_port_db failure (fixes #1902 )
2017-02-27 18:11:13 +00:00
Erik Johnston
fc5d876dba
Merge pull request #1954 from matrix-org/erikj/cache_device2
...
Cache get_user_devices_from_cache
2017-02-27 16:36:40 +00:00
Erik Johnston
f58dbb02a6
Cache get_user_devices_from_cache
2017-02-27 16:22:12 +00:00
Matthew Hodgson
ca7ea2a4b5
Merge pull request #1951 from enckse/develop
...
the aur package is no longer there, community package in arch does exist
2017-02-27 15:11:00 +00:00
Sean Enck
c80439a320
the aur package is no longer there, community package in arch does exist
2017-02-27 10:06:15 -05:00
Erik Johnston
acf6d4d2e3
Merge pull request #1945 from jkolo/fix_dynamic_thumbnails_aspect
...
Fix #1677 (dynamic thumbnails aspect)
2017-02-27 09:51:52 +00:00
Jurek
aea5461488
Fix dynamic thumbnails aspect
2017-02-24 22:43:27 +01:00
Erik Johnston
bf92b7201f
Merge pull request #1939 from matrix-org/erikj/strip_sql_newlines
...
Strip newlines from SQL queries
2017-02-23 11:30:33 +00:00
Erik Johnston
1a4f8022e6
Strip newlines from SQL queries
2017-02-23 11:15:31 +00:00
Erik Johnston
b2d20e94fa
Remove lock from rotate notifs
2017-02-22 14:24:02 +00:00
Erik Johnston
7455ba436a
Ensure we pass positive ints to delay function
2017-02-22 12:08:14 +00:00
Erik Johnston
b7442c3e2b
Store looping call
2017-02-21 13:59:25 +00:00
Erik Johnston
a3708a1885
Merge branch 'master' of github.com:matrix-org/synapse into develop
2017-02-21 13:46:27 +00:00
Erik Johnston
3346a21324
Merge branch 'release-v0.19.2' of github.com:matrix-org/synapse
2017-02-21 13:45:02 +00:00
Erik Johnston
30ecfef5a3
Bump version and changelog
2017-02-21 13:43:36 +00:00
Richard van der Hoff
c927d6de9b
Merge pull request #1930 from matrix-org/rav/fix_txnq_race
...
Fix a race in transaction queue
2017-02-21 08:46:38 +00:00
Richard van der Hoff
0c4cf9372b
Fix a race in transaction queue
...
It was theoretically possible for a PDU to get queued and not sent for ages. On
closer inspection I think there were bigger problems elsewhere, but we might as
well fix this since it's easy.
2017-02-20 16:46:25 +00:00
Erik Johnston
6226a27bf8
Remove unused param
2017-02-20 16:01:54 +00:00
Erik Johnston
efff39c030
Fix /context/ visibiltiy rules
2017-02-20 16:01:49 +00:00
Erik Johnston
b5c268738b
Merge pull request #1929 from matrix-org/erikj/context_fix
...
Fix /context/ visibiltiy rules
2017-02-20 16:19:19 +01: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
Richard van der Hoff
11940d462a
Merge remote-tracking branch 'origin/master' into develop
2017-02-20 09:14:43 +00:00
Richard van der Hoff
6184f6fcbc
Update metrics-howto.rst
2017-02-19 23:06:45 +00:00
Richard van der Hoff
e556aefe0a
Update metrics-howto.rst
2017-02-19 23:06:08 +00:00
Richard van der Hoff
7efb38d1dd
Update metrics-howto.rst
2017-02-19 22:55:48 +00:00
Erik Johnston
699be7d1be
Fix up notif rotation
2017-02-18 14:42:39 +00:00
