matrix-spec

Filip/matrix-spec

Fork 0

mirror of https://github.com/matrix-org/matrix-spec synced 2026-03-18 09:24:10 +01:00

Commit graph

Select branches

Hide pull requests

anoa/invite_knock_room_state

anoa/nix_flake

anoa/update_docsy

dbkr/2746-reliable-voip

dbkr/3077-multi-stream-voip

dkasak/foldable-sidebar

main

rav/links_for_object_defs

rav/ref_objects_in_params

release/1.14

release/v1.10

release/v1.11

release/v1.12

release/v1.13

release/v1.15

release/v1.16

release/v1.17

release/v1.3

release/v1.4

release/v1.5

release/v1.6

release/v1.7

release/v1.8

release/v1.9

travis/knock-join

travis/msc2702-msc2701

travis/policy-servers

tulir/msc4142

#1002

#1003

#1008

#1011

#1012

#1021

#1028

#1030

#1031

#1032

#1035

#1036

#1037

#1038

#1040

#1042

#1043

#1045

#1050

#1051

#1052

#1054

#1055

#1056

#1059

#1062

#1067

#1070

#1081

#1082

#1084

#1088

#1093

#1094

#1097

#1099

#1100

#1101

#1102

#1103

#1107

#1110

#1113

#1114

#1115

#1119

#1120

#1126

#1127

#1128

#1129

#1131

#1131

#1132

#1134

#1135

#1137

#1140

#1143

#1155

#1158

#1161

#1162

#1164

#1165

#1166

#1169

#1170

#1172

#1174

#1175

#1178

#1179

#1180

#1183

#1185

#1190

#1191

#1192

#1193

#1194

#1195

#1196

#1197

#1198

#1199

#1200

#1201

#1205

#1206

#1210

#1211

#1215

#1216

#1230

#1234

#1236

#1237

#1238

#1239

#1240

#1243

#1254

#1255

#1260

#1261

#1263

#1265

#1266

#1268

#1269

#1270

#1271

#1273

#1276

#1278

#1283

#1284

#1286

#1289

#1293

#1294

#1295

#1303

#1305

#1306

#1308

#1310

#1317

#1318

#1319

#1320

#1321

#1323

#1329

#1330

#1331

#1338

#1339

#1340

#1341

#1342

#1344

#1345

#1346

#1347

#1348

#1349

#1350

#1351

#1353

#1355

#1357

#1363

#1366

#1368

#1370

#1371

#1376

#1381

#1382

#1383

#1384

#1393

#1397

#1398

#1409

#1412

#1415

#1417

#1421

#1422

#1423

#1424

#1425

#1431

#1432

#1433

#1439

#1440

#1441

#1442

#1443

#1444

#1445

#1446

#1447

#1449

#1454

#1455

#1456

#1457

#1461

#1462

#1463

#1464

#1465

#1466

#1468

#1473

#1474

#1475

#1476

#1478

#1479

#1483

#1484

#1485

#1486

#1487

#1488

#1495

#1499

#1500

#1501

#1506

#1507

#1508

#1509

#1510

#1511

#1516

#1517

#1518

#1521

#1525

#1526

#1529

#1530

#1531

#1534

#1535

#1536

#1538

#1540

#1541

#1542

#1546

#1549

#1550

#1551

#1552

#1556

#1558

#1559

#1560

#1561

#1562

#1563

#1564

#1573

#1578

#1579

#1582

#1583

#1584

#1585

#1587

#1590

#1591

#1593

#1596

#1597

#1598

#1599

#1600

#1601

#1602

#1604

#1615

#1617

#1618

#1620

#1621

#1623

#1624

#1627

#1629

#1633

#1634

#1635

#1636

#1637

#1638

#1639

#1644

#1645

#1646

#1647

#1648

#1650

#1652

#1655

#1656

#1657

#1658

#1660

#1661

#1665

#1671

#1672

#1673

#1676

#1677

#1680

#1685

#1687

#1689

#1690

#1695

#1697

#1699

#1709

#1712

#1713

#1714

#1715

#1717

#1718

#1719

#1720

#1721

#1724

#1725

#1728

#1730

#1731

#1732

#1733

#1734

#1735

#1737

#1739

#1740

#1741

#1742

#1744

#1745

#1746

#1748

#1749

#1751

#1754

