Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,596 Commits 842 Branches 671 Tags 438 MiB
Commit Graph

8596 Commits

Author SHA1 Message Date
Richard van der Hoff 7efb38d1dd Update metrics-howto.rst 2017-02-19 22:55:48 +00:00
Christian W. Zuckschwerdt 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
Erik Johnston 699be7d1be Fix up notif rotation 2017-02-18 14:42:39 +00:00
Richard van der Hoff 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
Richard van der Hoff 66eb0bd548 Update example_log_config.yaml 
add trailing NL
 2017-02-17 12:55:36 +00:00
Richard van der Hoff 5aae844e60 Add an example log_config file 2017-02-17 12:48:53 +00:00
David Baker 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
David Baker 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
David Baker 4aa29508af Use TEXT rather than VARCHAR 
While we're changing anyway
 2017-02-17 10:51:49 +00:00
David Baker 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
Erik Johnston 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
Erik Johnston 138e030cfe Comment 2017-02-16 15:03:36 +00:00
Erik Johnston 502ae6c663 Comment 2017-02-16 14:47:11 +00:00
Erik Johnston e6acf0c399 Store the default push actions in a more efficient manner 2017-02-16 14:40:24 +00:00
Erik Johnston 04eca2589d Merge pull request #1916 from matrix-org/erikj/push_actions_delete 
Aggregate event push actions
 2017-02-16 15:28:58 +01:00
David Baker 474c9aadbe Allow forgetting rooms you're banned from 2017-02-15 19:32:20 +00:00
Richard van der Hoff 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
David Baker 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
David Baker 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
David Baker ce3e583d94 WIP support for msisdn 3pid proxy methods 2017-02-14 15:05:55 +00:00
Richard van der Hoff 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
Erik Johnston ce3c8df6df Less aggressive timers 2017-02-14 13:41:24 +00:00
Erik Johnston 095b45c165 Aggregate event push actions 2017-02-14 13:39:41 +00:00
Erik Johnston 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
Erik Johnston d7457c7661 Merge pull request #1914 from matrix-org/erikj/cache_presence 
Cache get_presence storage
 2017-02-13 16:59:19 +01:00
Erik Johnston 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
Erik Johnston 9e617cd4c2 Cache get_presence storage 2017-02-13 13:50:03 +00:00
Kegan Dougal d0497425f8 Ordering is important on errbacks so add the cleanup func before creating an ObservableDeferred 2017-02-13 13:49:44 +00:00
Kegan Dougal 808ddf0ae7 Pop the txn from the map in case it has already been deleted somehow 2017-02-13 13:36:15 +00:00
Kegan Dougal feb15dc99f Don't cache errors at all 2017-02-13 13:33:12 +00:00
Kegan Dougal 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
Erik Johnston 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
Mark Haines 3a46280ca3 Add db functions needed for room initial sync to slave 2017-02-13 11:16:53 +00:00
Erik Johnston e1a12e24d2 Merge pull request #1907 from andrewshadura/develop 
Use signedjson.sign instead of syutil.crypto.jsonsign
 2017-02-13 11:54:24 +01:00
Andrew Shadura 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
Erik Johnston 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
Tyler Smith df4407d665 Fix typo in config comments. 
Signed-off-by: Tyler Smith <tylersmith.me@gmail.com>
 2017-02-11 23:02:57 -08:00
Kevin Liu 70a00eacf9 Fix typo 
This is what I get for not proofreading
 2017-02-11 20:49:31 -05:00
Kevin Liu a02d609b1f Fix synapse_port_db failure (fixes #1902) 
See https://matrix.to/#/!cURbafjkfsMDVwdRDQ:matrix.org/$148686272020hCgRD:potatofrom.space

Signed-off-by: Kevin Liu <kevin@potatofrom.space>
 2017-02-11 20:44:16 -05:00
Erik Johnston 5c3cb8778a Merge pull request #1896 from DanielDent/patch-1 
Update CAPTCHA_SETUP.rst X-Forwarded-For docs
 2017-02-09 14:20:15 +01:00
Erik Johnston 1beda9c8a7 Merge branch 'master' of github.com:matrix-org/synapse into develop 2017-02-09 10:46:58 +00:00
Erik Johnston 27c005ae2c Merge branch 'release-v0.19.1' of github.com:matrix-org/synapse 2017-02-09 10:46:45 +00:00
Erik Johnston 505bfd82bb Update version and changelog 2017-02-09 10:41:02 +00:00
Daniel Dent fdbd90e25d Update CAPTCHA_SETUP.rst X-Forwarded-For docs 
It looks like CAPTCHA_SETUP.rst contains information relevant to an old version of Synapse, but Synapse now has a different approach to configuring use of the X-Forwarded-For header.
 2017-02-08 21:21:02 -08:00
Erik Johnston 52cd019a54 Make None check explicit 2017-02-08 16:04:29 +00:00
Erik Johnston f20cd34858 Merge pull request #1892 from matrix-org/erikj/rejection_fwd_extrem 
Ignore new rejected events when working out forward extremities.
 2017-02-08 16:59:06 +01:00
Erik Johnston 7723b4caa4 Ignore new rejected events when working out forward extremeties. 2017-02-08 14:48:06 +00:00
David Baker 9adcd3a514 Merge pull request #1891 from matrix-org/dbkr/remove_unused_constants 
Remove a few aspirational but unused constants
 2017-02-08 13:30:40 +00:00
David Baker 063a1251a9 Remove a few aspirational but unused constants 
from the Kegan era
 2017-02-08 11:36:08 +00:00
Erik Johnston af6da6db2d Merge pull request #1784 from morteza-araby/user-admin 
Administration functionalities
 2017-02-06 16:21:10 +01:00