Commit Graph

6053 Commits (1b8f4e22b61196ce37dee0b230ae2c173aaa6676)
 

Author SHA1 Message Date
Patrick Cloke 45bcd86dcb Strip whitespace. 4 years ago
Travis Ralston ad32eb0029 Update i18n 4 years ago
Travis Ralston eb24928c8e
Merge pull request #3191 from RiotTranslateBot/weblate-matrix-doc-sas-emoji-v1
Translations update from Weblate
4 years ago
Weblate 10c606ecc5 Merge branch 'origin/master' into Weblate. 4 years ago
Travis Ralston 33b42be0a9
Merge pull request #3190 from matrix-org/dependabot/npm_and_yarn/lodash-4.17.21
Bump lodash from 4.17.20 to 4.17.21
4 years ago
dependabot[bot] a82313848f
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>
4 years ago
Travis Ralston 01bb971c85
Merge pull request #3186 from lukaslihotzki/fix-typo
Fix Typo
4 years ago
Lukas Lihotzki 16241a733f Fix Typo
Signed-off-by: Lukas Lihotzki <lukas@lihotzki.de>
4 years ago
Travis Ralston 8594a015c4
Merge pull request #3185 from matrix-org/travis/clarify/1772
Mention expected client behaviour of unknown types on MSC1772
4 years ago
Travis Ralston 31e444bdaf Mention expected client behaviour of unknown types on MSC1772
This was discussed in various places, but never quite made it to the MSC.
4 years ago
Travis Ralston 41fbc11040
Merge pull request #3181 from lukaslihotzki/fix-add3pid-tag
OpenAPI: fix tags of add3PID
4 years ago
Travis Ralston 6db3885fc8
Merge pull request #3122 from uhoreg/deprecate_verification_start
MSC3122: Deprecate starting verifications without requesting first
4 years ago
Szimszon 8fa0cba776 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/
4 years ago
Lukas Lihotzki aeca4dede1 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>
4 years ago
Andrew Morgan a7b344d45a
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.
4 years ago
Will Hunt 16290a0fe5
it's 4 years ago
Will Hunt 93dd264c30
words 4 years ago
Will Hunt c8e0ed6062
Hopefully improve words around M_EXCLUSIVE 4 years ago
Will Hunt b8ab3d0c87
Remove point about Element showing unexpected devices 4 years ago
Travis Ralston 6c4ee891c3
Merge pull request #3177 from matrix-org/travis/spec/spaces-groups-rm
Remove group identifiers
4 years ago
Will Hunt 538ac0940e
Update Alternatives section 4 years ago
Will Hunt 0c26298b93
Update proposals/2778-appservice-login.md
Co-authored-by: Christian Paul <christianp@matrix.org>
4 years ago
Travis Ralston 15d22c4329
Merge pull request #1772 from matrix-org/matthew/msc1772
MSC1772: Matrix spaces
4 years ago
Christian Paul 4ca319db09
Update proposals/2778-appservice-login.md 4 years ago
Andrew Morgan a04d103d11
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).
4 years ago
Travis Ralston 4fc54875b1
Merge pull request #3170 from matrix-org/travis/spec/msc2713-rm-v1-id
Remove v1 identity service API
4 years ago
Travis Ralston abbf2d5fbc 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.
4 years ago
Travis Ralston 51e602bf3b Changelogs 4 years ago
Travis Ralston 69381cc6a4 Case fold instead of lowercase
Fixes https://github.com/matrix-org/matrix-doc/issues/3175
4 years ago
Travis Ralston f27b8e36b9
Merge pull request #3101 from matrix-org/travis/spec/MSC2320-identity-versions
Add identity service versions API
4 years ago
Travis Ralston a083846dde
Update data/api/identity/versions.yaml
Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
4 years ago
Patrick Cloke 97737596e7 Remove cycle breaking algorithm to be specced in the future, if necessary. 4 years ago
Travis Ralston ab0c773d80
Merge pull request #3163 from matrix-org/travis/spec/msc2858-multisso
Describe social-sign-on (multiple SSO providers)
4 years ago
Travis Ralston 70d9deb2e8
Apply suggestions from code review
Co-authored-by: Hubert Chathi <hubert@uhoreg.ca>
4 years ago
Matthew Hodgson c2d0d1efa0 include m.room.create in knock_state (will be overtaken by MSC3173) 4 years ago
Patrick Cloke 1cfbf7620a Wrapping. 4 years ago
Patrick Cloke b6cba64459 Update MSC number. 4 years ago
Patrick Cloke ce8650837b Wording. 4 years ago
Will Hunt e781b75847 Mention that /register provides a token but it's not helpful 4 years ago
Patrick Cloke 3d913b36f8 Add current proposals. 4 years ago
Will Hunt bf9cc0a562 M_EXCLUSIVE 4 years ago
Patrick Cloke 36b19fb083 Clarify link. 4 years ago
Will Hunt 03491c5cfd Add security considerations 4 years ago
Travis Ralston 67b62cfe43 Clarify render approach 4 years ago
Travis Ralston e6245f667d Clarify provider naming 4 years ago
Travis Ralston 641d2adfa0
Apply suggestions from code review
Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com>
4 years ago
Travis Ralston 2119b5ed3e
Merge pull request #3167 from matrix-org/travis/spec/msc2265-lower-3pid
Specify that email handling converts to lowercase first
4 years ago
Travis Ralston e20735a170
Merge pull request #3166 from matrix-org/travis/spec/msc2033-whoami-deviceid
Spec device_id on whoami
4 years ago
Travis Ralston 42717187b4
Spelling 4 years ago
Travis Ralston 34c5d8e96f
Merge pull request #3169 from matrix-org/travis/spec/msc2284-is-optional
Downgrade identity server failure to FAIL_PROMPT instead of FAIL_ERROR
4 years ago