Richard van der Hoff
|
5fc9261929
|
Merge pull request #1982 from matrix-org/rav/sighup_for_logconfig
Reread log config on SIGHUP
|
2017-03-13 12:19:54 +00:00 |
|
Erik Johnston
|
7eae6eaa2f
|
Revert "Support registration & login with phone number"
|
2017-03-13 09:59:33 +00:00 |
|
Richard van der Hoff
|
9072a8c627
|
Reread log config on SIGHUP
When we are using a log_config file, reread it on SIGHUP.
|
2017-03-10 15:29:55 +00:00 |
|
Erik Johnston
|
3872c7a107
|
Merge pull request #1976 from matrix-org/erikj/device_delete_sync
Noop repated delete device inbox calls from /sync
|
2017-03-10 13:24:28 +00:00 |
|
Erik Johnston
|
8f267fa8a8
|
Fix it for the workers
|
2017-03-10 11:22:25 +00:00 |
|
Erik Johnston
|
64d62e41b8
|
Noop repated delete device inbox calls from /sync
|
2017-03-10 10:36:43 +00:00 |
|
Erik Johnston
|
3545e17f43
|
Add setdefault key to ExpiringCache
|
2017-03-10 10:30:49 +00:00 |
|
Richard van der Hoff
|
45d173a59a
|
Fix docstring
|
2017-03-09 15:50:29 +00:00 |
|
David Baker
|
663396e45d
|
Merge pull request #1971 from matrix-org/dbkr/msisdn_signin
Support registration & login with phone number
|
2017-03-09 10:18:51 +00:00 |
|
David Baker
|
ece7e00048
|
Comment when our 3pids would be incomplete
|
2017-03-08 19:07:18 +00:00 |
|
David Baker
|
9d0d40fc15
|
Docs
|
2017-03-08 19:05:29 +00:00 |
|
David Baker
|
3edc57296d
|
Incorrectly copied copyright
This file post-dates OM
|
2017-03-08 19:00:51 +00:00 |
|
David Baker
|
727124a762
|
Not any more, it doesn't
|
2017-03-08 19:00:23 +00:00 |
|
Richard van der Hoff
|
6ad71cc29d
|
Remove spurious SQL logging (#1972)
looks like the upsert function was accidentally sending sql logging to the
general logger. We already log the sql in `txn.execute`.
|
2017-03-08 18:00:44 +00:00 |
|
David Baker
|
d4d3629aaf
|
Better error message
|
2017-03-08 17:01:26 +00:00 |
|
David Baker
|
1c99934b28
|
pep8
|
2017-03-08 11:58:20 +00:00 |
|
David Baker
|
a9e2b9ec16
|
Add msisdn util file
|
2017-03-08 11:53:36 +00:00 |
|
David Baker
|
85bb322333
|
Pull out datastore in initialiser
|
2017-03-08 11:51:25 +00:00 |
|
David Baker
|
65d43f3ca5
|
Minor fixes from PR feedback
|
2017-03-08 11:48:43 +00:00 |
|
David Baker
|
0e0aee25c4
|
Fix log line
|
2017-03-08 11:46:22 +00:00 |
|
David Baker
|
82c5e7de25
|
Typos
|
2017-03-08 11:42:44 +00:00 |
|
David Baker
|
2e27339add
|
Refector out assert_params_in_request
and replace requestEmailToken where we meant requestMsisdnToken
|
2017-03-08 11:37:34 +00:00 |
|
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 |
|
Erik Johnston
|
c98d91fe94
|
Merge pull request #1969 from matrix-org/erikj/get_distinct_devices
Select distinct devices from DB
|
2017-03-06 11:52:46 +00:00 |
|
Erik Johnston
|
ac5491f563
|
Select distinct devices from DB
Otherwise we might pull out tonnes of duplicate user_ids and this can
make synapse sad.
|
2017-03-06 11:10:14 +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 |
|
Erik Johnston
|
82f7f1543b
|
Merge pull request #1964 from matrix-org/erikj/device_list_update_fix
Fix device list update to not constantly resync
|
2017-03-03 16:18:16 +00:00 |
|
Erik Johnston
|
96d79bb532
|
Merge pull request #1963 from matrix-org/erikj/delete_old_device_streams
Clobber old device list stream entries
|
2017-03-03 16:18:06 +00:00 |
|
Erik Johnston
|
f2581ee8b8
|
Don't keep around old stream IDs forever
|
2017-03-03 16:02:53 +00:00 |
|
Erik Johnston
|
9834367eea
|
Spelling
|
2017-03-03 15:31:57 +00:00 |
|
Erik Johnston
|
da52d3af31
|
Fix up
|
2017-03-03 15:29:13 +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 |
|
Erik Johnston
|
d766343668
|
Add index to device_lists_stream
|
2017-03-01 15:56:30 +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 |
|
Erik Johnston
|
36be39b8b3
|
Fix device list update to not constantly resync
|
2017-03-01 14:12:11 +00:00 |
|
Erik Johnston
|
3365117151
|
Clobber old device list stream entries
|
2017-03-01 10:21:30 +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 |
|