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

matthew/msc4132

rav/links_for_object_defs

rav/ref_objects_in_params

release/v1.10

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/release-steps-update-mar192024

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

#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

#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

#1644

#1645

#1646

#1647

#1648

#1650

#1652

#1655

#1655

#1656

#1657

#1658

#1660

#1661

#1665

#1671

#1672

#1673

#1676

#1677

#1680

#1685

#1687

#1689

#1690

#1695

#1697

#1699

#1709

#1709

#1712

#1713

#1714

#1715

#1717

#1718

#1719

#1720

#1721

#1724

#1725

#1725

#1728

#1730

#1731

#1732

#1733

#1734

#1735

#1737

#1739

#1740

#1741

#1742

#1744

#1745

#1746

#1748

#1749

#1751

#1754

#1755

#1756

#1757

#1758

#1758

#1759

#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

#1823

#1824

#1827

#1828

#1828

#1829

#1830

#1830

#1831

#1832

#1833

#1833

#1834

#1834

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

v1.3

v1.4

v1.5

v1.6

v1.7

v1.8

v1.9

Mono Color

• a52819ba69 Clarify dummy auth David Baker 2015-04-24 10:20:57 +0100
• fa8d8a9f95 Remove spurious array in error example David Baker 2015-04-24 09:56:42 +0100
• cfbc58c4fb Forgot bind_email param on register. David Baker 2015-04-23 22:44:09 +0100
• 52692931d7 fix typos Matthew Hodgson 2015-04-23 22:41:53 +0100
• e52146e47f V2PREFIX David Baker 2015-04-23 22:34:33 +0100
• dd12d901af Oops: missed recaptcha. Also make list in the same order as the details. David Baker 2015-04-23 22:31:54 +0100
• b71aaddad0 Try & fix RST errors David Baker 2015-04-23 18:39:38 +0100
• c583bf9570 wrong title level David Baker 2015-04-23 18:33:24 +0100
• 8495d9451e Document CS API V2 auth changes and new APIs. David Baker 2015-04-23 18:30:15 +0100
• 04086975bd fix header depth Matthew Hodgson 2015-04-23 16:19:46 +0100
• 4255058680 typo Matthew Hodgson 2015-04-23 16:17:22 +0100
• dacf93b405 oooooops, apparently I forgot to 'git add' these when I refactored the spec last month :-/ Matthew Hodgson 2015-04-23 16:15:07 +0100
• a6c080fc7e Merge pull request #14 from matrix-org/key_v2 Matthew Hodgson 2015-04-23 16:10:35 +0100
• 6f269890be Add a brief reference to the perspectives project and mention what should happen if a server goes offline Mark Haines 2015-04-23 16:06:07 +0100
• 0db3182159 Describe what the expired_ts is Mark Haines 2015-04-23 15:32:58 +0100
• 4422e9ca2b Add a short summary of how the v2 key api is supposed to be used Mark Haines 2015-04-23 15:30:57 +0100
• ed21f50cc3 Add version 2 of the server key distribution API Mark Haines 2015-04-23 15:04:22 +0100
• 3f5a94484f Update spec where I changed it to allow omiting value for highlight David Baker 2015-04-17 10:35:42 +0100
• 0f1514febb standardise on <foo> rather than :foo Matthew Hodgson 2015-03-29 08:19:40 -0400
• c0e55bb99e make intro match order of sections as per max g-j feedback Matthew Hodgson 2015-03-28 21:40:12 -0400
• 07c4d6cd21 Add append flag to pushers to support multiple accounts. David Baker 2015-03-25 16:15:17 +0000
• c1d7e82d29 rst fail Matthew Hodgson 2015-03-23 17:52:23 +0000
• 9ff5456b5e fix sections a bit more Matthew Hodgson 2015-03-23 15:55:07 +0000
• 0c6bd900a3 fix sections a bit Matthew Hodgson 2015-03-23 15:51:29 +0000
• 7b310db783 Merge pull request #13 from matrix-org/ua925_reshuffle Matthew Hodgson 2015-03-23 15:37:31 +0000
• c3f29ea720 Merge branch 'master' into ua925_reshuffle Matthew Hodgson 2015-03-23 15:36:36 +0000
• 58c28598af lots of fixes based on kegan's review of https://github.com/matrix-org/matrix-doc/pull/13 Matthew Hodgson 2015-03-19 14:21:08 +0100
• d40f6c1d7c lots of fixes based on kegan's review of https://github.com/matrix-org/matrix-doc/pull/13 Matthew Hodgson 2015-03-19 14:20:58 +0100
• e60ffd6909 unix line-endings please... Matthew Hodgson 2015-03-19 14:08:48 +0100
• 62cf5e0cd4 Add max length to pushkey David Baker 2015-03-18 13:55:23 +0000
• 598e9b3113 big reshuffle: * try to make 00_basis slightly more accessible and less terse * move CS API before Events, as it's meaningless to dive into specific events if you haven't been introduced to how the CS API works * Try to improve the beginning of the CS API by merging back in some of kegan's original v1 content (which has subsequently been deleted somewhere along the line?) * document m.presence event consistently * move typing from drafts to spec * move push stuff from drafts to spec ...and lots of other stuff Matthew Hodgson 2015-03-16 00:14:03 -0400
• 80a7daf0aa Add length to profile tag spec. David Baker 2015-03-13 14:33:22 +0000
• c38c33929a Put diagram in literal block David Baker 2015-03-13 11:43:30 +0000
• fa1820ef3b Add ascii art diagram explaining architecture. David Baker 2015-03-13 11:32:03 +0000
• 712da51c8c Spec additions to the push API for the web client David Baker 2015-03-11 16:25:44 +0000
• bea6c84e46 Includign a filename extension is probably incorrect. David Baker 2015-03-11 16:21:31 +0000
• bfde21fa9e Specify that suppress notices should be an override rule. David Baker 2015-03-06 10:11:30 +0000
• fe5372621e More indenting for a code block David Baker 2015-03-04 17:12:05 +0000
• 04b8c661d0 add .m.rule.suppress_notices David Baker 2015-03-04 15:31:49 +0000
• b6dd67129e Specify that we never alert for event we sent ourself. David Baker 2015-03-02 14:35:44 +0000
• 63593de4b8 Rename room-with-two-members rule because when/if we have actual one-to-one rooms, this will reflect reality better. David Baker 2015-03-02 13:27:31 +0000
• 686c6fd03a Blank lines before preformatted blocks David Baker 2015-02-26 18:56:20 +0000
• 98ecd3c97d SYN-267 Specify a set of standard server default rules and specify no notifications if no rules match. David Baker 2015-02-26 18:49:34 +0000
• 75036ee053 Remove the 'default' attribute, make all rules have rule IDs & make server default rules IDs start with '.'. David Baker 2015-02-25 16:18:29 +0000
• a39ad63a0b SYN-270 Spec enable/disable API for push rules. David Baker 2015-02-25 15:02:26 +0000
• 342146eafd Add IRC bridge AS example. Kegan Dougal 2015-02-20 15:06:43 +0000
• 838af288c9 Test swagger commit Kegan Dougal 2015-02-20 14:29:51 +0000
• 5cb656fba7 Minor swagger HTML tweaks Kegsay 2015-02-20 11:32:53 +0000
• a6fa4e53fb Update gendoc.py Kegan Dougal 2015-02-20 11:25:05 +0000
• 505c804426 Update scripts to look in the right places. Update jsfiddles to be more obvious in the HOWTO. Kegan Dougal 2015-02-20 10:49:36 +0000
• 31ec39db7f Actually add the README Kegan Dougal 2015-02-20 10:43:54 +0000
• c4056bec1b Shuffle around structure of matrix-doc and add a README. Kegan Dougal 2015-02-20 10:43:06 +0000
• d552a043f8 remove LI section entirely until we decide how best to discourage it, otherwise it looks like we're endorsing it Matthew Hodgson 2015-02-19 20:22:57 +0000
• 006932c70f Be clearer when specifying the version of the spec. Kegan Dougal 2015-02-19 17:25:15 +0000
• 6af1627b51 Minor tweak for matrix.org example Kegsay 2015-02-19 17:16:59 +0000
• 4fd5b9ced8 Update doc style Kegsay 2015-02-19 17:14:25 +0000
• 1388612c48 Add a README, spell matrix correctly. Kegan Dougal 2015-02-19 16:53:54 +0000
• 5a0e40b984 Mark CS API as v1 in the spec. Kegan Dougal 2015-02-19 16:36:53 +0000
• 4b0e858529 Add $GIT_VERSION to the spec which is replaced by the gendoc script. Kegan Dougal 2015-02-19 16:32:45 +0000
• df448df813 Redo gendoc script. Kegan Dougal 2015-02-19 16:00:21 +0000
• 42857df26f Syntax fixes Kegan Dougal 2015-02-19 14:25:54 +0000
• 8e75c5ed67 Add in passive application services Kegsay 2015-02-19 14:17:31 +0000
• 74b7769c08 Merge branch 'master' of github.com:matrix-org/matrix-doc Kegan Dougal 2015-02-19 13:42:12 +0000
• f60c0ac96b Fix indentation levels on specification. Kegan Dougal 2015-02-19 13:42:01 +0000
• 94352a6d68 Merge pull request #10 from matrix-org/push Kegsay 2015-02-19 11:51:00 +0000
• b8e5dc9e37 Merge pull request #7 from matrix-org/as-http-api Kegsay 2015-02-19 11:49:12 +0000
• 8aae3e5842 Add TODO section Kegsay 2015-02-19 11:48:45 +0000
• 5ef9d52702 Merge pull request #5 from matrix-org/application-services Kegsay 2015-02-19 11:45:17 +0000
• 3ce1e55954 Move TODO comments into the doc in prep for merging Kegsay 2015-02-19 11:44:10 +0000
• f0cc0e082c Add room_id in push poke to spec. David Baker 2015-02-19 10:13:21 +0000
• f3a498d0bb document the concept of a standard `external_url` field for gatewayed events Matthew Hodgson 2015-02-16 22:09:10 +0000
• bcba42651a Add support for exclusive namespaces Kegsay 2015-02-16 13:10:25 +0000
• 7a0f7b4b43 Add that rules with no conditions always match. David Baker 2015-02-13 13:40:44 +0000
• b02f2aa364 never upscale images Matthew Hodgson 2015-02-12 20:31:44 +0000
• 7c65e4748e typo Matthew Hodgson 2015-02-12 20:24:14 +0000
• 246531813b typo Matthew Hodgson 2015-02-12 20:23:36 +0000
• 8729cdb067 Fix broken JSFiddle links Kegan Dougal 2015-02-12 14:52:35 +0000
• 2b4641d1f0 Merge branch 'master' into v2-presence Kegan Dougal 2015-02-09 09:23:53 +0000
• 0131543f00 Merge branch 'master' into human-id-rules Kegan Dougal 2015-02-09 09:22:52 +0000
• 56f4467ced Fix syntax error Kegan Dougal 2015-02-09 09:19:45 +0000
• 7a59d401f6 Fix syntax errors Kegan Dougal 2015-02-09 09:17:55 +0000
• 2740e50a9f Merge branch 'master' into push Kegan Dougal 2015-02-09 09:14:39 +0000
• 74225013c5 Merge branch 'as-http-api' of github.com:matrix-org/matrix-doc into as-http-api Kegan Dougal 2015-02-09 09:13:52 +0000
• fa055e14ad Merge branch 'master' into as-http-api Kegan Dougal 2015-02-09 09:13:31 +0000
• 65b3cf3740 Merge branch 'master' into application-services Kegan Dougal 2015-02-09 09:12:58 +0000
• 2c8b875cf1 typoe Matthew Hodgson 2015-02-08 02:33:53 +0000
• 6c5d07a0d1 typoe Matthew Hodgson 2015-02-08 02:32:06 +0000
• 6c21f499e8 Final syntax fixes Kegan Dougal 2015-02-06 13:08:12 +0000
• 047355b5c9 More syntax fixes Kegan Dougal 2015-02-06 13:05:28 +0000
• 3b696878f5 Fix a bunch of rst syntax errors. Kegan Dougal 2015-02-06 12:59:08 +0000
• 36395c2611 Add info on M_EXCLUSIVE Kegsay 2015-02-06 11:01:20 +0000
• e7c522b606 Add information on exclusive namespaces Kegsay 2015-02-05 16:06:47 +0000
• 7c0d1c86d8 How to tell server default rules from other rules. David Baker 2015-02-05 14:56:07 +0000
• 8360be247b Leave out what characters are allowed in a rule ID as we allow most thigs in matrix usernames currently. David Baker 2015-02-05 13:15:34 +0000
• 94af47ffd4 Server default riules will have a rule_id when you need it to work out what the rule does. David Baker 2015-02-05 13:03:10 +0000
• e6c9e77d35 Change server default rules. David Baker 2015-02-05 10:49:48 +0000
• 8184855d5a add note about scope of rule_ids. David Baker 2015-02-04 16:30:57 +0000
• dbbf9626b4 Fix various incorreect examples in the doc. David Baker 2015-02-04 11:34:32 +0000
• f24e951b02 s/instance_handle/profile_tag/ David Baker 2015-02-03 16:21:09 +0000
• 91d12dc955 Replace set_sound with more generic set_tweaks. David Baker 2015-02-03 15:38:12 +0000