Commit graph

3919 commits

Author SHA1 Message Date
Andrew Morgan
40482f7616 Add missing period 2019-05-07 15:55:07 -07:00
Andrew Morgan
c233535de0 fix typo 2019-05-07 15:51:32 -07:00
Andrew Morgan
da82a42308 fix grammatical error 2019-05-07 15:40:39 -07:00
Richard van der Hoff
7c7bc677fb Trigger matrix.org rebuild 2019-05-07 00:11:14 +01:00
Richard van der Hoff
4e9dc2098f
Fix comments which refer to jenkins. (#1981)
* Fix comments which refer to jenkins.

* Spelling

Co-Authored-By: turt2live <travpc@gmail.com>
2019-04-30 17:43:21 +01:00
Richard van der Hoff
de3eb3218e
Merge pull request #1975 from matrix-org/rav/thumbnail_dimensions
Make thumbnail dimensions mandatory
2019-04-29 12:37:43 +01:00
Richard van der Hoff
dc09dcd64b
Merge pull request #1976 from matrix-org/rav/buildkite
jenkins is dead, long live buildkite
2019-04-27 19:46:19 +01:00
Richard van der Hoff
6cdc8982fa jenkins is dead, long live buildkite 2019-04-26 15:58:31 +01:00
Richard van der Hoff
14715468bb Make thumbnail dimensions mandatory
Fixes #1883
2019-04-26 14:41:19 +01:00
Andrew Morgan
c230c2fd2f
Merge pull request #1967 from aqtusia/master
Replace /bind with /3pid/bind
2019-04-25 13:30:10 -07:00
Matthew Hodgson
5c62d6271c
Merge pull request #1969 from jplatte/patch-1
Fix a typo in m.call.invite
2019-04-21 11:54:32 +01:00
Andrew Morgan
5792e5f4de
Merge pull request #1954 from matrix-org/neilj/Remove-prev_content-from-the-essential-keys-list2
MSC1954: Proposal to remove prev_content from the essential keys list
2019-04-21 02:00:18 -07:00
Jonas Platte
043dddc490
Fix a typo in m.call.invite 2019-04-20 21:56:43 +02:00
Neil Johnson
911fb94ea0
typos 2019-04-15 17:08:09 +01:00
aqtusia
2eb9708f7f
Replace /unbind with /3pid/unbind 2019-04-14 18:21:59 +02:00
aqtusia
24e0ec4bce
Replace /bind with /3pid/bind 2019-04-14 18:17:44 +02:00
Neil Johnson
b41fbc86b6 add further potential issues and security concerns 2019-04-09 13:56:45 +01:00
Travis Ralston
b12e92440e
Merge pull request #1930 from matrix-org/travis/msc/tombstone-notif
MSC1930: Add a push rule for m.room.tombstone events
2019-04-08 11:25:52 -06:00
Travis Ralston
cecf75c9a9
Merge pull request #1884 from matrix-org/rav/proposal/no_slash_in_event_id
MSC1884: Proposal to replace slashes in event IDs
2019-04-08 11:25:26 -06:00
Travis Ralston
64d48855e2
Merge pull request #1955 from matrix-org/travis/spec/1704
Add permalink routing through ?via parameters on matrix.to URIs
2019-04-08 11:20:59 -06:00
Travis Ralston
99cd064f26 Update original MSC as per proposal guidelines 2019-04-05 16:37:27 -06:00
Travis Ralston
8ad82ce3c0 Add permalink routing through ?via parameters on matrix.to URIs
Spec for [MSC1704](https://github.com/matrix-org/matrix-doc/pull/1704)

Reference implementations:
* Original: https://github.com/matrix-org/matrix-react-sdk/pull/2250
* Modern recommendations: 2ca281f6b7/src/matrix-to.js (L29-L70)

The only deviation from the original MSC is the recommendation for which servers to pick. The original MSC failed to consider server ACLs and IP addresses correctly, and during implementation it was realized that both of these cases should be handled. The core principles of the original MSC are left unaltered.
2019-04-05 16:24:51 -06:00
Neil Johnson
743eeca27a MSC to remove prev_content from the essential keys list 2019-04-05 15:19:22 +01:00
Matthew Hodgson
88f533f0db incorporate further feedback 2019-04-01 10:27:30 +01:00
Matthew Hodgson
417f3a3e8b incorporate further feedback from vdh 2019-04-01 00:58:10 +01:00
Hubert Chathi
9dcf2d6a28
Update proposals/1884-replace-slashes-in-event_ids.md
Co-Authored-By: ara4n <matthew@arasphere.net>
2019-04-01 00:43:31 +01:00
Matthew Hodgson
207d6cf851 update MSC1884 to reflect new conclusions following discussion on the PR 2019-03-30 13:12:18 +00:00
Travis Ralston
1c5ec68cd0
Merge pull request #1876 from matrix-org/travis/v3-id-grammar
Clarify v3 event representation in identifier grammar
2019-03-27 08:57:11 -06:00
Hubert Chathi
0c87b22731
Merge pull request #1939 from matrix-org/uhoreg/fix_export_format
fix some errors in key export format
2019-03-26 10:25:42 -04:00
Hubert Chathi
d224c4ff71 fix some errors in key export format
- empirically, we don't acatually wrap the array in an object
- fix an incorrect type
2019-03-25 18:57:17 -04:00
Travis Ralston
b76b7cd178
Merge pull request #1915 from matrix-org/erikj/unbind_threepid_msc
MSC 1915 - Add a 3PID unbind API
2019-03-23 22:45:55 -06:00
Travis Ralston
0ec34039e8 URL encode all the things 2019-03-20 14:44:54 -06:00
Travis Ralston
42cf72c60f URL encode matrix.to URIs 2019-03-20 14:43:16 -06:00
Travis Ralston
fa541fd99a
Merge pull request #1933 from Vikingat-RAGE/master
E2E typo fix in spec
2019-03-18 15:56:03 -06:00
Vikingat-RAGE
76ee13b9bb Fixed bad spacing. 2019-03-18 21:54:56 +00:00
Vikingat-RAGE
1a739ec97b E2E typo fix in spec 2019-03-18 21:16:52 +00:00
David Baker
410a5dbbff
Update proposals/1915-unbind-identity-server-param.md
Co-Authored-By: erikjohnston <erikj@jki.re>
2019-03-18 09:36:01 +00:00
Erik Johnston
bd4fab7a15 Be more explicit identity server selection and errors 2019-03-18 09:28:46 +00:00
Travis Ralston
0e07a6d243 Proposal to have a push rule for m.room.tombstone events 2019-03-15 13:32:38 -06:00
Erik Johnston
60f1cf79de Update wording and add deactivate account API 2019-03-12 14:30:16 +00:00
David Baker
77110b46df
Update proposals/1915-unbind-identity-server-param.md
Co-Authored-By: erikjohnston <erikj@jki.re>
2019-03-08 12:14:08 +00:00
Erik Johnston
ee6513d608 Add alternative sid/client_secret authentication 2019-03-07 16:52:58 +00:00
Erik Johnston
f92925ed45 Add a 3PID unbind API 2019-03-06 11:32:28 +00:00
Travis Ralston
c08d223cfe
Merge pull request #1889 from ma1uta/push_rules
Fix for the #1865
2019-02-28 13:31:56 -07:00
Anatoly Sablin
5303ba54b7 Add a clarification changelog. 2019-02-28 21:04:23 +03:00
Travis Ralston
f1280ef305
Merge pull request #1910 from matrix-org/benpa/spelling-fix
in the appendices, thanks earfolds
2019-02-26 11:19:51 -07:00
Ben Parsons
99405418c9 in the appendices, thanks earfolds 2019-02-26 18:11:02 +00:00
Travis Ralston
324660073a
Merge pull request #1908 from matrix-org/travis/spec/unsupported-room-version
Describe M_UNSUPPORTED_ROOM_VERSION on invite and createRoom endpoints
2019-02-25 09:48:07 -07:00
Andrew Morgan
1c731630f8
Merge pull request #1909 from matrix-org/anoa/contrib_rst
Specify news fragments must be done in RST
2019-02-25 14:07:50 +00:00
Andrew Morgan
4049ca9208 Specify news fragments must be done in RST. 2019-02-25 09:47:19 +00:00