#1755

#1756

#1757

#1758

#1759

#1762

#1763

#1765

#1766

#1769

#1770

#1771

#1772

#1773

#1775

#1776

#1781

#1786

#1787

#1788

#1789

#1791

#1793

#1794

#1796

#1797

#1798

#1799

#1800

#1801

#1802

#1803

#1804

#1805

#1806

#1808

#1809

#1810

#1812

#1813

#1814

#1816

#1818

#1819

#1822

#1823

#1824

#1827

#1828

#1829

#1830

#1831

#1832

#1833

#1834

#1836

#1838

#1839

#1840

#1841

#1842

#1843

#1844

#1846

#1847

#1848

#1849

#1850

#1851

#1852

#1853

#1854

#1855

#1856

#1858

#1860

#1861

#1862

#1863

#1865

#1866

#1867

#1869

#1870

#1871

#1872

#1875

#1876

#1877

#1880

#1881

#1882

#1883

#1884

#1885

#1886

#1888

#1890

#1892

#1895

#1896

#1897

#1899

#1903

#1905

#1907

#1908

#1909

#1910

#1914

#1915

#1916

#1918

#1919

#1920

#1921

#1921

#1923

#1924

#1926

#1928

#1929

#1930

#1933

#1934

#1935

#1936

#1937

#1938

#1939

#1940

#1941

#1944

#1945

#1946

#1947

#1954

#1956

#1959

#1966

#1967

#1968

#1969

#1970

#1971

#1972

#1973

#1974

#1975

#1976

#1977

#1978

#1979

#1980

#1983

#1984

#1985

#1991

#1994

#1995

#1996

#1997

#1999

#2000

#2001

#2002

#2003

#2004

#2005

#2006

#2007

#2008

#2009

#2010

#2011

#2014

#2015

#2016

#2017

#2018

#2021

#2022

#2024

#2026

#2028

#2029

#2032

#2033

#2036

#2038

#2041

#2042

#2044

#2045

#2046

#2047

#2048

#2049

#2050

#2051

#2055

#2057

#2059

#2061

#2063

#2064

#2065

#2066

#2067

#2068

#2069

#2070

#2071

#2072

#2073

#2074

#2076

#2077

#2078

#2079

#2080

#2081

#2083

#2088

#2091

#2093

#2095

#2100

#2101

#2102

#2104

#2105

#2106

#2107

#2108

#2109

#2114

#2115

#2121

#2122

#2123

#2125

#2128

#2130

#2131

#2132

#2133

#2137

#2140

#2141

#2144

#2147

#2148

#2149

#2150

#2151

#2153

#2154

#2157

#2158

#2159

#2160

#2164

#2167

#2169

#2171

#2172

#2175

#2177

#2179

#2181

#2182

#2186

#2187

#2188

#2189

#2190

#2191

#2193

#2195

#2199

#2204

#2205

#2206

#2207

#2210

#2211

#2212

#2213

#2214

#2215

#2216

#2217

#2219

#2220

#2221

#2222

#2223

#2224

#2225

#2226

#2227

#2229

#2231

#2232

#2233

#2234

#2238

#2239

#2240

#2241

#2242

#2245

#2246

#2249

#2250

#2255

#2256

#2257

#2258

#2259

#2260

#2261

#2262

#2263

#2264

#2267

#2268

#2270

#2272

#2273

#2275

#2276

#2277

#2278

#2280

#2282

#2283

#2284

#2287

#2288

#2289

#2290

#2291

#2292

#2297

#2298

#2299

#2300

#2301

#2303

#2304

#2305

#2306

#2307

#2311

#2315

#2316

#2317

#2318

#2319

#2320

#2323

#2324

#2326

#2326

#2328

#2329

#2330

#2331

#2331

#2332

#2332

#2333

#2334

#2334

#2336

#2337

#2338

#977

#978

#980

#987

#988

#989

#990

#991

#992

#993

#997

#998

0.2.0

application_service/r0.1.0

application_service/r0.1.1

application_service/r0.1.2

client-server/0.3.0

client-server/r0.1.0

client-server/r0.2.0

client-server/r0.3.0

client_server/r0.4.0

client_server/r0.5.0

client_server/r0.6.0

client_server/r0.6.1

identity_service/r0.1.0

identity_service/r0.2.0

