matrix-spec

Filip/matrix-spec

Fork 0

mirror of https://github.com/matrix-org/matrix-spec synced 2026-07-30 09: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

#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

dffe9b3e4c more questions Matthew Hodgson 2015-10-06 21:33:32 -0500
91fb2ae723 edit oddvar's FAQ entries and add a bunch more questions Matthew Hodgson 2015-10-06 16:38:29 -0500
85c035bd82 Merge branch 'master' of git+ssh://github.com/matrix-org/matrix-doc Matthew Hodgson 2015-10-06 14:50:57 -0500
ed9028f0fc merge again... Matthew Hodgson 2015-10-06 14:46:13 -0500
2621c22956 fix barefaced lie regarding the passivity of ASes Matthew Hodgson 2015-10-06 13:36:59 -0500
f62fa6b980 Merge branch 'master' of git+ssh://github.com/matrix-org/matrix-doc Matthew Hodgson 2015-10-06 14:42:17 -0500
10f3e7e84f Merge branch 'master' of github.com:matrix-org/matrix-doc Oddvar Lovaas 2015-10-06 20:23:42 +0100
6e6585cebc FAQ draft Oddvar Lovaas 2015-10-06 20:21:49 +0100
f759dc30d2 major refresh of the existing FAQ content (WIP) Matthew Hodgson 2015-10-06 14:13:15 -0500
7ae2573113 fix barefaced lie regarding the passivity of ASes Matthew Hodgson 2015-10-06 13:36:59 -0500
034241eb20 Missing symlink for the v2 swagger APIs Mark Haines 2015-10-06 17:43:04 +0100
509d178d58 Fix the receipts API to be valid swagger Mark Haines 2015-10-06 17:40:28 +0100
4f606cf3a7 Add the fields required by the templating system to v2 sync Mark Haines 2015-10-06 17:31:05 +0100
5a5a6565ff Merge pull request #68 from matrix-org/markjh/v2_sync_api Mark Haines 2015-10-06 16:51:06 +0100
39faccb00d CS API is not just v1 surely Matthew Hodgson 2015-10-06 09:38:46 -0500
0ce533d153 Split the room_map into separate sections based on whether they are "joined/invited/archived". Mark Haines 2015-10-06 13:42:03 +0100
0e5b00feaa Fix event type in v2 sync example Mark Haines 2015-10-05 16:10:25 +0100
bbb5fa9398 Fix the state_key in the example v2 response, include the "sender" key in the list of keys included with invite_state events Mark Haines 2015-10-05 15:36:01 +0100
a7b808c5cd Add a invite_state key for holding the state that is bundled with an invite. This is kept separate from the actual state for the room as it may be derived from an incomplete, unverified copy of the state that was bundled with an invite event received over federation. Mark Haines 2015-10-05 15:26:33 +0100
ed0f6d3ff3 Typo Mark Haines 2015-10-05 14:22:50 +0100
97cdd8106c s|client/api/v2_alpha|/client/v2_alpha| Mark Haines 2015-10-05 14:21:16 +0100
8e5c832ff9 Flesh out more of the IM module Kegan Dougal 2015-10-05 13:45:23 +0100
47cf958b54 Merge branch 'master' into module-im Kegan Dougal 2015-10-05 10:16:44 +0100
99ca68ba6d Merge pull request #71 from matrix-org/erikj/disable_federation Erik Johnston 2015-10-05 09:19:17 +0100
3b4c3522e6 Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/disable_federation Erik Johnston 2015-10-05 09:17:28 +0100
db660d705a Merge branch 'release-0.2.0' 0.2.0 Kegan Dougal 2015-10-02 16:44:16 +0100
28fd1aa205 Go into a bit more detail about feature profiles Kegan Dougal 2015-10-02 16:34:06 +0100
2fbf851a75 Merge branch 'master' into release-0.2.0 Kegan Dougal 2015-10-02 16:25:23 +0100
8c092e3d11 Merge pull request #74 from matrix-org/module-presence Kegsay 2015-10-02 16:24:53 +0100
417c5b53c4 Remove duplicate sentences from merge conflicts Kegan Dougal 2015-10-02 16:24:33 +0100
047419f2ad Remove the room_id since it is redundent. Remove text about invite event handling till we've thought about it some more. Mark Haines 2015-10-02 16:21:48 +0100
bde003fe86 Split the rooms out into a separate top level key. Mark Haines 2015-10-02 16:14:24 +0100
c8ddf1af09 Add changelog Kegan Dougal 2015-10-02 16:00:15 +0100
b29fdebec2 Give example of verification dance Daniel Wagner-Hall 2015-10-02 09:14:31 -0500
458383585f Stub sections Kegan Dougal 2015-10-02 15:03:55 +0100
ead79614ff Merge pull request #78 from matrix-org/module-typing2 Kegsay 2015-10-02 14:36:30 +0100
9d8dc7971d Review comments Daniel Wagner-Hall 2015-10-02 08:33:12 -0500
7df3d9090a Merge pull request #81 from matrix-org/daniel/speculatormerge Daniel Wagner-Hall 2015-10-02 07:33:34 -0500
0e8f1b5475 Quote args Daniel Wagner-Hall 2015-10-02 07:33:26 -0500
a73cc50aa9 s|client/api/v2_alpha|client/v2_alpha| Mark Haines 2015-10-02 13:03:39 +0100
68df99409a Merge pull request #83 from matrix-org/module-content-repo Kegsay 2015-10-02 11:27:41 +0100
f38473efd9 Merge pull request #82 from matrix-org/daniel/reportport Kegsay 2015-10-02 11:13:43 +0100
ccdd376f30 Merge pull request #63 from matrix-org/erikj/room_create_preset Erik Johnston 2015-10-02 11:13:06 +0100
09ac367847 Merge branch 'master' into module-content-repo Kegan Dougal 2015-10-02 10:46:46 +0100
4dabcd112e Remove redundant info now we have the http api template. Minor tweaks to display of schema with no names but a type Kegan Dougal 2015-10-02 10:44:50 +0100
912a8ca760 Be more explicit about keys that are clobbered Erik Johnston 2015-10-02 10:30:45 +0100
dbc72c43ac s/private_chat_shared_power/trusted_private_chat/ Erik Johnston 2015-10-02 10:28:29 +0100
3d9dbe42e6 Bump to swagger-parser 3.2.1 - remove x- keys on headers Kegan Dougal 2015-10-02 10:21:48 +0100
9cda004848 Fix ref Daniel Wagner-Hall 2015-10-01 22:27:19 -0500
fdccf35c47 Banish more tabs Daniel Wagner-Hall 2015-10-01 22:23:24 -0500
e996933a29 Banish the tabs Daniel Wagner-Hall 2015-10-01 22:21:34 -0500
af7d2ca9fc Update 3pid invite spec Daniel Wagner-Hall 2015-10-01 22:19:11 -0500
d2c56fb7a3 Merge branch 'master' into daniel/threepidinvites-2 Daniel Wagner-Hall 2015-10-01 21:18:50 -0500
a69e03f577 speculator: Report listening port Daniel Wagner-Hall 2015-10-01 19:15:30 -0500
30232f20aa speculator: Merge after fetching, so that /spec/head works Daniel Wagner-Hall 2015-10-01 19:13:09 -0500
8c4d7f5051 Do not try to parse non-json request examples as json Kegan Dougal 2015-10-01 18:03:34 +0100
87b6dd845e Flesh out content repo; modify templating to support headers Kegan Dougal 2015-10-01 17:55:16 +0100
8aad238cda Merge pull request #80 from matrix-org/module-receipts Kegsay 2015-10-01 17:33:38 +0100
8b958f4ead Merge pull request #79 from matrix-org/module-voip Kegsay 2015-10-01 17:33:27 +0100
560cd7a58f This isn't javascript. s/,/%/ Kegan Dougal 2015-10-01 15:54:45 +0100
da2be7eae4 Merge branch 'master' into module-voip Kegan Dougal 2015-10-01 15:48:42 +0100
1520f3647f Merge branch 'master' into module-typing2 Kegan Dougal 2015-10-01 15:47:46 +0100
cc6f256b24 Merge branch 'master' into module-presence Kegan Dougal 2015-10-01 15:46:52 +0100
6000887201 Merge branch 'master' into module-receipts Kegan Dougal 2015-10-01 15:44:53 +0100
c972dad8b3 Flesh out receipts module. Add receipts swagger Kegan Dougal 2015-10-01 15:41:54 +0100
4a7a682c0f Merge pull request #65 from matrix-org/spec-feature-profiles Kegsay 2015-10-01 12:16:30 +0100
365a9076b9 Add nested dict template support; Add x-pattern Kegan Dougal 2015-10-01 12:11:26 +0100
3b73b07bab Clarifications that room invites are m.call.invites not actual invites Kegan Dougal 2015-10-01 11:11:08 +0100
e82661413e Add /turnServer endpoint Kegan Dougal 2015-10-01 11:04:42 +0100
abe5d08ac6 Merge pull request #64 from matrix-org/erikj/invite_state Erik Johnston 2015-10-01 09:25:06 +0100
d092b22848 Rename to 'Managing history visibility' Kegan Dougal 2015-10-01 09:23:08 +0100
6c3e70d272 Start fleshing out voip module Kegan Dougal 2015-09-30 17:32:44 +0100
91b6347f74 Explain what 'embedded' clients are Kegan Dougal 2015-09-30 16:48:47 +0100
be9402b66f Move feature profiles section to modules as a sub-section Kegan Dougal 2015-09-30 16:43:09 +0100
0320e8cef3 Table tweaks from PR Kegan Dougal 2015-09-30 16:41:47 +0100
9964dd1401 Make explicit the state event only includes some keys Erik Johnston 2015-09-30 16:11:31 +0100
f74cb4d54c Merge pull request #76 from matrix-org/speculator-speedup Kegsay 2015-09-30 15:53:25 +0100
097dc50180 Minor tweaks Kegan Dougal 2015-09-30 15:45:29 +0100
a82f2ad4ac Flesh out typing module Kegan Dougal 2015-09-30 11:55:34 +0100
2b7e02c080 Add sections for typing. Add swagger, JSON schema and example m.typing event Kegan Dougal 2015-09-30 11:26:02 +0100
e5fecbb87f Merge pull request #75 from matrix-org/continuserv-speedup Kegsay 2015-09-30 15:42:29 +0100
b6f0b67da6 Speed up continuserv Kegan Dougal 2015-09-30 15:21:32 +0100
ede43fbe9f Modify how speculator uses git repos Kegan Dougal 2015-09-30 14:31:26 +0100
52f6496cf0 Merge branch 'master' into module-presence Kegan Dougal 2015-09-30 10:56:17 +0100
4aad6976fd Merge pull request #73 from matrix-org/paragraphs Kegsay 2015-09-30 10:54:23 +0100
a49d5f67f1 Delete rather than comment out the offending CSS Kegan Dougal 2015-09-30 10:54:06 +0100
4e1e82f995 Fix paragraph CSS and adjust where paragraphs are in the RST Kegan Dougal 2015-09-30 10:43:02 +0100
931057accf Add a top level presence key for the presence events and remove the public_user_data/private_user_data for now Mark Haines 2015-09-30 10:30:39 +0100
069e4e39f4 Move presence specific sections from intro to presence module Kegan Dougal 2015-09-30 10:22:51 +0100
73b4090f52 Add private_chat_shared_power Erik Johnston 2015-09-30 10:22:12 +0100
4cb3f78d2b Wrap the "rooms" list inside an object so that we can add keys for pagination later Mark Haines 2015-09-29 19:48:48 +0100
218cf94ead Replace the events array with events_map inside the room objects. Only use indirection for the state and timeline events. Use event_ids to reference the state and timeline events. Mark Haines 2015-09-29 19:10:31 +0100
0a04672d76 Start converting the presence module. Add Rationale admonition. Kegan Dougal 2015-09-29 17:57:44 +0100
cdf9f011e9 Add room history visibility as a module. Kegan Dougal 2015-09-29 16:33:34 +0100
82c27884ba Make E2E optional Kegan Dougal 2015-09-29 16:29:16 +0100
83b9497664 Add context and example Erik Johnston 2015-09-29 16:21:10 +0100
7b4c8a9f68 Indicate default for m.federate key Erik Johnston 2015-09-29 16:19:27 +0100
c96f02c2b0 Merge pull request #69 from matrix-org/erikj/login_token Kegsay 2015-09-29 13:26:29 +0100
beafc74f81 Merge pull request #70 from matrix-org/spec-module-format Kegsay 2015-09-29 13:22:16 +0100
eec021ee8c Merge pull request #72 from matrix-org/daniel/generateathead Daniel Wagner-Hall 2015-09-29 13:01:17 +0100