Commit graph

5337 commits

Author SHA1 Message Date
Travis Ralston
9080c5f87f
Revert "Revert "MSC2033: Adding a device_id to /account/whoami"" 2020-08-18 08:53:34 -06:00
Travis Ralston
a4b5ec8fec
Merge pull request #2737 from matrix-org/revert-2033-travis/msc/whoami-device
Revert "MSC2033: Adding a device_id to /account/whoami"
2020-08-18 08:53:27 -06:00
Travis Ralston
ddc0d78e0c
Revert "MSC2033: Adding a device_id to /account/whoami" 2020-08-18 08:53:13 -06:00
Travis Ralston
0228cf8361
Merge pull request #2033 from matrix-org/travis/msc/whoami-device
MSC2033: Adding a device_id to /account/whoami
2020-08-18 08:47:00 -06:00
Travis Ralston
f0ba7f014b Update i18n for emoji 2020-08-13 11:54:56 -06:00
Travis Ralston
38431dca1c Merge remote-tracking branch 'RiotTranslateBot/weblate-matrix-doc-sas-emoji-v1' 2020-08-13 11:53:19 -06:00
Alexey Murz Korepov
76280f215c Translated using Weblate (Russian)
Currently translated at 100.0% (64 of 64 strings)

Translation: matrix-doc/SAS Emoji v1
Translate-URL: https://translate.riot.im/projects/matrix-doc/sas-emoji-v1/ru/
2020-08-13 17:51:40 +00:00
aWeinzierl
7da3b37524 Translated using Weblate (German)
Currently translated at 100.0% (64 of 64 strings)

Translation: matrix-doc/SAS Emoji v1
Translate-URL: https://translate.riot.im/projects/matrix-doc/sas-emoji-v1/de/
2020-08-13 17:51:39 +00:00
Brendan Abolivier
c04bf46800 Translated using Weblate (French)
Currently translated at 100.0% (64 of 64 strings)

Translation: matrix-doc/SAS Emoji v1
Translate-URL: https://translate.riot.im/projects/matrix-doc/sas-emoji-v1/fr/
2020-08-13 17:51:38 +00:00
Richard van der Hoff
05f5373a4a Translated using Weblate (French)
Currently translated at 100.0% (64 of 64 strings)

Translation: matrix-doc/SAS Emoji v1
Translate-URL: https://translate.riot.im/projects/matrix-doc/sas-emoji-v1/fr/
2020-08-13 17:51:38 +00:00
aWeinzierl
c5335a8922 Added translation using Weblate (German) 2020-08-13 07:29:45 +00:00
Alexey Murz Korepov
589b9a3f77 Added translation using Weblate (Russian) 2020-08-13 01:55:49 +00:00
strix aluco
5b9cbfb7bf Translated using Weblate (Ukrainian)
Currently translated at 100.0% (64 of 64 strings)

Translation: matrix-doc/SAS Emoji v1
Translate-URL: https://translate.riot.im/projects/matrix-doc/sas-emoji-v1/uk/
2020-08-13 01:16:12 +00:00
Will Hunt
c78ce90dfa Translated using Weblate (Spanish)
Currently translated at 31.2% (20 of 64 strings)

Translation: matrix-doc/SAS Emoji v1
Translate-URL: https://translate.riot.im/projects/matrix-doc/sas-emoji-v1/es/
2020-08-13 01:16:12 +00:00
reivilibre
5daf0fbb7b Translated using Weblate (Japanese)
Currently translated at 25.0% (16 of 64 strings)

Translation: matrix-doc/SAS Emoji v1
Translate-URL: https://translate.riot.im/projects/matrix-doc/sas-emoji-v1/ja/
2020-08-13 01:16:11 +00:00
reivilibre
1e401c8ae3 Translated using Weblate (French)
Currently translated at 42.2% (27 of 64 strings)

