Commit graph

4866 commits

Author SHA1 Message Date
Travis Ralston
29d0d97b25 Merge branch 'master' into travis/msc/rooms-v6 2020-05-12 15:58:52 -06:00
Travis Ralston
3556b8457f Add changelog for 2527 2020-05-11 21:05:26 -06:00
Travis Ralston
d69e5af7ab Merge remote-tracking branch 'Gnuxie/patch-1' 2020-05-11 21:04:34 -06:00
Travis Ralston
10293d6951
Merge pull request #2532 from matrix-org/clokep/sso-login
Add MSC2454 to the specification.
2020-05-11 14:02:38 -06:00
Patrick Cloke
e85f6c31a3
Fix a typo found in review.
Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
2020-05-11 15:14:11 -04:00
Patrick Cloke
78f8d1322f Add MSC2454 to the specification. 2020-05-08 11:28:59 -04:00
Ben Parsons
c704da1449 remove proposal 2020-05-07 15:49:18 +01:00
Ben Parsons
9065d1aa14 proposal to use existing events as captions for images 2020-05-07 15:45:33 +01:00
Richard van der Hoff
6613cd89a6
2454-ui-interactive-auth-for-sso.md: markup fix 2020-05-07 15:42:04 +01:00
Gnuxie
6b8b31ce63
correct use of required annotation in json-schema
https://tools.ietf.org/html/draft-handrews-json-schema-validation-02#section-6.5.3
2020-05-06 17:10:39 +01:00
Hubert Chathi
0d2924841b
Merge pull request #2524 from uhoreg/e2e_misc_fixes_202005
misc fixes in e2ee spec
2020-05-05 16:10:27 -04:00
Hubert Chathi
6ede023b35 make the changelog match others so they get combined 2020-05-05 16:06:21 -04:00
Hubert Chathi
9980b83dd4 add changelog 2020-05-05 15:54:53 -04:00
Travis Ralston
4cd4e19bf8
Merge pull request #2454 from matrix-org/clokep/ui-interactive-auth-for-sso
MSC2454: Support UI interactive auth for SSO
2020-05-05 10:28:11 -06:00
Travis Ralston
bc0c81f062
Merge pull request #2525 from matrix-org/poljar/event-id-required
client-server: Mark the event_id when putting room events as required.
2020-05-05 09:22:05 -06:00
Travis Ralston
b0e8fd648d
Apply suggestions from code review 2020-05-05 09:21:58 -06:00
Damir Jelić
3054ac572f changelogs: Fragment for the event id when putting room events clarification. 2020-05-05 12:17:54 +02:00
Damir Jelić
6e33954256 client-server: Mark the event_id when putting room events as required. 2020-05-05 12:11:51 +02:00
Hubert Chathi
e89521d195 some fixes (spelling, RST, and naming) 2020-05-04 22:08:22 -04:00
Travis Ralston
8b4cfc643f
Merge pull request #2523 from matrix-org/clokep/passwd-invalidation-spec
Add an additional parameter to the modify password API per MSC2457.
2020-05-04 14:29:41 -06:00
Patrick Cloke
1e330c9423 Clarify revocation behavior. 2020-05-04 16:23:31 -04:00
Patrick Cloke
0c582ea8c7
Apply suggestions from code review
Co-authored-by: Travis Ralston <travpc@gmail.com>
2020-05-04 16:21:19 -04:00
Patrick Cloke
958e1b4a2e Make the spec changes for MSC 2457. 2020-05-04 14:36:52 -04:00
Travis Ralston
8ba6d0157b
Merge pull request #2457 from matrix-org/clokep/modify-password-invalid-sessions
MSC2457: Invalidating devices during password modification
2020-05-02 17:58:27 -06:00
Travis Ralston
411b3f432b Update changelog 2020-05-01 10:25:47 -06:00
Travis Ralston
0207242e23 Merge remote-tracking branch 'auscompgeek/push-username-highlight' 2020-05-01 10:25:15 -06:00
David Vo
b8efb5ac47 Add changelog for 2519
Signed-off-by: David Vo <david@vovo.id.au>
2020-05-01 15:27:20 +10:00
David Vo
0ae597626a Fix .m.rule.contains_user_name push rule to highlight
Signed-off-by: David Vo <david@vovo.id.au>
2020-05-01 00:32:15 +10:00
Travis Ralston
a3385126a7
Merge pull request #2507 from matrix-org/travis/proposal-buckets
Add some words about what categories are
2020-04-27 10:06:08 -06:00
Travis Ralston
16905a2f5b Make the spec core team the Spec Core Team 2020-04-22 14:31:34 -06:00
Travis Ralston
97b23da9f6 Update changelog entry for 2510 clarification 2020-04-22 14:27:22 -06:00
Travis Ralston
b8f68cb874 Merge remote-tracking branch 'valkum/patch-1' 2020-04-22 14:26:43 -06:00
Rudi Floren
2bc798dcfa
Add changelog newsfragment 2020-04-22 22:21:36 +02:00
Rudi Floren
b5868a59d6
Fix typo in Fed. API request auth python example
Fixes the typo in the Request Authentication python example. It seems like a copy paste error.

Closes: #2509
Signed-off-by: Rudi Floren <rudi.floren@gmail.com>
2020-04-22 22:18:28 +02:00
Travis Ralston
3c34d83082 Add some words about what categories are 2020-04-22 13:37:50 -06:00
Hubert Chathi
32aecc506f
Merge pull request #2503 from uhoreg/msc-fixes-2020-04
minor clarifications and corrections
2020-04-16 15:34:24 -04:00
Hubert Chathi
9103a0a398 minor clarifications and corrections 2020-04-16 14:58:44 -04:00
Patrick Cloke
f6879c897b
Fix minor grammatical fixes.
Co-Authored-By: Hubert Chathi <hubert@uhoreg.ca>
2020-04-15 07:39:00 -04:00
Travis Ralston
be1669dd5b Merge branch 'fix-iv' 2020-04-07 13:14:03 -06:00
Travis Ralston
b908b8e777 Add changelog 2020-04-07 13:13:52 -06:00
Lukas Lihotzki
af7cf84083 Fix iv parameter description
Signed-off-by: Lukas Lihotzki <lukas@lihotzki.de>
2020-04-07 17:54:09 +02:00
Ben Parsons
57f3c8494f
Merge pull request #2491 from matrix-org/benp/proposals-scraper-fix
fix pagination in proposals scraper
2020-04-07 16:24:30 +01:00
Ben Parsons
7c037d2490 improve capture and add example 2020-04-07 15:26:48 +01:00
Ben Parsons
5ae8a8bcfd fix pagination in scraper 2020-04-07 14:37:55 +01:00
Patrick Cloke
4cfcda57fb Clarify that the only new item here is the new authentication type. 2020-04-01 10:48:05 -04:00
Travis Ralston
78a0843758
Merge pull request #2482 from aaronaxvig/master
Improve Windows steps
2020-03-30 12:43:03 -06:00
aaronaxvig
2f5d8a4a27
Removed PowerShell stuff
Clarified to use Command Prompt as recommended is pull request #2479, removed all PowerShell stuff.
2020-03-30 14:32:45 -04:00
aaronaxvig
5da5d5eeb9
Merge pull request #1 from matrix-org/master
Updating my fork
2020-03-28 18:39:49 -04:00
Aaron Axvig
edd75703e2 Improved steps for building docs on Windows 2020-03-28 18:32:53 -04:00
Patrick Cloke
745f8c09df Fix incorrect statement about the current spec's guidance. 2020-03-27 14:01:04 -04:00