Erik Johnston
0b7dfbb194
Merge pull request #3186 from matrix-org/erikj/fix_int_values_metrics
...
Fix metrics that have integer value labels
2018-05-08 09:48:50 +01:00
Konstantinos Sideris
88868b2839
notifications: Convert next_token to string according to the spec
...
Currently the parameter is serialized as an integer.
Signed-off-by: Konstantinos Sideris <sideris.konstantin@gmail.com>
2018-05-05 12:55:02 +03:00
kaiyou
5addeaa02c
Add Docker packaging in the author list
2018-05-04 21:23:01 +02:00
Matthew Hodgson
c3ec84dbcd
Merge pull request #3096 from matrix-org/matthew/derive-mxid-from-3pid
...
add the register_mxid_from_3pid setting (untested)
2018-05-04 02:26:46 +01:00
Matthew Hodgson
0783801659
unbreak tests
2018-05-04 02:18:01 +01:00
Matthew Hodgson
9f2fd29c14
fix double negative
2018-05-04 02:11:22 +01:00
Matthew Hodgson
6372dff771
remove create_profile from tests
2018-05-04 01:58:45 +01:00
Matthew Hodgson
b3e346f40c
don't pass a requester if we don't have one to set_displayname
2018-05-04 01:56:01 +01:00
Matthew Hodgson
fb47ce3e6a
make set_profile_* an upsert rather than update, now create_profile is gone
2018-05-04 01:46:26 +01:00
Matthew Hodgson
debf04556b
fix user in user regexp
2018-05-04 01:15:33 +01:00
Matrix
907a62df28
fix strip_invalid_mxid_characters
2018-05-03 23:54:36 +00:00
Matrix
41b987cbc5
unbreak 3pid deletion
2018-05-03 23:54:36 +00:00
Matthew Hodgson
5c74ab4064
fix user_id / user confusion
2018-05-04 00:53:56 +01:00
Matrix
06820250c9
unbreak 3pid deletion
2018-05-03 23:27:34 +00:00
Matthew Hodgson
383c4ae59c
Merge branch 'dinsic' into matthew/derive-mxid-from-3pid
2018-05-03 23:39:08 +01:00
Matthew Hodgson
f639ac143d
Merge pull request #3180 from matrix-org/matthew/disable-3pid-changes
...
add option to disable changes to the 3PIDs for an account.
2018-05-03 18:19:58 +01:00
Matthew Hodgson
ad0424bab0
Merge pull request #3179 from matrix-org/matthew/disable-set-profile
...
options to disable setting profile info
2018-05-03 18:19:48 +01:00
Matthew Hodgson
2992125561
special case msisdns when deriving mxids from 3pids
2018-05-03 17:52:46 +01:00
Erik Johnston
6d8ec3462d
Note that label values can be anything
2018-05-03 16:25:05 +01:00
Erik Johnston
95b6912045
Fix metrics that have integer value labels
2018-05-03 15:51:04 +01:00
David Baker
ef56b6e27c
Merge pull request #3185 from matrix-org/dbkr/change_profile_replication_uri
...
Change profile replication URI
2018-05-03 15:17:51 +01:00
Richard van der Hoff
966686c845
Merge pull request #3007 from matrix-org/rav/warn_on_logcontext_fail
...
Make 'unexpected logging context' into warnings
2018-05-03 15:10:04 +01:00
Richard van der Hoff
093d8c415a
Merge remote-tracking branch 'origin/develop' into rav/warn_on_logcontext_fail
2018-05-03 14:59:29 +01:00
Richard van der Hoff
0ba609dc6f
Merge pull request #3183 from matrix-org/rav/moar_logcontext_leaks
...
Fix logcontext leaks in rate limiter
2018-05-03 14:58:13 +01:00
David Baker
53d6245529
Change profile replication URI
2018-05-03 14:55:40 +01:00
Richard van der Hoff
2117f84323
Merge pull request #3182 from Half-Shot/hs/fix-twisted-shutdown
...
Fix 'Unhandled Error' logs with Twisted 18.4
2018-05-03 12:40:11 +01:00
Richard van der Hoff
a7fe62f0cb
Fix logcontext leaks in rate limiter
2018-05-03 12:31:59 +01:00
Will Hunt
2e7a94c36b
Don't abortConnection() if the transport connection has already closed.
2018-05-03 12:31:47 +01:00
Matthew Hodgson
25e471dac3
fix defaults in config example
2018-05-03 11:46:56 +01:00
Matthew Hodgson
76fca1730e
fix defaults in example config
2018-05-03 11:46:11 +01:00
Richard van der Hoff
a2aaa9cb3c
Merge pull request #3178 from matrix-org/rav/fix_request_timeouts
...
fix http request timeout code
2018-05-03 11:33:26 +01:00
Richard van der Hoff
d72faf2fad
Fix changes warning
2018-05-03 10:56:42 +01:00
Richard van der Hoff
a0501ac57e
Warn of potential client incompatibility from #3161
2018-05-03 10:51:39 +01:00
Erik Johnston
0a3b51c420
Merge pull request #3141 from matrix-org/erikj/fixup_state
...
Refactor event storage to prepare for changes in state calculations
2018-05-03 10:39:20 +01:00
Erik Johnston
31c7c29d43
Fix up grammar
2018-05-03 10:38:58 +01:00
Richard van der Hoff
902673e356
Merge pull request #3161 from NotAFile/remove-v1auth
...
Make Client-Server API return 403 for invalid token
2018-05-03 10:10:57 +01:00
Erik Johnston
53a5fdf312
Merge pull request #3175 from matrix-org/erikj/escape_metric_values
...
Escape label values in prometheus metrics
2018-05-03 10:01:04 +01:00
Matthew Hodgson
32e4420a66
improve mxid & displayname selection for register_mxid_from_3pid
...
* [x] strip invalid characters from generated mxid
* [x] append numbers to disambiguate clashing mxids
* [x] generate displayanames from 3pids using a dodgy heuristic
* [x] get rid of the create_profile_with_localpart and instead
explicitly set displaynames so they propagate correctly
2018-05-03 04:21:20 +01:00
Matthew Hodgson
79b2583f1b
Merge branch 'dinsic' into matthew/derive-mxid-from-3pid
2018-05-03 02:51:49 +01:00
Matthew Hodgson
8a24c4eee5
add option to disable changes to the 3PIDs for an account.
...
This only considers the /account/3pid API, which should be sufficient
as currently we can't change emails associated with push notifs
(which are provisioned at registration), and we can't directly create
mappings for accounts in an IS other than by answering an invite
2018-05-03 02:47:55 +01:00
Matthew Hodgson
f93cb7410d
options to disable setting profile info
2018-05-03 01:29:12 +01:00
Matthew Hodgson
50d5a97c1b
Merge branch 'master' into dinsic
2018-05-03 00:26:33 +01:00
Richard van der Hoff
1dfd650348
add missing param to cancelled_to_request_timed_out_error
...
This gets two arguments, not one.
2018-05-02 22:42:36 +01:00
kaiyou
9a779c2ddb
Merge remote-tracking branch 'upstream/master' into feat-dockerfile
2018-05-02 20:22:41 +02:00
Erik Johnston
a41117c63b
Make _escape_character take MatchObject
2018-05-02 17:27:27 +01:00
Erik Johnston
32015e1109
Escape label values in prometheus metrics
2018-05-02 16:52:42 +01:00
Richard van der Hoff
3a42aed9a1
Merge pull request #3170 from matrix-org/rav/more_logcontext_leaks
...
Fix a class of logcontext leaks
2018-05-02 16:45:51 +01:00
Richard van der Hoff
5a0be97ab2
Merge pull request #3174 from matrix-org/rav/media_repo_logcontext_leaks
...
Fix logcontext leak in media repo
2018-05-02 16:43:04 +01:00
Richard van der Hoff
415c6b672e
Merge branch 'develop' into rav/more_logcontext_leaks
2018-05-02 16:16:01 +01:00
Richard van der Hoff
4e9bdeba57
Merge pull request #3172 from matrix-org/rav/fix_test_logcontext_leaks
...
Fix a couple of logcontext leaks in unit tests
2018-05-02 16:15:22 +01:00
