matrix-spec

Filip/matrix-spec

Fork 0

mirror of https://github.com/matrix-org/matrix-spec synced 2026-08-01 10:37:48 +02: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/encrypted_file_definition

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.18

release/v1.19

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

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

#2328

#2329

#2330

#2331

#2332

#2333

#2334

#2336

#2337

#2338

#2340

#2340

#2341

#2343

#2344

#2345

#2346

#2347

#2348

#2349

#2351

#2352

#2354

#2357

#2357

#2358

#2359

#2360

#2361

#2364

#2366

#2367

#2368

#2369

#2370

#2371

#2372

#2373

#2374

#2375

#2376

#2377

#2379

#2381

#2382

#2383

#2385

#2386

#2387

#2389

#2392

#2394

#2395

#2396

#2397

#2398

#2399

#2400

#2401

#2402

#2403

#2404

#2407

#2408

#2410

#2410

#2411

#2411

#2412

#2413

#2414

#2417

#2418

#2421

#2422

#2426

#2426

#2427

#2427

#2428

#2428

#2429

#2429

#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.18

v1.19

v1.2

v1.3

v1.4

v1.5

v1.6

v1.7

v1.8

v1.9

835f5de387 Generalize the token name even more Travis Ralston 2018-08-31 14:22:07 -0600
cb1e687196 spec the format of an IS invite token Richard van der Hoff 2018-08-31 21:16:32 +0100
69c30ef156 spec the format of a client_secret Richard van der Hoff 2018-08-31 21:11:11 +0100
dced3d5707 Notes on the format of IS session IDs and tokens Richard van der Hoff 2018-08-31 21:03:15 +0100
f299fe023a English Travis Ralston 2018-08-31 12:51:31 -0600
e49ed5d1ec Changelog Travis Ralston 2018-08-31 12:37:24 -0600
f4c5c209f3 Generalize language for pagination Travis Ralston 2018-08-31 12:36:08 -0600
824ce22caa Add additional clarity to the requestToken errors Travis Ralston 2018-08-31 11:41:46 -0600
5bb7eca8e8 English Travis Ralston 2018-08-31 11:31:03 -0600
c0dd7e0025

Merge pull request #1420 from Zil0/encrypted_attach Hubert Chathi 2018-08-31 13:33:05 -0400
60dd9231e0 Don't explain how the IS might accept a 3pid Travis Ralston 2018-08-31 11:26:28 -0600
63fdd72f73 Fix error description on /account/3pid/email/requestToken Travis Ralston 2018-08-31 11:24:35 -0600
25a461b86e

Merge pull request #1617 from turt2live/travis/c2s/rich-replies Travis Ralston 2018-08-31 11:21:34 -0600
4b9fb99644 Take out unhelpful example Travis Ralston 2018-08-31 11:18:54 -0600
3146fc339a Merge remote-tracking branch 'matrix-org/master' into travis/c2s/clarify-errors Travis Ralston 2018-08-31 11:15:03 -0600
f6d9e53f5c Clarify that homeserver must reject clients from setting m.fully_read Travis Ralston 2018-08-31 11:13:32 -0600
2e8151999e Clarify that read markers are fully read markers Travis Ralston 2018-08-31 11:13:19 -0600
f1f32d3a15 add more clarifications Hubert Chathi 2018-08-31 12:59:57 -0400
679ddabb53 Merge remote-tracking branch 'matrix-org/master' into travis/c2s/read-markers Travis Ralston 2018-08-31 10:34:19 -0600
a4c2b2b905 General clarity and spelling for the requestToken APIs Travis Ralston 2018-08-31 10:32:30 -0600
7f1b94c211 Merge remote-tracking branch 'matrix-org/master' into travis/c2s/id-server Travis Ralston 2018-08-31 10:29:09 -0600
567843e043 Add additional clarity to how rich replies are structured and used Travis Ralston 2018-08-31 10:20:26 -0600
e3daf10bb9 refactor encrypted file schema as "Extension to m.message" Hubert Chathi 2018-08-31 12:11:27 -0400
9004be7bda Merge remote matrix-org/master Travis Ralston 2018-08-31 10:08:05 -0600
25778989a1

Merge pull request #1573 from turt2live/travis/c2s/sync-event-fields Travis Ralston 2018-08-31 10:00:17 -0600
f013b7ef03

Merge pull request #1631 from turt2live/travis/general/unstable-warning Travis Ralston 2018-08-31 09:50:37 -0600
ab00630ebc Don't include a second unstable warning in the s2s spec for now Travis Ralston 2018-08-31 09:49:24 -0600
f72c821be4

Merge pull request #1619 from turt2live/travis/c2s/local-echo Travis Ralston 2018-08-31 09:48:02 -0600
e3ad253dca A sender is also required for the invite_state Travis Ralston 2018-08-31 09:44:29 -0600
2f824df8dd Define the real event types on the invite_state Travis Ralston 2018-08-31 09:43:29 -0600
fc037b3a72 Fix merge Travis Ralston 2018-08-31 09:33:30 -0600
2e3e189ea2 Merge remote matrix-org/master Travis Ralston 2018-08-31 09:31:39 -0600
2e316ea80b

Merge pull request #1630 from matrix-org/application_service/release-r0.1.0 Travis Ralston 2018-08-31 09:12:47 -0600
136ba15eb2

Merge pull request #1605 from turt2live/travis/c2s/clarify-html-again Travis Ralston 2018-08-31 08:41:29 -0600
38ae166e9d

Merge pull request #1505 from turt2live/travis/general/3pid_invite Travis Ralston 2018-08-31 08:38:40 -0600
afa16f1e4e

Merge pull request #1606 from turt2live/travis/c2s/room-tags Travis Ralston 2018-08-31 08:36:40 -0600
c127eed7e7

Merge pull request #1600 from turt2live/travis/c2s/media-csp Travis Ralston 2018-08-31 08:32:33 -0600
73736d41db

Merge pull request #1569 from turt2live/travis/c2s/user-directory Travis Ralston 2018-08-31 08:32:02 -0600
9646d99c9e

Merge pull request #1602 from turt2live/travis/general/redactions Travis Ralston 2018-08-31 08:31:50 -0600
c77b505441 capitali[zs]e path parameters Ben Parsons 2018-08-31 14:37:47 +0100
778fe2a47a css caption size tweak Ben Parsons 2018-08-31 14:29:46 +0100
e8afab1fe5 many visual improvements Ben Parsons 2018-08-31 13:55:27 +0100
6235c2e720

Merge pull request #1594 from matrix-org/erikj/limit_auth_events Erik Johnston 2018-08-31 13:05:04 +0100
080845ac1c Add link to previous section Erik Johnston 2018-08-31 11:53:21 +0100
bbca5ce43a Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/limit_auth_events Erik Johnston 2018-08-31 11:52:36 +0100
b6ed25e4b4 Fix incorrect indent Erik Johnston 2018-08-31 11:32:29 +0100
f3a13eed76

Merge pull request #1593 from matrix-org/erikj/auth_events Erik Johnston 2018-08-31 11:27:03 +0100
86891ca7e4

Merge pull request #1625 from matrix-org/erikj/auth_rejections Erik Johnston 2018-08-31 11:26:57 +0100
da3dd40e06

Merge pull request #1592 from matrix-org/erikj/spec_3pid_ruls Erik Johnston 2018-08-31 11:26:45 +0100
d91dc6fbf6 Fixup Erik Johnston 2018-08-31 11:20:26 +0100
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