identity_service/r0.2.1

identity_service/r0.3.0

push_gateway/r0.1.0

push_gateway/r0.1.1

r0.0.0

r0.0.1

server_server/r0.1.0

server_server/r0.1.1

server_server/r0.1.2

server_server/r0.1.3

server_server/r0.1.4

v1.1

v1.10

v1.11

v1.12

v1.13

v1.14

v1.15

v1.16

v1.17

v1.2

v1.3

v1.4

v1.5

v1.6

v1.7

v1.8

v1.9

4d653748d6 Add note back in Erik Johnston 2018-08-31 11:17:58 +0100
8e6c8ba59e Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/spec_3pid_ruls Erik Johnston 2018-08-31 11:13:13 +0100
a1aedb386a Actually use proper sentences like a proper adult Erik Johnston 2018-08-31 11:04:44 +0100
0adfd1ebb0

Merge pull request #1591 from matrix-org/erikj/fixup_auth_rules Erik Johnston 2018-08-31 11:01:12 +0100
d63184ebac Fixup Erik Johnston 2018-08-31 10:59:42 +0100
3c53e1910d Fixup Erik Johnston 2018-08-31 10:51:59 +0100
1a45bc4a85 Reword Erik Johnston 2018-08-31 10:24:51 +0100
59f86ec8f2 Reindent as RST requires sublists to be three spaces Erik Johnston 2018-08-31 10:07:53 +0100
f4706c8889 Require creator field Erik Johnston 2018-08-31 10:06:26 +0100
f3aea32a24 Be consistent with 'If..., reject' Erik Johnston 2018-08-31 09:59:45 +0100
6c8a45c165 Full stops Erik Johnston 2018-08-31 09:57:00 +0100
ebb044674f Remove duplicated explanation about event rejection Erik Johnston 2018-08-31 09:51:17 +0100
ac56e76746 Changelog Travis Ralston 2018-08-30 23:09:37 -0600
d57b40d0cc Clarify how the client should treat errors Travis Ralston 2018-08-30 23:06:32 -0600
e6adf9f6b9 Document known client-server error codes Travis Ralston 2018-08-30 23:05:51 -0600
4bd23a9086 send_attempt is no longer optional Travis Ralston 2018-08-30 22:28:50 -0600
7f719b23e7

Merge pull request #1589 from turt2live/travis/c2s/inhibit-login Travis Ralston 2018-08-30 18:21:39 -0600
f3181bbedd Changelog Travis Ralston 2018-08-30 18:20:50 -0600
dfaed5b525 Clean up and flesh out all three editions of the /requestToken API Travis Ralston 2018-08-30 18:18:08 -0600
2f55dd66da

Merge pull request #1441 from matrix-org/erikj/state_res_msc Travis Ralston 2018-08-30 16:56:17 -0600
ce14779af1

Merge pull request #1567 from turt2live/travis/c2s/3pid-binding Travis Ralston 2018-08-30 16:33:24 -0600
5da3072eef Wording change ('may not' has a special meaning) Travis Ralston 2018-08-30 16:32:14 -0600
4b7f308fc4

Merge pull request #1576 from turt2live/travis/s2s/key-mgmt Travis Ralston 2018-08-30 16:30:57 -0600
2a08a308f3 device_keys are required Travis Ralston 2018-08-30 16:29:24 -0600
caaa688e37 Fix links to client-server spec Travis Ralston 2018-08-30 16:28:26 -0600
219b27b182 Merge remote matrix-org/master Travis Ralston 2018-08-30 16:27:20 -0600
7516af3df2 Changelog Travis Ralston 2018-08-30 16:22:56 -0600
f923d08078 Add read markers Travis Ralston 2018-08-30 16:21:31 -0600
492df88024

Merge pull request #1622 from matrix-org/rav/clarify_event_signing Richard van der Hoff 2018-08-30 23:06:13 +0100
0f84c69805

