Commit Graph

  • 1d6c405f62 Fix presumably c+p fail David Baker 2016-04-06 21:00:12 +0100
  • 0411cf54da Merge pull request #306 from matrix-org/dbkr/add_push_change_event_id David Baker 2016-04-06 20:58:11 +0100
  • cf850b4270 Fix level of `counts` and `devices` dbkr/add_push_change_event_id David Baker 2016-04-06 20:21:08 +0100
  • 89453bfd8c Remove spurious blank line David Baker 2016-04-06 19:53:45 +0100
  • 64c6d30f90 hopefully fix rst David Baker 2016-04-06 19:52:54 +0100
  • 7faf2cf642 Paragraph breaks & missed word David Baker 2016-04-06 19:49:41 +0100
  • 7e1cb9003c Make swagger valid David Baker 2016-04-06 18:41:15 +0100
  • 71cb646541 Change `id` in the push gateway poke to be `event_id` and spec that it's the Matrix event ID of the message. Correct the spec for badge count pushes which omit fields previously described as mandatory. Add more detail about when to use event_id to suppress dupes. Also add the push gateway doc so it's actually included in the spec. David Baker 2016-04-06 18:28:21 +0100
  • b59d16c4d1 Clarify `history_visibility` behaviour Richard van der Hoff 2016-04-06 17:54:56 +0100
  • 12943134bd changed date Oddvar Lovaas 2016-03-22 10:27:08 +0000
  • 24ec322daa Merge pull request #304 from Half-Shot/master Oddvar Lovaas 2016-03-22 10:25:07 +0000
  • 10501f2167 Added mpd-dj Will Hunt 2016-03-22 08:41:41 +0000
  • eafb3212af deleted Oddvar Lovaas 2016-03-21 15:14:42 +0000
  • 8bc62da9eb Merge branch 'master' of github.com:matrix-org/matrix-doc Oddvar Lovaas 2016-03-21 15:14:07 +0000
  • 306b471f46 oops Oddvar Lovaas 2016-03-21 15:13:32 +0000
  • f0244cc345 Merge pull request #299 from torhve/patch-2 Oddvar Lovaas 2016-03-21 15:07:44 +0000
  • 39c56253b7 Merge pull request #298 from torhve/patch-1 Oddvar Lovaas 2016-03-21 15:07:07 +0000
  • 14f3f1f814 adding author Oddvar Lovaas 2016-03-17 18:05:27 +0000
  • 13a8050b4e added intro Oddvar Lovaas 2016-03-17 17:12:04 +0000
  • 3ce5453549 Merge pull request #300 from wastevensv/lets-encrypt-guide Oddvar Lovaas 2016-03-17 17:02:45 +0000
  • d07e89d199 spelling Oddvar Lovaas 2016-03-17 16:46:52 +0000
  • f7b5ae8ebc Merge pull request #303 from vberger/patch-1 Oddvar Lovaas 2016-03-17 16:44:10 +0000
  • 923a961f6a FAQ: Add an answer about the choice of HTTP. Victor Berger 2016-03-17 17:17:15 +0100
  • a4732a39eb Merge 5c9ae46480 into dd6dfa7635 Gergely Polonkai 2016-03-16 15:49:12 +0000
  • d94deb6296 Add event as a parent for all event types Gergely Polonkai 2016-03-08 15:51:09 +0100
  • 5c9ae46480 Add room_id parameter to m.room.member Gergely Polonkai 2016-03-16 16:43:15 +0100
  • c2bbeb899d Update Let's Encrypt guide to match other guides. William Stevens 2016-03-15 17:21:11 -0400
  • 2c16526c70 Added tutorial on using Let's Encrypt with Matrix. William Stevens 2016-03-15 16:48:37 -0400
  • dd6dfa7635 Merge pull request #291 from gergelypolonkai/room-avatar-image-info Kegsay 2016-03-14 15:31:57 +0000
  • 7d66cdf828 Correctness Tor Hveem 2016-03-13 14:34:49 +0100
  • f7d6c9b8dc Correct/Improve Tor Hveem 2016-03-13 14:31:48 +0100
  • 92dfc0bb39 Merge pull request #297 from matrix-org/daniel/is Daniel Wagner-Hall 2016-03-10 16:54:50 +0000
  • 313f09f5c0 Specify address validating and binding Daniel Wagner-Hall 2016-03-10 16:54:38 +0000
  • c234d3e377 Merge pull request #279 from matrix-org/daniel/strippedstate Daniel Wagner-Hall 2016-03-10 14:28:05 +0000
  • 77f495d36f Remove restrictions on StrippedState Daniel Wagner-Hall 2016-03-10 14:27:54 +0000
  • 39fe9e3896 Merge pull request #284 from matrix-org/dbkr/notification_counts David Baker 2016-03-10 14:10:44 +0000
  • 506accee27 Merge pull request #288 from matrix-org/markjh/pushrule_stream Kegsay 2016-03-10 14:05:42 +0000
  • ffe3ec33f1 Merge pull request #290 from gergelypolonkai/master Kegsay 2016-03-10 14:04:26 +0000
  • b3af29e746 Merge pull request #296 from matrix-org/daniel/is3 Daniel Wagner-Hall 2016-03-10 13:59:55 +0000
  • fecff8afdc Specify association lookup Daniel Wagner-Hall 2016-03-10 13:59:34 +0000
  • 53886f3157 Merge pull request #295 from matrix-org/daniel/is2 Daniel Wagner-Hall 2016-03-10 13:57:52 +0000
  • 30c9fee0b2 Specify ephemeral invitation signing Daniel Wagner-Hall 2016-03-10 13:57:45 +0000
  • e02056a830 Merge pull request #294 from matrix-org/daniel/is Daniel Wagner-Hall 2016-03-09 17:28:06 +0000
  • 097b69dc1e Loosely specify invitation storage Daniel Wagner-Hall 2016-03-09 16:59:08 +0000
  • 7868fb1a08 Merge pull request #293 from matrix-org/daniel/is Daniel Wagner-Hall 2016-03-09 15:49:26 +0000
  • e0c55eeccf Add initial identity server spec Daniel Wagner-Hall 2016-03-09 15:49:23 +0000
  • 446ad008be Merge pull request #292 from matrix-org/daniel/is Daniel Wagner-Hall 2016-03-08 17:42:44 +0000
  • f4f186baee Add _cs suffix to client-server http APIs Daniel Wagner-Hall 2016-03-08 17:42:41 +0000
  • 6e2b02a608 Update m.room.avatar schema so it references image_info in info Gergely Polonkai 2016-03-08 16:30:54 +0100
  • 583c8cbfaf Add invite key to m.room.power_levels schema Gergely Polonkai 2016-03-08 15:50:12 +0100
  • c3c95d0c09 Fix grammar and add backticks for /sync markjh/pushrule_stream Mark Haines 2016-03-08 10:17:27 +0000
  • cc0dae3aeb Deduplicate a couple of places where "the" was written twice in a row Mark Haines 2016-03-07 11:30:51 +0000
  • 4a06f3e2a4 Merge pull request #289 from gergelypolonkai/master David Baker 2016-03-04 16:10:07 +0000
  • 9048fb9a7b Add CONTINUTING.rst David Baker 2016-03-04 16:08:46 +0000
  • 449bb09998 Fix for m.room.third_party_invite schema Gergely Polonkai 2016-03-04 16:58:02 +0100
  • 5407cc8e05 Add a snippet of documentation for a m.push_rules event. Mark Haines 2016-03-04 14:41:30 +0000
  • 65e5a316bd Update spec to say what the default state / events defaults are, from inspecting the behaviour of synapse (which I'm not sure was intentional). David Baker 2016-03-02 18:31:14 +0000
  • 646dd4f03a Merge pull request #285 from matrix-org/daniel/titles Daniel Wagner-Hall 2016-03-02 15:37:19 +0000
  • 11c572267e Add titles where they're missing Daniel Wagner-Hall 2016-03-02 15:23:48 +0000
  • 3d4d91a462 Reword to make sense Erik Johnston 2016-03-01 16:15:59 +0000
  • 167a08a805 Allow idle timeout to be configurable Erik Johnston 2016-03-01 16:13:41 +0000
  • bc68177471 Grammar Erik Johnston 2016-03-01 16:07:25 +0000
  • a78dff3981 Add notification counts to doc dbkr/notification_counts David Baker 2016-03-01 11:40:52 +0000
  • 5c1bc0eb80 Merge pull request #283 from matrix-org/markjh/change_action Mark Haines 2016-02-26 13:27:22 +0000
  • d2c05d64c7 Document an API for setting and getting the actions for a push rule markjh/change_action Mark Haines 2016-02-26 13:27:19 +0000
  • dc3b6f6320 Merge pull request #282 from matrix-org/markjh/get_enabled Mark Haines 2016-02-25 13:16:52 +0000
  • 1f03552ff3 poke jenkins markjh/get_enabled Mark Haines 2016-02-25 11:13:09 +0000
  • 254fbe7983 Document GET for /pushrules/{scope}/{kind}/{ruleId}/enabled Mark Haines 2016-02-25 10:51:42 +0000
  • e6143a6596 Merge pull request #281 from matrix-org/dbkr/fix_meta_escaping David Baker 2016-02-24 14:15:55 +0000
  • 2c5392f1d1 Fix meta-escaping fail dbkr/fix_meta_escaping David Baker 2016-02-24 14:00:57 +0000
  • b0856ffc3b more info Oddvar Lovaas 2016-02-23 17:42:32 +0000
  • 65b776b4ec Merge branch 'master' of github.com:matrix-org/matrix-doc Oddvar Lovaas 2016-02-23 17:34:26 +0000
  • 85e0e88c5e fixed link Oddvar Lovaas 2016-02-23 17:34:09 +0000
  • 58faad1c24 Merge pull request #280 from matrix-org/daniel/newline Daniel Wagner-Hall 2016-02-23 16:30:59 +0000
  • 016ccf4544 Remove signed object which shouldn't exist Daniel Wagner-Hall 2016-02-23 15:19:45 +0000
  • 902f25ef4a Include newline before table headings Daniel Wagner-Hall 2016-02-23 14:43:36 +0000
  • f1a8306d08 Spec currently_active time and idle timeout behaviour Erik Johnston 2016-02-23 11:13:02 +0000
  • cbe466e572 Update API docs Erik Johnston 2016-02-23 09:00:55 +0000
  • cc1c8f33b2 update readme Oddvar Lovaas 2016-02-22 17:41:52 +0000
  • 51fed0de36 add a template Oddvar Lovaas 2016-02-22 17:37:29 +0000
  • 746ae4fd9c use images hosted locally Oddvar Lovaas 2016-02-22 16:51:55 +0000
  • ffd6548cc3 Merge pull request #273 from matrix-org/daniel/multikeys2 Daniel Wagner-Hall 2016-02-22 14:54:26 +0000
  • ccac9e7882 /join accepts a signature for a third party invite Daniel Wagner-Hall 2016-02-22 14:54:23 +0000
  • 8e0cf9c7ac Merge pull request #277 from matrix-org/rav/define_order_for_event_context Richard van der Hoff 2016-02-19 17:09:35 +0000
  • bc83677d98 Define the order for events returned by /context API Richard van der Hoff 2016-02-19 16:52:03 +0000
  • bf7ca36cf6 Merge pull request #276 from matrix-org/rav/room_peeking Richard van der Hoff 2016-02-19 16:36:50 +0000
  • 68a4306773 Split room previews into a separate module Richard van der Hoff 2016-02-19 15:26:28 +0000
  • 740f775932 Fix a couple of typos, remove .m.rule.member_event markjh/default_rules Mark Haines 2016-02-18 18:36:08 +0000
  • 193e05275b Merge pull request #275 from matrix-org/markjh/remove_device_specific_rules Mark Haines 2016-02-18 16:05:50 +0000
  • 3db6980e0b Remove references to device specific push rules markjh/remove_device_specific_rules Mark Haines 2016-02-18 16:05:47 +0000
  • 5cedfc13e2 Merge pull request #272 from matrix-org/daniel/multikeys Daniel Wagner-Hall 2016-02-18 15:46:45 +0000
  • b9896bac71 better images Oddvar Lovaas 2016-02-16 16:38:10 +0000
  • 92f75ec23c image urls Oddvar Lovaas 2016-02-16 16:26:21 +0000
  • b4dedb0b0d new featured clients and update images. moved angular one out. Oddvar Lovaas 2016-02-16 16:20:26 +0000
  • ad5a08e5b9 Merge branch 'master' of github.com:matrix-org/matrix-doc Oddvar Lovaas 2016-02-16 11:01:32 +0000
  • b28989b2ad fix for https://github.com/matrix-org/matrix-doc/issues/270 Oddvar Lovaas 2016-02-16 11:01:04 +0000
  • 8a050aebc0 Add a note to the docs for before and after to make it clear that they cannot be used with the predefined rules Mark Haines 2016-02-15 17:17:58 +0000
  • 5d85e3a505 Remove indents Mark Haines 2016-02-15 16:53:08 +0000
  • afe7638e30 Add a new title level to appease gendoc Mark Haines 2016-02-15 16:50:15 +0000
  • b16af5ef64 Fix JSON, add headers Mark Haines 2016-02-15 16:41:47 +0000