Richard van der Hoff
|
c70809a275
|
Merge pull request #4163 from matrix-org/rav/fix_consent_on_py3
Fix encoding error for consent form on python3
|
2018-11-08 12:48:51 +00:00 |
|
Richard van der Hoff
|
0a1fc52971
|
fix parse_string docstring
|
2018-11-08 11:12:29 +00:00 |
|
Richard van der Hoff
|
de6223836e
|
changelog
|
2018-11-08 11:06:28 +00:00 |
|
hera
|
2b075fb03a
|
Fix encoding error for consent form on python3
The form was rendering this as "b'01234....'".
-- richvdh
|
2018-11-08 11:05:39 +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 |
|
Erik Johnston
|
b86d05a279
|
Clean up event accesses and tests
This is in preparation to refactor FrozenEvent to support different
event formats for different room versions
|
2018-11-02 13:44:14 +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 |
|
Richard van der Hoff
|
350f654e7b
|
Add unique indexes to a couple of tables
The indexes on device_lists_remote_extremeties can be unique, and they
therefore should, to ensure that the db remains consistent.
|
2018-11-02 10:36:13 +00:00 |
|
Richard van der Hoff
|
50e328d1e7
|
Remove redundant database locks for device list updates
We can rely on the application-level per-user linearizer.
|
2018-11-02 10:36:13 +00:00 |
|
Erik Johnston
|
f05d97e283
|
Newsfile
|
2018-11-02 10:32:06 +00:00 |
|
Erik Johnston
|
54aec35867
|
Fix None exception in state res v2
|
2018-11-02 10:29:19 +00:00 |
|
Travis Ralston
|
552f090f62
|
Changelog
|
2018-11-01 16:51:11 -06:00 |
|
Travis Ralston
|
642505abc3
|
Fix logic error that prevented guests from seeing the privacy policy
|
2018-11-01 16:48:32 -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 |
|
Erik Johnston
|
b3dd6fa981
|
Add STATE_V2_TEST room version
|
2018-11-01 11:43:46 +00:00 |
|
Amber Brown
|
073d400b84
|
Merge branch 'master' into develop
|
2018-11-01 21:32:12 +11:00 |
|
Amber Brown
|
907e6da5be
|
Merge branch 'release-v0.33.8'
|
2018-11-01 21:31:46 +11:00 |
|
Amber Brown
|
d0ebe82871
|
changelog
|
2018-11-01 21:29:11 +11:00 |
|
Amber Brown
|
aa98e38896
|
version
|
2018-11-01 21:28:35 +11:00 |
|
Travis Ralston
|
a8c9faa9a2
|
The tests also need a version parameter
|
2018-10-31 13:28:08 -06:00 |
|
Travis Ralston
|
a8d41c6aff
|
Include a version query string arg for the consent route
|
2018-10-31 13:19:28 -06: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
|
4ecb8b7de8
|
Merge pull request #4125 from MazeChaZer/fix-typo-in-docker-compose
Fix typo in docker-compose.yml
|
2018-10-31 15:55:01 +00:00 |
|
Richard van der Hoff
|
0f8591a5a8
|
Avoid else clause on exception for clarity
|
2018-10-31 15:43:57 +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 |
|
Richard van der Hoff
|
60f128a401
|
Merge pull request #4124 from matrix-org/rav/fix_tox
Attempt to fix tox installs
|
2018-10-31 15:41:55 +00:00 |
|
Jonas Schürmann
|
e3758c8c92
|
Fix typo in docker-compose.yml
Signed-off-by: Jonas Schürmann <jonasschuermann@aol.de>
|
2018-10-31 15:46:47 +01:00 |
|
Amber Brown
|
916efc8249
|
Remove fetching keys via the deprecated v1 kex method (#4120)
|
2018-10-31 23:14:39 +11:00 |
|
Amber Brown
|
f79f454485
|
Remove deprecated v1 key exchange endpoint (#4119)
|
2018-10-31 22:29:02 +11:00 |
|