Merge branch 'master' into rav/clarify_event_signing Richard van der Hoff 2018-08-30 22:48:56 +0100
8bcd7d26e3 /3pid/delete returns an empty object Travis Ralston 2018-08-30 15:28:43 -0600
390f1c16f7 Remove mentions of identity services from /3pid/delete Travis Ralston 2018-08-30 15:27:36 -0600
86c85aea71 Merge remote-tracking branch 'matrix-org/master' into travis/c2s/3pid-binding Travis Ralston 2018-08-30 15:23:50 -0600
98a445890c Render a warning if the spec is unstable Travis Ralston 2018-08-30 13:25:01 -0600
d57b977a55 Merge branch 'm-master' into travis/general/3pid_invite Travis Ralston 2018-08-30 15:01:31 -0600
1f6499d563 Fix typo Travis Ralston 2018-08-30 15:01:20 -0600
356626845c Remove unhelpful arrow from the 3rd party invite sequence dance Travis Ralston 2018-08-30 15:00:52 -0600
5e6a2c30a2 Comment out the part where identity services can revoke their keys Travis Ralston 2018-08-30 15:00:14 -0600
cee0a5ac7b

Merge pull request #1557 from turt2live/travis/general/r0-prep Travis Ralston 2018-08-30 14:46:35 -0600
a1b1054aa1 fix handling of multi-line state key descriptions Hubert Chathi 2018-08-30 15:57:09 -0400
4630c06721 Appservice r0.1.0 changelog application_service/r0.1.0 Travis Ralston 2018-08-30 11:24:36 -0600
951b442956

Merge pull request #1558 from turt2live/travis/c2s/fix-events Travis Ralston 2018-08-30 13:36:02 -0600
429f302744 Add an age to the invite room state example Travis Ralston 2018-08-30 13:32:53 -0600
32cde24bcf Fix server-server link in IS spec Travis Ralston 2018-08-30 12:26:24 -0600
e82c22b060

Merge pull request #1615 from turt2live/travis/is/touchups Travis Ralston 2018-08-30 12:23:25 -0600
b8f2c721dc Clarify which attributes should be valid Travis Ralston 2018-08-30 12:22:50 -0600
2d18b0d2d8 Merge remote-tracking branch 'matrix-org/master' into travis/c2s/clarify-html-again Travis Ralston 2018-08-30 12:21:38 -0600
f09db16027 Merge remote-tracking branch 'matrix-org/master' into travis/s2s/key-mgmt Travis Ralston 2018-08-30 12:19:59 -0600
49c5677969 Merge remote-tracking branch 'matrix-org/master' into travis/c2s/user-directory Travis Ralston 2018-08-30 12:18:35 -0600
2753d24302 Merge remote-tracking branch 'matrix-org/master' into travis/general/r0-prep Travis Ralston 2018-08-30 12:17:09 -0600
440841d1ff Recommend a CSP rather than require it. Travis Ralston 2018-08-30 12:13:21 -0600
464f4f5f21 Correctly check for the 'core' folder Travis Ralston 2018-08-30 12:05:56 -0600
c8a8f13623 Don't check the underlying definitions Travis Ralston 2018-08-30 11:57:01 -0600
31ea4279d1 Resolve references in the check_examples script Travis Ralston 2018-08-30 11:53:39 -0600
6aacec3178 Fix power level JSON example Travis Ralston 2018-08-30 11:40:08 -0600
f04afaa9b9

Merge pull request #780 from mujx/missing-enum-fields Travis Ralston 2018-08-30 11:37:34 -0600
827033c128 Merge remote matrix-org/master Travis Ralston 2018-08-30 11:29:47 -0600
138419cdd4

fix indentation on release process doc Travis Ralston 2018-08-30 11:19:55 -0600
70f72b5b3b

Merge pull request #1628 from turt2live/travis/as/external_url Travis Ralston 2018-08-30 11:12:39 -0600
f649d04ae1

Merge pull request #1626 from matrix-org/rav/encoding Richard van der Hoff 2018-08-30 18:11:38 +0100
cc1e496287

Merge pull request #1629 from turt2live/travis/as/route-versions Travis Ralston 2018-08-30 11:11:25 -0600
20c9829f56

Merge pull request #1627 from matrix-org/travis/general/dont-build-proposals Richard van der Hoff 2018-08-30 18:10:48 +0100
326ff6b1a1

Merge branch 'master' into travis/as/external_url Travis Ralston 2018-08-30 11:09:15 -0600
0f2e01f5b5

