Commit graph

  • 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 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 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 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 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 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 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 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
  • 8a1a02a11b Update the predefined push rules in the spec Mark Haines 2016-02-15 16:28:43 +0000
  • 072d285153 speculator: Allow access token to be specified Daniel Wagner-Hall 2016-02-15 14:48:26 +0000
  • 5d2eae58bd adding descriptions; moving things around Oddvar Lovaas 2016-02-12 16:38:19 +0000
  • 6b4af54f42 remove the ubuntu entry for now Oddvar Lovaas 2016-02-12 15:58:52 +0000
  • 1779f82410 remove for now Oddvar Lovaas 2016-02-12 15:56:06 +0000
  • 02fc978241 README Oddvar Lovaas 2016-02-12 15:39:32 +0000
  • 0e6a9af434 moving things around Oddvar Lovaas 2016-02-12 15:28:10 +0000
  • ea170e5dca m.third_party_invite: Allow multiple public keys Daniel Wagner-Hall 2016-02-12 13:13:47 +0000
  • 2890d282e3 Merge pull request #271 from matrix-org/daniel/asids Daniel Wagner-Hall 2016-02-12 11:42:56 +0000
  • bf6bff3af6 Add ID to AS guide Daniel Wagner-Hall 2016-02-12 11:31:43 +0000
  • 8c05e12cfc All the Matrix projects Oddvar Lovaas 2016-02-12 11:15:18 +0000
  • 6925547875 remove the oversimplification that the WebRTC standard is based around two-oparty communication Matthew Hodgson 2016-02-11 18:34:28 +0000
  • 41130314da random incoherent thoughts on reputation that should live somewhere Matthew Hodgson 2016-02-09 12:07:32 +0000
  • 2e1c2c23e4 Merge pull request #269 from matrix-org/dbkr/profile_return_null David Baker 2016-02-03 15:07:54 +0000
  • 53a4a563e2 Actually we think they should not be present (which means synapse is buggy). David Baker 2016-02-03 14:54:29 +0000
  • 542b17e944 Clarify what profile endpoints return if avatar url / display name isn't set David Baker 2016-02-03 13:14:12 +0000
  • 630ce3d5c6 wrong link Oddvar Lovaas 2016-02-03 10:11:58 +0000
  • cb87da12f2 Merge pull request #268 from matrix-org/rav/add_event_to_context Richard van der Hoff 2016-02-01 18:56:45 +0100
  • 58b346e204 s/user_id/sender/ in context example response Richard van der Hoff 2016-02-01 17:50:36 +0000
  • b2e0a855cc Add 'event' to event context API Richard van der Hoff 2016-02-01 17:45:45 +0000
  • 2ed95a9a40 Merge pull request #267 from matrix-org/daniel/3pid Daniel Wagner-Hall 2016-01-29 16:58:10 +0000
  • 0da26cd7e1 Specify login behaviour for unknown 3pids Daniel Wagner-Hall 2016-01-29 16:49:54 +0000
  • f291484709 Merge pull request #265 from matrix-org/markjh/3pid_login Mark Haines 2016-01-29 15:42:21 +0100
  • 245e8e8571 Add 3pid password login to the spec Mark Haines 2016-01-29 14:42:18 +0000
  • 72d859609a Merge pull request #266 from matrix-org/markjh/three_pid_creds Mark Haines 2016-01-29 15:39:41 +0100
  • e7f80b7c71 Fix the key name to be three_pid_creds rather than threePidCreds Mark Haines 2016-01-29 13:00:59 +0000
  • 9d1fc97505 Merge pull request #264 from matrix-org/daniel/unban Daniel Wagner-Hall 2016-01-15 14:08:44 +0000
  • 2e46b587b8 Require explicit un-banning Daniel Wagner-Hall 2016-01-15 14:08:40 +0000
  • c69481d67a Merge pull request #263 from matrix-org/invalid_user_name David Baker 2016-01-15 13:30:02 +0000
  • 169cc98101 M_INVALID_USERNAME to be consistent with the name of the parameter David Baker 2016-01-15 10:04:29 +0000
  • 2301a792d7 Add an error code for invalid user names. David Baker 2016-01-14 17:19:04 +0000
  • bd348b6810 Merge pull request #262 from matrix-org/daniel/asid Daniel Wagner-Hall 2016-01-14 11:05:58 +0000
  • cfbb695fd3 typoe Matthew Hodgson 2016-01-13 18:25:33 +0000
  • 9bc07ea093 Add ID to application services Daniel Wagner-Hall 2016-01-13 16:02:11 +0000
  • 5cf22c210e Merge pull request #261 from matrix-org/daniel/join Daniel Wagner-Hall 2016-01-13 15:55:54 +0000
  • 1e2b63763e /join and /room/:roomId/join aren't exact aliases Daniel Wagner-Hall 2016-01-13 15:55:51 +0000
  • 367e1334eb Merge pull request #260 from matrix-org/rav/start_0.0.2 Richard van der Hoff 2016-01-11 16:01:23 +0000