Translation: matrix-doc/SAS Emoji v1
Translate-URL: https://translate.riot.im/projects/matrix-doc/sas-emoji-v1/fr/
2020-08-13 01:16:11 +00:00
Will Hunt
299492b173 Added translation using Weblate (Spanish) 2020-08-12 21:19:30 +00:00
reivilibre
ae44ecdafc Added translation using Weblate (Japanese) 2020-08-12 20:52:34 +00:00
reivilibre
7e6bba3256 Added translation using Weblate (French) 2020-08-12 20:46:17 +00:00
Travis Ralston
fb48d1ab30
Merge pull request #2729 from RiotTranslateBot/weblate-matrix-doc-sas-emoji-v1
Update from Weblate
2020-08-12 14:35:06 -06:00
strix aluco
41fa1886db Added translation using Weblate (Ukrainian) 2020-08-12 20:33:54 +00:00
Travis Ralston
d37f7a25b4
Make translations for SAS emoji available in-tree (#2728)
* add a base file

* Fix directory name

* Added translation using Weblate (English)

* Translated using Weblate (English)

Currently translated at 1.6% (1 of 64 strings)

Translation: matrix-doc/SAS Emoji v1
Translate-URL: https://translate.riot.im/projects/matrix-doc/sas-emoji-v1/en_EN/

* add english files

* delete english files

* Added translation using Weblate (English)

* Added translation using Weblate (English)

* Do manual translations

* Deleted translation using Weblate (English)

* Deleted translation using Weblate (English)

* Add a script to update the definitions with the translations

* update i18n

* Add a note to the spec about translations

* changelog

* Ensure translations end with json
2020-08-12 14:04:48 -06:00
Travis Ralston
8eb1c53144 Merge branch 'clokep/login-fallback-changes' 2020-07-30 15:28:15 -06:00
Travis Ralston
d41ad7638e re-add note about the login process 2020-07-30 15:28:06 -06:00
Travis Ralston
5c0f999503
Merge pull request #2689 from Awesome-Technologies/fix_guest_e2ee
MSC2689: Fix E2EE for guests
2020-07-29 08:18:35 -06:00
Travis Ralston
0973e88c7c
Merge pull request #2663 from matrix-org/rei/pushrules_define_enabled
MSC2663: Errors for dealing with non-existent push rules
2020-07-29 08:15:41 -06:00
Patrick Cloke
4daecd0d94 Remove broken formatting. 2020-07-29 09:19:21 -04:00
Patrick Cloke
4353f346b6 Rename changelog file. 2020-07-29 09:18:21 -04:00
Patrick Cloke
e261faf70b
Review comments.
Co-authored-by: Travis Ralston <travpc@gmail.com>
2020-07-29 07:10:14 -04:00
Patrick Cloke
9a40d7bf47 Add information from MSC2604: Parameters for Login Fallback to the spec. 2020-07-28 16:04:31 -04:00
Travis Ralston
012f0b1882
Merge pull request #2609 from matrix-org/rav/remove_oauth2
Remove `m.login.token` and `m.login.oauth2` UIA types
2020-07-28 10:02:24 -06:00
Travis Ralston
24d124df50
Update changelogs/client_server/newsfragments/2609.removal 2020-07-28 10:02:11 -06:00
Travis Ralston
a96a014512
Merge pull request #2610 from matrix-org/rav/proposal/remove-oauth2-auth-type
MSC2610: Remove `m.login.oauth2` User-Interactive Authentication type from the specification
2020-07-28 10:01:36 -06:00
Travis Ralston
5990d98525
Merge pull request #2611 from matrix-org/rav/proposal-remove-token-auth-type
MSC2611: Remove `m.login.token` User-Interactive Authentication type from the specification
2020-07-28 09:58:55 -06:00
Michael Albert
78f3c3dac8
Update proposals/2689-fix-e2ee-for-guests.md
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2020-07-24 21:47:45 +02:00
Hubert Chathi
53e2b999b9
Merge pull request #2687 from uhoreg/sas2_spec
document new key agreement method for SAS verification and deprecate old method
2020-07-23 10:24:57 -04:00
Kitsune Ral
5a699f2650
Merge pull request #2518 from matrix-org/kitsune/cleanup
Assorted cleanup pieces
2020-07-23 08:42:41 +02:00
Hubert Chathi
33ed9fc2dd apply changes from review 2020-07-21 16:19:53 -04:00
Olivier Wilkinson (reivilibre)
3dd5bc42a7 inexistent may or may not be a non-existent word
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
2020-07-17 13:06:13 +01:00
Richard van der Hoff
125614f3a4
Make use of highlight tweak consistent (#2670)
* remove redundant 'highlight: false' tweaks

their inconsistent usage is super-confusing.

* Remove redundant 'value: true' on highlight tweaks

again, the inconsistency was super-confusing.

* changelog
2020-07-16 17:26:34 +01:00
Richard van der Hoff
1b74e96b7e fix RST in changelog 2020-07-16 15:21:50 +01:00
Richard van der Hoff
6da06383e8
Allow /make_join to return a 404 (#2688)
Specify that `GET /_matrix/federation/v1/make_join/{roomId}/{userId}` can
return a 404 if the room is unknown.
2020-07-16 15:17:40 +01:00
Michael Albert
250f0e47c1 Fix typos 2020-07-15 22:06:19 +02:00
Michael Albert
adc867dc99 Fix E2EE for guests 2020-07-15 21:47:28 +02:00
Hubert Chathi
793dae1ece add changelog 2020-07-13 16:03:12 -04:00
Hubert Chathi
0f13ebe3ed document new key agreement method and deprecate old method 2020-07-13 15:59:09 -04:00
Travis Ralston
e207dfc0ea
Merge pull request #2630 from uhoreg/sas2
MSC2630: checking public keys in SAS verification
2020-07-11 10:36:55 -06:00
Travis Ralston
adf9443df4
Merge pull request #2669 from matrix-org/rei/bug_type_actions
Fix spec bug concerning the type of a push rule's array of actions
2020-07-06 08:33:30 -06:00
Richard van der Hoff
868ca45729
move changelogs to the right directory (#2671)
looks like these ended up in the wrong place.
2020-07-06 15:15:29 +01:00
Olivier Wilkinson (reivilibre)
2e72da2343 Fix spec bug concerning the type of a push rule's array of actions
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
2020-07-06 13:14:27 +01:00