Amber Brown
|
31425d82a3
|
Merge remote-tracking branch 'origin/master' into develop
|
2018-11-19 12:55:25 -06:00 |
|
Amber Brown
|
80cac86b2c
|
Fix fallback auth on Python 3 (#4197)
|
2018-11-19 12:27:33 -06:00 |
|
Richard van der Hoff
|
10cdf519aa
|
Merge pull request #4182 from aaronraimist/update-issue-template
Add a pull request template and add multiple issue templates
|
2018-11-19 14:24:30 +01:00 |
|
Aaron Raimist
|
cc2cf2da97
|
Add changelog
Signed-off-by: Aaron Raimist <aaron@raim.ist>
|
2018-11-18 12:42:08 -06:00 |
|
Amber Brown
|
4285c818ec
|
Merge pull request #4193 from kivikakk/add-openbsd-prereq
add jpeg to OpenBSD prereq list
|
2018-11-17 14:27:53 -06:00 |
|
Ashe Connor
|
ceca3b2f30
|
add changelog.d entry
|
2018-11-17 15:01:02 +11:00 |
|
Travis Ralston
|
d75db3df59
|
Changelog
|
2018-11-15 20:44:57 -07:00 |
|
Amber Brown
|
8b1affe7d5
|
Fix Content-Disposition in media repository (#4176)
|
2018-11-15 15:55:58 -06:00 |
|
Travis Ralston
|
835779f7fb
|
Add option to track MAU stats (but not limit people) (#3830)
|
2018-11-15 18:08:27 +00:00 |
|
Amber Brown
|
df758e155d
|
Use <meta> tags to discover the per-page encoding of html previews (#4183)
|
2018-11-15 11:05:08 -06:00 |
|
Amber Brown
|
a51288e5d6
|
Add a coveragerc (#4180)
|
2018-11-15 10:50:08 -06:00 |
|
Richard van der Hoff
|
4f8bb633c7
|
Update README for #1491 fix
|
2018-11-15 10:03:36 +00:00 |
|
Richard van der Hoff
|
0c4dc6fd76
|
changelog
|
2018-11-14 10:48:08 +00:00 |
|
David Baker
|
0869566ad3
|
Merge pull request #4113 from matrix-org/dbkr/e2e_backup_versions_are_numbers
Make e2e backup versions numeric in the DB
|
2018-11-14 07:55:48 +00:00 |
|
Aaron Raimist
|
9ca1215582
|
Add changelog
Signed-off-by: Aaron Raimist <aaron@raim.ist>
|
2018-11-13 21:46:48 -06:00 |
|
David Baker
|
bca3b91c2d
|
Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backup_versions_are_numbers
|
2018-11-09 18:35:02 +00:00 |
|
Erik Johnston
|
db5a1c059a
|
Merge pull request #4166 from matrix-org/erikj/drop_unknown_events
Drop incoming events from federation for unknown rooms
|
2018-11-09 17:59:34 +00:00 |
|
Erik Johnston
|
7b22421a7b
|
Merge pull request #4164 from matrix-org/erikj/fix_device_comparison
Fix noop checks when updating device keys
|
2018-11-08 14:37:20 +00:00 |
|
Erik Johnston
|
94896d7ffe
|
Newsfile
|
2018-11-08 12:30:25 +00:00 |
|
Erik Johnston
|
06c3d8050f
|
Newsfile
|
2018-11-08 12:18:41 +00:00 |
|
Richard van der Hoff
|
de6223836e
|
changelog
|
2018-11-08 11:06:28 +00:00 |
|
Amber Brown
|
264cb14402
|
Port hash_password to Python 3 (#4161)
* port hash_password
* changelog
|
2018-11-08 04:57:28 +11:00 |
|
Amber Brown
|
b3708830b8
|
Fix URL preview bugs (type error when loading cache from db, content-type including quotes) (#4157)
|
2018-11-08 01:37:43 +11:00 |
|
Richard van der Hoff
|
c8ba79327b
|
Merge pull request #4155 from rubo77/purge-api
add purge_history.sh and purge_remote_media.sh scripts
|
2018-11-07 14:06:41 +00:00 |
|
rubo77
|
2904d133f3
|
add purge_history.sh and purge_remote_media.sh scripts to contrib/purge_api/
Signed-off-by: Ruben Barkow <github@r.z11.de>
|
2018-11-07 14:02:41 +01:00 |
|
Amber Brown
|
e62f7f17b3
|
Remove some boilerplate in tests (#4156)
|
2018-11-07 03:00:00 +11:00 |
|
Travis Ralston
|
0f5e51f726
|
Add config variables for enabling terms auth and the policy name (#4142)
So people can still collect consent the old way if they want to.
|
2018-11-06 10:32:34 +00:00 |
|
Hubert Chathi
|
f1087106cf
|
handle empty backups according to latest spec proposal (#4123)
fixes #4056
|
2018-11-05 17:59:29 -05:00 |
|
Amber Brown
|
efdcbbe46b
|
Tests for user consent resource (#4140)
|
2018-11-06 05:53:44 +11:00 |
|
Amber Brown
|
5a63589e80
|
Add some tests for the HTTP pusher (#4149)
|
2018-11-06 05:53:24 +11:00 |
|
Erik Johnston
|
bc80b3f454
|
Add helpers for getting prev and auth events (#4139)
* Add helpers for getting prev and auth events
This is in preparation for allowing the event format to change between
room versions.
|
2018-11-06 00:35:15 +11:00 |
|
Amber Brown
|
0467384d2f
|
Set the encoding to UTF8 in the default logconfig (#4138)
|
2018-11-03 02:28:07 +11:00 |
|
Erik Johnston
|
90d713b8c6
|
Merge pull request #4137 from matrix-org/erikj/clean_up_events
Clean up event accesses and tests
|
2018-11-02 14:12:49 +00:00 |
|
Erik Johnston
|
76cd7de108
|
Newsfile
|
2018-11-02 13:45:56 +00:00 |
|
Amber Brown
|
cb7a6b2379
|
Fix typing being reset causing infinite syncs (#4127)
|
2018-11-03 00:19:23 +11:00 |
|
Richard van der Hoff
|
efb9343c8c
|
Merge pull request #4132 from matrix-org/rav/fix_device_list_locking
Fix locked upsert on device_lists_remote_cache
|
2018-11-02 10:50:53 +00:00 |
|
Richard van der Hoff
|
00f12e00f8
|
Merge pull request #4133 from matrix-org/travis/fix-terms-auth
Fix logic error that prevented guests from seeing the privacy policy
|
2018-11-02 10:50:43 +00:00 |
|
Erik Johnston
|
b199534518
|
Merge pull request #4135 from matrix-org/erikj/fix_state_res_none
Fix None exception in state res v2
|
2018-11-02 10:45:57 +00:00 |
|
Richard van der Hoff
|
1cc6671ec4
|
changelog
|
2018-11-02 10:36:13 +00:00 |
|
Erik Johnston
|
f05d97e283
|
Newsfile
|
2018-11-02 10:32:06 +00:00 |
|
Travis Ralston
|
552f090f62
|
Changelog
|
2018-11-01 16:51:11 -06:00 |
|
Richard van der Hoff
|
3149d55b7d
|
Merge pull request #3778 from z3ntu/patch-1
Fix build of Docker image with docker-compose
|
2018-11-01 17:34:56 +00:00 |
|
Travis Ralston
|
c68aab1536
|
Merge pull request #4004 from matrix-org/travis/login-terms
Add m.login.terms to the registration flow
|
2018-11-01 11:03:38 -06:00 |
|
Erik Johnston
|
1b21e771d0
|
Merge pull request #4128 from matrix-org/erikj/state_res_v2_version
Add STATE_V2_TEST room version
|
2018-11-01 13:17:57 +00:00 |
|
Erik Johnston
|
62d683161e
|
Newsfile
|
2018-11-01 11:44:44 +00:00 |
|
Amber Brown
|
073d400b84
|
Merge branch 'master' into develop
|
2018-11-01 21:32:12 +11:00 |
|
Travis Ralston
|
d1e7b9c44c
|
Merge branch 'develop' into travis/login-terms
|
2018-10-31 13:15:14 -06:00 |
|
Richard van der Hoff
|
1729ba1650
|
Merge pull request #4101 from matrix-org/rav/aliases_for_upgrades
Attempt to move room aliases on room upgrades
|
2018-10-31 17:52:18 +00:00 |
|
Richard van der Hoff
|
94c7fadc98
|
Attempt to move room aliases on room upgrades
|
2018-10-31 15:43:57 +00:00 |
|
Richard van der Hoff
|
9b827c40ca
|
Log some bits about event creation (#4121)
I found these helpful in debugging my room upgrade tests.
|
2018-10-31 15:42:23 +00:00 |
|