Commit Graph

  • cefb63dd80 Fix link markup Matthias Beyer 2016-09-21 09:29:05 +0200
  • edcab06e2d Fix spacing, re-add ios redirect page Oddvar Lovaas 2016-09-19 15:39:26 +0100
  • 6e915b9119 Rename Vector -> Riot Oddvar Lovaas 2016-09-19 15:34:37 +0100
  • 9e58f4236a Re-write F-droid paragraph Oddvar Lovaas 2016-09-14 17:24:21 +0100
  • bdc869d8e7 Merge pull request #382 from exul/faq/client-and-server-questions Oddvar Lovaas 2016-09-14 16:45:57 +0100
  • a89669aa1f Add new questions about servers and clients Andreas Brönnimann 2016-09-08 21:29:35 +0200
  • f4c093a58d Split Implementations into Servers and Clients Andreas Brönnimann 2016-09-08 21:29:17 +0200
  • 65d1888e08 Merge pull request #381 from matrix-org/dbkr/clarify_highlight_and_sound Richard van der Hoff 2016-09-08 13:06:46 +0100
  • 9a1db01d92 Clarify `highlight` and `sound` tweaks. dbkr/clarify_highlight_and_sound David Baker 2016-09-08 11:59:49 +0100
  • 026a507380 Merge pull request #379 from Ralith/nix-shell Richard van der Hoff 2016-08-31 10:38:03 +0100
  • 4833710bc5 Merge pull request #378 from Ralith/redaction Richard van der Hoff 2016-08-31 10:37:09 +0100
  • 33d80408e0 Add a nix-shell environment suitable for building Benjamin Saunders 2016-08-26 23:14:39 -0700
  • cade909e25 Fix inconsistencies regarding redacted_because Benjamin Saunders 2016-08-26 22:59:23 -0700
  • 69b1827b10 Merge pull request #380 from matrix-org/rav/doc_accountdata_key Richard van der Hoff 2016-08-30 17:58:08 +0100
  • 7478e7f3cf Add top-level account_data to /sync response Richard van der Hoff 2016-08-30 17:43:20 +0100
  • 0474010d47 Merge pull request #376 from Ralith/user_id-sender Richard van der Hoff 2016-08-30 16:02:05 +0100
  • 77b668a5dc Fix some obsolete uses of user_id key in events Benjamin Saunders 2016-08-26 02:18:00 -0700
  • 2fa7aac3be Merge pull request #377 from Ralith/typos Richard van der Hoff 2016-08-26 10:28:52 +0100
  • 80bfbbdd33 Fix typo Benjamin Saunders 2016-08-26 02:19:02 -0700
  • 3beffc66cb Move purple-matrix to client list Oddvar Lovaas 2016-08-23 13:44:07 +0100
  • df8805155d Merge pull request #375 from davidar/patch-1 Oddvar Lovaas 2016-08-23 12:38:31 +0200
  • 7935caf388 Update 2015-06-26-tensor.md David A Roberts 2016-08-23 20:14:37 +1000
  • 6c78a6aab0 Merge pull request #374 from matrix-org/matthew/fix_state_sending_desc Richard van der Hoff 2016-08-18 15:01:44 +0100
  • 978d9ea6dd fix the descriptions of the /room/.../state APIs to not be the wrong way round matthew/fix_state_sending_desc Matthew Hodgson 2016-08-18 14:04:21 +0100
  • 16a4903656 Moved to correct date Oddvar Lovaas 2016-08-17 16:51:14 +0100
  • b45425938c Add gitter bridges Oddvar Lovaas 2016-08-17 16:48:10 +0100
  • fd888fcbda Merge pull request #373 from matrix-org/dbkr/contains_display_name_override David Baker 2016-08-17 09:43:44 +0100
  • 311c0a6eb5 Hopefully correct indentation on changelog dbkr/contains_display_name_override David Baker 2016-08-17 09:42:46 +0100
  • 9fb68f54ce Changelog David Baker 2016-08-16 18:16:47 +0100
  • 512b0c5564 Merge pull request #372 from matrix-org/dbkr/add_dot Richard van der Hoff 2016-08-16 08:28:49 +0100
  • b65b0d049e Make the display name rule an override rule David Baker 2016-08-15 18:32:35 +0100
  • 6592646ee9 Add dot prefix to .rule.master dbkr/add_dot David Baker 2016-08-15 18:29:39 +0100
  • 6a4f65d78f update c-s changelog Richard van der Hoff 2016-08-15 13:50:58 +0100
  • c494adf92c Merge pull request #371 from matrix-org/rav/auth_clarifications David Baker 2016-08-15 13:23:15 +0100
  • c51c4acf7f Clarifications to authentication mechanisms Richard van der Hoff 2016-08-15 10:28:15 +0100
  • 5ab7ba282d Add matrix-appservice-rocketchat Oddvar Lovaas 2016-08-12 16:17:13 +0100
  • 0ef196f545 Add Nervewire Oddvar Lovaas 2016-08-12 12:53:34 +0100
  • 4ace92bca3 Merge pull request #370 from Ralith/origin_server_ts Richard van der Hoff 2016-08-12 10:08:02 +0100
  • 1c02ff5249 Specify requirement of origin_server_ts Benjamin Saunders 2016-08-12 01:48:27 -0700
  • fee90f135b Update instructions Oddvar Lovaas 2016-08-11 17:07:12 +0100
  • cffd4c34ea Change to sorting by date (mostly) Oddvar Lovaas 2016-08-11 17:05:50 +0100
  • 9cb626982a s/user/username/ typo Matthew Hodgson 2016-08-10 18:09:44 -0500
  • 1551e34ea5 Merge pull request #369 from sim6/fix_faq_federation_api_link Matthew Hodgson 2016-08-09 17:21:56 -0500
  • 946374a737 Merge pull request #368 from sim6/format_faq_links Matthew Hodgson 2016-08-09 17:21:36 -0500
  • a90074ec78 Fix FAQ Federation API link Simó Albert i Beltran 2016-08-09 23:25:37 +0200
  • 82897a52a1 Format FAQ links Simó Albert i Beltran 2016-08-09 23:14:00 +0200
  • e910a39594 Merge pull request #367 from matrix-org/rav/document_cas_login Richard van der Hoff 2016-08-09 16:48:08 +0100
  • 07fa64d73d Update changelog Richard van der Hoff 2016-08-09 16:46:49 +0100
  • 0248afe6ac login with invalid token gives a 403 Richard van der Hoff 2016-08-09 16:28:29 +0100
  • 1f1dfdd91c More clarifications Richard van der Hoff 2016-08-09 15:51:12 +0100
  • ec81b4c9fe More PR feedback Richard van der Hoff 2016-08-09 12:16:20 +0100
  • 4b0e546eeb PR feedback Richard van der Hoff 2016-08-09 12:02:38 +0100
  • 41368dc5a7 document CAS login Richard van der Hoff 2016-08-08 17:33:48 +0100
  • 20eab7714f Merge pull request #366 from matrix-org/markjh/filename Mark Haines 2016-08-03 14:13:21 +0100
  • f3d6f6a387 Remove spare () Oddvar Lovaas 2016-08-02 18:12:23 +0100
  • 04b71fb571 Add NaChat and Twitter bridgew1 Oddvar Lovaas 2016-08-02 18:09:50 +0100
  • ba64d9fe5a Remove thing from jenkins.sh markjh/filename Mark Haines 2016-08-02 14:18:55 +0100
  • f55bf46c7c Print the git revision in jenkins.sh Mark Haines 2016-08-02 14:09:36 +0100
  • d0785d80cc Poke jenkins Mark Haines 2016-08-02 14:05:25 +0100
  • d2fe2f1ff6 Fix jenkins Mark Haines 2016-08-02 13:59:46 +0100
  • 618f94699b Document the optional parameter for specifying a filename to download an attachment as Mark Haines 2016-08-02 13:49:54 +0100
  • 4f206e3223 Merge pull request #365 from matrix-org/rav/pushrules_spec David Baker 2016-07-27 16:18:31 +0100
  • 8328e485ea Clean up the pushrules API doc Richard van der Hoff 2016-07-27 13:50:11 +0100
  • 9a2af4fbc1 Changelog: Add /upload tweak Richard van der Hoff 2016-07-25 09:14:26 +0100
  • 7ac2f51e4a /upload: fix example for filename Richard van der Hoff 2016-07-25 09:07:42 +0100
  • 60875770fc Merge pull request #364 from Ralith/upload-filename Richard van der Hoff 2016-07-25 08:22:35 +0100
  • 3e2dea4c52 Document filename query parameter for uploads Benjamin Saunders 2016-07-24 23:26:03 -0700
  • 81630300fe Add wq!libqmatrixclient Oddvar Lovaas 2016-07-20 15:13:04 +0100
  • 93cc75299c Merge pull request #363 from matrix-org/rav/tokenrefresh_expires_access_token Richard van der Hoff 2016-07-19 10:09:47 +0100
  • ec20f15407 /tokenrefresh should expire the access token Richard van der Hoff 2016-07-19 09:17:14 +0100
  • 66bfd0462b Merge pull request #362 from matrix-org/rav/create_room_behaviour Richard van der Hoff 2016-07-18 14:57:47 +0100
  • 2370a4c970 Spell out the state algorithm for createRoom Richard van der Hoff 2016-07-18 12:57:41 +0100
  • c0490f2db2 cosmetics Matthew Hodgson 2016-07-14 18:25:34 +0100
  • a8127ece52 Merge branch 'release/client-server/r0.2.0' Richard van der Hoff 2016-07-14 16:25:53 +0100
  • a64f9bbb63 C-S spec: Fix 'unstable' in link to /context API client-server/r0.2.0 release/client-server/r0.2.0 Richard van der Hoff 2016-07-14 16:20:59 +0100
  • b5f9e896ba C-S spec: Fix 'unstable' in link to /context API Richard van der Hoff 2016-07-14 16:20:59 +0100
  • 76ec390c73 changelog: Add "unreleased" placeholder Richard van der Hoff 2016-07-14 15:44:17 +0100
  • a2ab6854ff CS spec: Add r0.2.0 to historical version list Richard van der Hoff 2016-07-14 15:40:49 +0100
  • 005a71ab00 Bump version in changelog Richard van der Hoff 2016-07-14 15:19:47 +0100
  • c71c9e4f6b Merge branch 'master' into release/client-server/r0.2.0 Richard van der Hoff 2016-07-14 15:17:40 +0100
  • ae489260a1 Merge pull request #359 from matrix-org/rav/mxid_grammar Richard van der Hoff 2016-07-14 15:16:15 +0100
  • 72449294bc Moar TODO Richard van der Hoff 2016-07-14 15:04:16 +0100
  • 0ac04f5649 Merge branch 'master' into release/client-server/r0.2.0 Richard van der Hoff 2016-07-14 14:39:22 +0100
  • 76fd85f054 Merge branch 'master' into release/client-server/r0.2.0 Richard van der Hoff 2016-07-14 14:38:59 +0100
  • a2f1c6a7a6 Add a TODO about defining non-latin login creds Richard van der Hoff 2016-07-14 14:37:42 +0100
  • e5f5d0c55e Merge pull request #361 from matrix-org/erikj/account_deactivate Erik Johnston 2016-07-14 11:15:32 +0100
  • 0e26238386 Update README Richard van der Hoff 2016-07-14 10:52:30 +0100
  • 06d379ed5e Add to changelog erikj/account_deactivate Erik Johnston 2016-07-14 10:18:48 +0100
  • b5d68b8ff1 Link to doc style doc Richard van der Hoff 2016-07-14 10:13:10 +0100
  • a48437ced8 Spec /account/deactivate API Erik Johnston 2016-07-14 10:11:38 +0100
  • 4d2bee4b56 Prepare changelog for 0.2.0 release Richard van der Hoff 2016-07-13 21:20:25 +0100
  • cdd19dca7f fix typos Richard van der Hoff 2016-07-13 18:32:29 +0100
  • f942b6e5c1 remove some redundant words Richard van der Hoff 2016-07-13 18:27:40 +0100
  • 001db45046 s/mxid/user id/, and other PR feedback. Richard van der Hoff 2016-07-13 18:20:11 +0100
  • 56547ad373 Merge pull request #358 from matrix-org/rav/contributing Richard van der Hoff 2016-07-13 16:27:13 +0100
  • e628edfdc6 Define MXID grammar Richard van der Hoff 2016-07-13 15:17:11 +0100
  • 9eba63b816 CONTRIBUTING PR feedback Richard van der Hoff 2016-07-13 12:19:42 +0100
  • 8ac45d7948 Merge pull request #353 from matrix-org/rav/room_membership Richard van der Hoff 2016-07-13 11:34:14 +0100
  • 6cfc025bb8 CONTRIBUTING: add link to docs folder Richard van der Hoff 2016-07-13 11:32:40 +0100
  • 0c06ea0e67 Merge pull request #356 from matrix-org/rav/fix_redaction Richard van der Hoff 2016-07-13 11:14:07 +0100