a3708a1885
Merge branch 'master' of github.com:matrix-org/synapse into develop
2017-02-21 13:46:27 +00:00
3346a21324
Merge branch 'release-v0.19.2' of github.com:matrix-org/synapse
2017-02-21 13:45:02 +00:00
30ecfef5a3
Bump version and changelog
2017-02-21 13:43:36 +00:00
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
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
6226a27bf8
Remove unused param
2017-02-20 16:01:54 +00:00
efff39c030
Fix /context/ visibiltiy rules
2017-02-20 16:01:49 +00:00
b5c268738b
Merge pull request #1929 from matrix-org/erikj/context_fix
...
Fix /context/ visibiltiy rules
2017-02-20 16:19:19 +01:00
17673404fb
Remove unused param
2017-02-20 15:02:01 +00:00
7f026792e1
Fix /context/ visibiltiy rules
2017-02-20 14:54:50 +00:00
11940d462a
Merge remote-tracking branch 'origin/master' into develop
2017-02-20 09:14:43 +00:00
6184f6fcbc
Update metrics-howto.rst
2017-02-19 23:06:45 +00:00
e556aefe0a
Update metrics-howto.rst
2017-02-19 23:06:08 +00:00
7efb38d1dd
Update metrics-howto.rst
2017-02-19 22:55:48 +00:00
20746d8150
bring nuke-room script to current schema
...
Signed-off-by: Christian W. Zuckschwerdt <christian@zuckschwerdt.org>
2017-02-19 05:27:45 +01:00
699be7d1be
Fix up notif rotation
2017-02-18 14:42:39 +00:00
2fa14fd48a
Merge pull request #1926 from matrix-org/rav/example_log_config
...
Add an example log_config file
2017-02-17 14:41:48 +00:00
66eb0bd548
Update example_log_config.yaml
...
add trailing NL
2017-02-17 12:55:36 +00:00
5aae844e60
Add an example log_config file
2017-02-17 12:48:53 +00:00
ec8d7603e6
Merge pull request #1925 from matrix-org/dbkr/pushers_lang_lengthen
...
Make the pushers lang field column longer
2017-02-17 11:29:06 +00:00
8c87bb550e
Merge pull request #1922 from matrix-org/dbkr/allow_forget_for_ban
...
Allow forgetting rooms you're banned from
2017-02-17 10:52:30 +00:00
4aa29508af
Use TEXT rather than VARCHAR
...
While we're changing anyway
2017-02-17 10:51:49 +00:00
b4017539d4
Make the pushers lang field column longer
...
To accommodate things like zh-Hans-CN
Fixes https://github.com/vector-im/riot-ios/issues/1031
2017-02-17 10:42:57 +00:00
b6557f2cfe
Merge pull request #1923 from matrix-org/erikj/push_action_compress
...
Store the default push actions in a more efficient manner
2017-02-16 16:07:50 +01:00
138e030cfe
Comment
2017-02-16 15:03:36 +00:00
502ae6c663
Comment
2017-02-16 14:47:11 +00:00
e6acf0c399
Store the default push actions in a more efficient manner
2017-02-16 14:40:24 +00:00
04eca2589d
Merge pull request #1916 from matrix-org/erikj/push_actions_delete
...
Aggregate event push actions
2017-02-16 15:28:58 +01:00
474c9aadbe
Allow forgetting rooms you're banned from
2017-02-15 19:32:20 +00:00
7dcbcca68c
Merge pull request #1921 from matrix-org/rav/fix_key_changes
...
Fix bugs in the /keys/changes api
2017-02-15 11:25:16 +00:00
fa467e62a9
Merge pull request #1917 from matrix-org/dbkr/make_ban_reasons_work
...
Make kick & ban reasons work
2017-02-14 16:10:06 +00:00
355d62c499
Make kick & ban reasons work
...
We somehow specced APIs with reason strings, preserve the content
in the events and even have the clients display them, but failed
to actually pass the parameter through to the event content.
2017-02-14 15:10:55 +00:00
ce3e583d94
WIP support for msisdn 3pid proxy methods
2017-02-14 15:05:55 +00:00
fc2f29c1d0
Fix bugs in the /keys/changes api
...
* `get_forward_extremeties_for_room` takes a numeric `stream_ordering`. We were
passing a `RoomStreamToken`, which meant that it returned the *current*
extremities, rather than those corresponding to the `from_token`. However:
* `get_state_ids_for_events` required a second ('types') parameter; this meant
that a `TypeError` was thrown and we ended up acting as though there was *no*
prev state.
* `get_state_ids_for_events` actually returns a map from event_id to state
dictionary - just looking up the state keys in it again meant that we acted
as though there was no prev state. We now check if each member's state has
changed since *any* of the extremities.
Also add/fix some comments.
2017-02-14 13:59:50 +00:00
ce3c8df6df
Less aggressive timers
2017-02-14 13:41:24 +00:00
095b45c165
Aggregate event push actions
2017-02-14 13:39:41 +00:00
795f8e3fe7
Merge pull request #1873 from matrix-org/erikj/delete_push_actions
...
Be more agressive about purging old room event_push_actions
2017-02-14 14:29:04 +01:00
d7457c7661
Merge pull request #1914 from matrix-org/erikj/cache_presence
...
Cache get_presence storage
2017-02-13 16:59:19 +01:00
359c97f506
Merge pull request #1913 from matrix-org/kegan/dont-cache-errors
...
http txns: Do not cache error responses
2017-02-13 16:29:19 +01:00
9e617cd4c2
Cache get_presence storage
2017-02-13 13:50:03 +00:00
d0497425f8
Ordering is important on errbacks so add the cleanup func before creating an ObservableDeferred
2017-02-13 13:49:44 +00:00
808ddf0ae7
Pop the txn from the map in case it has already been deleted somehow
2017-02-13 13:36:15 +00:00
feb15dc99f
Don't cache errors at all
2017-02-13 13:33:12 +00:00
ecd7e36047
http txns: Do not cache error responses
...
Previously we did. This meant that, amongst other errors, rate-limiting errors
would be cached and prevent messages with that txn ID being sent.
2017-02-13 13:16:48 +00:00
6bba80241c
Merge pull request #1912 from matrix-org/markjh/roominitialsync
...
Add db functions needed for room initial sync to slave
2017-02-13 12:20:21 +01:00
3a46280ca3
Add db functions needed for room initial sync to slave
2017-02-13 11:16:53 +00:00
e1a12e24d2
Merge pull request #1907 from andrewshadura/develop
...
Use signedjson.sign instead of syutil.crypto.jsonsign
2017-02-13 11:54:24 +01:00
6a3743b0d4
Use signedjson.sign instead of syutil.crypto.jsonsign
...
Functions from syutil.crypto.jsonsign are now available in
signedjson, so use that instead of depending on syutil.
Signed-off-by: Andrew Shadura <andrew@shadura.me>
2017-02-13 11:31:22 +01:00
481f6c87e7
Merge pull request #1906 from tyler-smith/TS_fix_config_documentation
...
Fix typo in config comments.
2017-02-13 11:01:03 +01:00
df4407d665
Fix typo in config comments.
...
Signed-off-by: Tyler Smith <tylersmith.me@gmail.com>
2017-02-11 23:02:57 -08:00
Erik Johnston