Merge pull request #1555 from turt2live/travis/as/cleanup Travis Ralston 2018-08-30 11:08:10 -0600
1a3f112337 Clarify that the external_url is unsafe Travis Ralston 2018-08-30 11:07:09 -0600
be5c566028 Version all appservice endpoints and provide a fallback Travis Ralston 2018-08-30 11:03:42 -0600
a48f7b9278 Clarify how external_url is supposed to work Travis Ralston 2018-08-30 10:49:05 -0600
ecd3ce39e5 Don't generate proposals.rst in Circle CI Travis Ralston 2018-08-30 10:29:59 -0600
05b017276c Don't accidentally limit application services to one homeserver Travis Ralston 2018-08-30 10:23:12 -0600
4e90b32348 Set the encoding to UTF-8 on all file I/O Richard van der Hoff 2018-08-30 17:18:07 +0100
f1ae872857 light zebra striping for tables Ben Parsons 2018-08-30 17:16:45 +0100
ab14f33060 Add link to the client-server ACLs module Travis Ralston 2018-08-30 07:58:10 -0600
5c2b8e3569 Explain how to handle rejeceted events Erik Johnston 2018-08-30 17:03:16 +0100
9e1d6d7490 sanitise caption handling Ben Parsons 2018-08-30 17:01:27 +0100
db644ca522 add some clarifications Hubert Chathi 2018-08-30 11:24:39 -0400
6b52e1df77

Merge pull request #1587 from turt2live/travis/s2s/clarify-state-ids-inclusion Travis Ralston 2018-08-30 07:44:27 -0600
56f6640c07

Merge pull request #1618 from turt2live/travis/c2s/initalsync Travis Ralston 2018-08-30 07:44:08 -0600
55c4307f12 Rewrite the section on signing events Richard van der Hoff 2018-08-30 14:37:24 +0100
7ecf2406eb

Merge pull request #1590 from turt2live/travis/c2s/403-put-state Travis Ralston 2018-08-30 06:50:48 -0600
5c059a5e26 ISes use keys too Richard van der Hoff 2018-08-30 11:09:24 +0100
6ba50fe2f6

Merge pull request #1588 from matrix-org/rav/fix_server_name Richard van der Hoff 2018-08-30 10:48:06 +0100
3d99c8b5a8 Changelog Travis Ralston 2018-08-29 23:19:18 -0600
bd93481013 Reference that transaction IDs may be used to echo Travis Ralston 2018-08-29 23:18:10 -0600
78487a01ec Remove references to initialSync from account data and receipts module Travis Ralston 2018-08-29 23:11:00 -0600
38bb222461 Changelog Travis Ralston 2018-08-29 23:00:21 -0600
e227095fb4 Add rich replies Travis Ralston 2018-08-29 17:42:44 -0600
b2092922e8 Don't define a variable for the appservice major version Travis Ralston 2018-08-29 21:51:26 -0600
a5c3924492 Merge remote matrix-org/master Travis Ralston 2018-08-29 21:28:24 -0600
fd7cb22a28 Fix event type example of m.forwarded_room_key Travis Ralston 2018-08-29 21:22:47 -0600
4230e375fa

Merge pull request #1465 from Zil0/key_sharing Hubert Chathi 2018-08-29 23:05:17 -0400
dc602b74d2 Reference the server-server specification for /onbind Travis Ralston 2018-08-29 21:01:49 -0600
0387da51e2 Clarify how sessions work when establishing associations Travis Ralston 2018-08-29 21:01:28 -0600
039cefdbea Say that identity services should be nice to web browsers (CORS/OPTIONS) Travis Ralston 2018-08-29 21:01:14 -0600
bbba7dedd6 Clean up identity service RST Travis Ralston 2018-08-29 21:00:47 -0600
f030d19f3c Clean up identity service swagger Travis Ralston 2018-08-29 20:57:41 -0600
0130620cc1

Merge pull request #1596 from uhoreg/e2e_sessions Hubert Chathi 2018-08-29 22:45:38 -0400
9b94e588e6 document new state resolution algorithm Hubert Chathi 2018-08-29 21:39:49 -0400
c7a228bf7b Don't make the major version a variable Travis Ralston 2018-08-29 19:32:52 -0600
e7a69a6a6d Merge remote-tracking branch 'matrix-org/master' into travis/general/r0-prep Travis Ralston 2018-08-29 19:29:42 -0600
a46783eb24 Revert "Take out the reference to the current version from the changelog" Travis Ralston 2018-08-29 17:47:09 -0600