Commit Graph

6283 Commits (b14510fc27b66367546ff7e4b94d61af77a97e45)
 

Author SHA1 Message Date
Weblate 0794722d82 Merge branch 'origin/master' into Weblate. 3 years ago
Travis Ralston c254aac25d Merge pull request #3186 from lukaslihotzki/fix-typo
Fix Typo
3 years ago
dependabot[bot] 685819049a Bump lodash from 4.17.20 to 4.17.21
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
3 years ago
Szimszon 1282e8a91c Translated using Weblate (Hungarian)
Currently translated at 100.0% (64 of 64 strings)

Translation: matrix-doc/SAS Emoji v1
Translate-URL: https://translate.element.io/projects/matrix-doc/sas-emoji-v1/hu/
3 years ago
Travis Ralston 71a0f9f9a2 Merge pull request #3185 from matrix-org/travis/clarify/1772
Mention expected client behaviour of unknown types on MSC1772
3 years ago
Lukas Lihotzki 6c46933fbc Fix Typo
Signed-off-by: Lukas Lihotzki <lukas@lihotzki.de>
3 years ago
Szimszon 0ea5f72c83 Added translation using Weblate (Hungarian) 3 years ago
Travis Ralston 2fbd3e6210 Merge pull request #3181 from lukaslihotzki/fix-add3pid-tag
OpenAPI: fix tags of add3PID
3 years ago
Travis Ralston 6012ddcdec Mention expected client behaviour of unknown types on MSC1772
This was discussed in various places, but never quite made it to the MSC.
3 years ago
Travis Ralston 86661bbfbb Merge pull request #3122 from uhoreg/deprecate_verification_start
MSC3122: Deprecate starting verifications without requesting first
3 years ago
Lukas Lihotzki 2fa7b59e1a OpenAPI: fix tags of add3PID
The tag needs to be set to include add3PID in scripts/swagger/api-docs.json.

Signed-off-by: Lukas Lihotzki <lukas@lihotzki.de>
3 years ago
Andrew Morgan 5d0d5a3981 Clarify what happens when a concern is raised during FCP (#3180)
It wasn't entirely clear what should happen to the FCP timer (and state) when a concern is raised during FCP. After some discussion, we agreed that when a concern is raised:

1. FCP will continue to not conclude until at least 5 days have passed, but once those 5 days are up it *still* won't conclude until all concerns raised during FCP are resolved.
2. If a concern warrants a large enough change in the document, then the Spec Core Team may consider cancelling FCP and restarting the timer in order for people to have some time to think about and review the new changes.
3 years ago
Travis Ralston a5fea91d86 Merge pull request #3177 from matrix-org/travis/spec/spaces-groups-rm
Remove group identifiers
3 years ago
Travis Ralston fb3dde1c2c Merge pull request #3167 from matrix-org/travis/spec/msc2265-lower-3pid
Specify that email handling converts to lowercase first
3 years ago
Travis Ralston 3d217e0de0 Merge pull request #3101 from matrix-org/travis/spec/MSC2320-identity-versions
Add identity service versions API
3 years ago
Hubert Chathi adbe95259f add link to relevant spec 3 years ago
Travis Ralston 6917c708c9 Merge pull request #1772 from matrix-org/matthew/msc1772
MSC1772: Matrix spaces
3 years ago
Travis Ralston 3c01fa4681 Remove group identifiers
Groups are replaced by https://github.com/matrix-org/matrix-doc/pull/1772 and this probably shouldn't have made it into the spec in the first place without the remaining context of Groups.
3 years ago
Travis Ralston d41658e714 Merge pull request #3166 from matrix-org/travis/spec/msc2033-whoami-deviceid
Spec device_id on whoami
3 years ago
Travis Ralston c11efb35fe Merge pull request #3163 from matrix-org/travis/spec/msc2858-multisso
Describe social-sign-on (multiple SSO providers)
3 years ago
Hubert Chathi 620278786d Update proposals/3122-deprecate-starting-verifications-without-request.md
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
3 years ago
Andrew Morgan ad93aa6546 Update client_secret examples so that they are valid (#2985)
The regex of allowed characters for a `client_secret` parameter is `[0-9a-zA-Z.=_-]`.

This PR updates the `client_secret` spec examples, which currently include an invalid character (an apostrophe).
3 years ago
Travis Ralston fbec7a1bcb Merge pull request #3169 from matrix-org/travis/spec/msc2284-is-optional
Downgrade identity server failure to FAIL_PROMPT instead of FAIL_ERROR
3 years ago
Hubert Chathi fbbdd0f6cc I should pay attention when my editor says that things are misspelled 3 years ago
Travis Ralston 466911b253 Merge pull request #3170 from matrix-org/travis/spec/msc2713-rm-v1-id
Remove v1 identity service API
3 years ago
Hubert Chathi e0ec01a999 use MSC number 3 years ago
Hubert Chathi ca3c42d865 deprecate starting verifications without first requesting 3 years ago
Travis Ralston 53833d49a5 Spelling 3 years ago
Travis Ralston c1d1f88a55 Update data/api/identity/versions.yaml
Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
3 years ago
Travis Ralston c5eaa59c79 Changelog 3 years ago
Travis Ralston 2c3d7b1682 Apply suggestions from code review
Co-authored-by: Hubert Chathi <hubert@uhoreg.ca>
3 years ago
Travis Ralston 457f3995af Merge pull request #3154 from matrix-org/travis/spec/knock-knock-whos-there
Add knocking to the spec
3 years ago
Travis Ralston 21a0a97134 changelog 3 years ago
Travis Ralston 67d5d9eb49 Changelog 3 years ago
Travis Ralston 94ca646fb7 changelog 3 years ago
Travis Ralston 57f609cf1b Typo fixes 3 years ago
Travis Ralston 3b2c0ff233 Spec device_id on whoami
Spec for https://github.com/matrix-org/matrix-doc/pull/2033
3 years ago
Travis Ralston 3683d334f7 Clarify render approach 3 years ago
Hubert Chathi ec9ea2b6e3 Merge pull request #3149 from uhoreg/qr_codes_spec
Add spec for verification by QR codes.
3 years ago
Travis Ralston 01a7f06ce4 Add missing endpoint changelog 3 years ago
Travis Ralston 49a5ca3553 Downgrade identity server failure to FAIL_PROMPT instead of FAIL_ERROR
Spec for https://github.com/matrix-org/matrix-doc/pull/2284
3 years ago
Travis Ralston 37c3a3f855 Remove v1 identity service API
Spec for https://github.com/matrix-org/matrix-doc/pull/2713
3 years ago
Travis Ralston 7cef7d0fcf Specify that email handling converts to lowercase first
Spec for https://github.com/matrix-org/matrix-doc/pull/2265
3 years ago
Travis Ralston fc6aa30000 Merge branch 'master' into travis/spec/MSC2320-identity-versions 3 years ago
Travis Ralston 3aa517a868 Clarify provider naming 3 years ago
Hubert Chathi e9e0d8ee47 Merge pull request #3151 from uhoreg/single_ssss_spec
Document Single SSSS.
3 years ago
Travis Ralston 57f4347b5d Fix general wording 3 years ago
Travis Ralston de19b86eed Changelog 3 years ago
Travis Ralston cbd761df17 Apply suggestions from code review
Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com>
3 years ago
Hubert Chathi 3084f3d32f Merge pull request #3150 from uhoreg/verification_fixes
Make SAS outline fit with key verification in DM flow.
3 years ago