Commit Graph

  • 6eaa6e0a9d Merge commit '3dab320' into drafts/e2e Richard van der Hoff 2017-03-24 08:07:03 +0000
  • 0805bbbed7 The matrix-rocketchat bridge is in alpha Andreas Brönnimann 2017-03-21 20:57:09 +0100
  • c996e439b0 Merge 8b1aff903d into 95fe2c3d82 Will Hunt 2017-03-21 00:39:53 +0000
  • e2a230ed67 Merge 04b32069bd into 95fe2c3d82 Erik Johnston 2017-03-20 23:47:14 +0000
  • 95fe2c3d82 fix merge Matthew Hodgson 2017-03-15 01:54:24 +0000
  • 5508849315 fix merge Matthew Hodgson 2017-03-15 01:52:33 +0000
  • d60aa4ba28 switch from one/two-way puppeting to simple/double puppeting Matthew Hodgson 2017-03-15 01:51:35 +0000
  • 5563e8ea0e Merge pull request #836 from qznc/patch-1 Richard van der Hoff 2017-03-14 21:29:37 +0000
  • 9304d6d71d Fix device keys query Andreas Zwinkau 2017-03-14 21:57:25 +0100
  • 6a5ab4e2ea Merge pull request #833 from turt2live/master Matthew Hodgson 2017-03-11 23:56:28 +0000
  • b314b30812 Add matrix-appservice-instagram turt2live 2017-03-11 16:49:49 -0700
  • be6dfb4107 Merge a2d21eec05 into 58fe19866a stevenhammerton 2017-03-11 22:06:48 +0000
  • 58fe19866a Merge pull request #832 from kfatehi/patch-1 Matthew Hodgson 2017-03-11 22:02:24 +0000
  • 012aa8fba4 fixes Keyvan Fatehi 2017-03-11 13:57:08 -0800
  • b5acd9b3fd fix b0rk3d url Matthew Hodgson 2017-03-11 20:45:51 +0000
  • 2c0048edfd fix link Matthew Hodgson 2017-03-11 16:08:52 +0000
  • 4c41e07e87 cosmetics Matthew Hodgson 2017-03-11 15:44:54 +0000
  • f5bf64d0bb bridging in the index Matthew Hodgson 2017-03-11 15:38:51 +0000
  • 20e7a0ccfa types of bridging Matthew Hodgson 2017-03-11 15:27:18 +0000
  • 2e9f260c3c Merge pull request #809 from aaronraimist/patch-1 Richard van der Hoff 2017-03-08 09:04:30 +0000
  • f275f8c1ce Added status field to m.notice. Will Hunt 2017-03-07 13:04:51 +0000
  • ee9a3efdf5 Add Riotic Oddvar Lovaas 2017-03-03 15:45:42 +0000
  • 16a4c77012 Add Go-NEB Oddvar Lovaas 2017-03-01 11:34:53 +0000
  • f740e3fb08 Add Matrix Recorder Oddvar Lovaas 2017-03-01 11:28:05 +0000
  • ff0628f37a Merge pull request #821 from matrix-org/rav/unpadded_base64 Richard van der Hoff 2017-03-01 10:20:18 +0000
  • 3dab320889 Key management stuff, from e2e branch Richard van der Hoff 2017-02-22 07:42:44 +0000
  • da686ba4eb Specification of unpadded Base64 Richard van der Hoff 2017-03-01 08:50:07 +0000
  • 8e35111f47 FAQ: remove 'Why don't you use websockets' todo Richard van der Hoff 2017-02-27 17:52:18 +0000
  • 3b7fb8dc9a Maatrix => Matrix in matrix-appservice-discord Aaron Raimist 2017-02-22 14:54:41 -0600
  • 242c8aa1c1 Discord bridge is alpha Oddvar Lovaas 2017-02-20 17:23:22 +0000
  • 736ba5fb1f Add matrix-appservice-discord Oddvar Lovaas 2017-02-20 17:22:52 +0000
  • b62f49ed61 Add matrix-dotnet-framework Oddvar Lovaas 2017-02-20 17:16:00 +0000
  • 39f177b5eb e2e guide: fix /claim response Richard van der Hoff 2017-02-18 20:02:59 +0000
  • 857ff2573f e2e guide: add link about m.room_key events. Richard van der Hoff 2017-02-18 20:02:16 +0000
  • cdd4e71773 Fix date Oddvar Lovaas 2017-02-17 14:54:36 +0000
  • e682db96c4 Add python-matrix-bot-api Oddvar Lovaas 2017-02-17 14:51:51 +0000
  • 11e6f0c232 Merge pull request #801 from turt2live/travis/projects Oddvar Lovaas 2017-02-15 16:42:01 +0000
  • f656aa55e4 Add Navi Oddvar Lovaas 2017-02-10 16:18:12 +0000
  • 2e68afa3ca Add MatrixClient Oddvar Lovaas 2017-02-08 16:55:46 +0000
  • ea62826739 Add SmartParking Oddvar Lovaas 2017-02-07 17:21:57 +0000
  • 15fb89002a Create 2017-02-02-matrix-appservice-minecraft.md Travis Ralston 2017-02-06 12:29:21 -0700
  • 0f9d29cd07 Create 2016-12-17-matrix-email-bot.md Travis Ralston 2017-02-06 12:21:48 -0700
  • 3783ecb738 Add mxisd Oddvar Lovaas 2017-02-06 18:00:12 +0000
  • 226f469156 Add more answers Oddvar Lovaas 2017-01-27 16:27:17 +0000
  • 7fa45fbf18 Add TURN server Q. Oddvar Lovaas 2017-01-27 11:59:02 +0000
  • 40022609f9 Add "Why can't I rename my homeserver?" Oddvar Lovaas 2017-01-25 16:59:07 +0000
  • fda1d13db9 Merge pull request #777 from GalPressman/matrigram Matthew Hodgson 2017-01-16 16:29:10 +0000
  • 09a768763d Add missing enum fields for the set_presence parameter Konstantinos Sideris 2017-01-14 19:09:23 +0200
  • b9f677ee94 Remove "what are redactions?" from to-be-answered-list Oddvar Lovaas 2017-01-12 17:47:06 +0000
  • c47eff0d8d Answer "what are redactions?" Oddvar Lovaas 2017-01-12 17:45:19 +0000
  • deda61649d Add new screens for riot-web Oddvar Lovaas 2017-01-12 15:20:17 +0000
  • 857e072151 Add NPM packages and desktop builds to Riot project page Oddvar Lovaas 2017-01-11 17:52:17 +0000
  • b4776623eb Add synpurge Oddvar Lovaas 2017-01-11 17:47:45 +0000
  • c01b0c769c Add matrix-esp8266 Oddvar Lovaas 2017-01-11 17:08:39 +0000
  • 74e131bd37 Add matrix-music-bot Oddvar Lovaas 2017-01-11 16:49:28 +0000
  • dfbb2f0647 add matrix-appservice-facebook Oddvar Lovaas 2017-01-11 15:17:48 +0000
  • 200dcec4d1 Add synapse-password-reset Oddvar Lovaas 2017-01-11 15:08:14 +0000
  • 42d6861d3c Add tiny-matrix-bot Oddvar Lovaas 2017-01-10 16:13:42 +0000
  • cafda9d2a7 Clarify MXID Oddvar Lovaas 2017-01-09 18:05:02 +0000
  • 8526da835f projects: Add matrigram project Gal Pressman 2017-01-03 22:04:02 +0200
  • 5046489d90 Merge e902834c3f into a091d86707 David Baker 2017-01-03 19:49:50 +0000
  • 3adf457cf1 Merge 0f80e91cce into a091d86707 Hubert Chathi 2017-01-03 19:49:14 +0000
  • a091d86707 Merge pull request #775 from superdump/superdump/fed-pdu-state-update-fix Richard van der Hoff 2017-01-03 12:11:49 +0000
  • 3af8b09f93 Merge pull request #774 from superdump/superdump/fed-pdu-signature-fix Richard van der Hoff 2017-01-03 12:10:00 +0000
  • db26877eee server-server api: Fix swapped pdu state update field descriptions Robert Swain 2017-01-02 23:09:16 +0100
  • 5855bf4b16 server-server: PDUs are signed by the origin server's private key Robert Swain 2017-01-02 22:44:23 +0100
  • 0f80e91cce update FAQ to mention Riot desktop version Hubert Chathi 2016-12-28 11:02:55 -0500
  • 14bd3effde Add riotchat Oddvar Lovaas 2016-12-20 17:27:30 +0000
  • 2ea621d540 Add matrix-appservice-gitter-twisted Oddvar Lovaas 2016-12-16 15:39:28 +0000
  • 3cad61f95e Add matrix-rocketchat Oddvar Lovaas 2016-12-16 15:37:18 +0000
  • 41cbd997d7 Add imessage-bridge Oddvar Lovaas 2016-12-16 14:53:02 +0000
  • 1774757807 Add matrix-pushgw Oddvar Lovaas 2016-12-16 14:43:15 +0000
  • d1cb5e3d0c Add matrix-fb-chat Oddvar Lovaas 2016-12-16 14:39:05 +0000
  • 05750d649f Add mm Oddvar Lovaas 2016-12-07 17:51:46 +0000
  • 46eef3d32e Add new projects (interlocutor, node-red-nodes, matrex, gomatrix and matrix-live) Oddvar Lovaas 2016-12-01 18:03:47 +0000
  • 6b927cb2fb Merge pull request #752 from kyrias/age-field Richard van der Hoff 2016-12-01 10:20:12 +0000
  • c1b375b2ac Clarify that age is generated on the local HS Johannes Löthberg 2016-11-30 23:12:47 +0100
  • b21707659f delete macaroons draft Richard van der Hoff 2016-11-30 16:42:06 +0000
  • 19d1b54920 Merge pull request #751 from matrix-org/rav/guest_e2e David Baker 2016-11-30 16:39:14 +0000
  • 5537f7a832 Allow guest access to E2E endpoints Richard van der Hoff 2016-11-30 07:59:25 +0000
  • 3265a9dde3 Merge pull request #750 from kyrias/notice-language Richard van der Hoff 2016-11-30 16:07:18 +0000
  • a8b253889b Add m.notice description rephrasing to changelog Johannes Löthberg 2016-11-30 14:55:46 +0100
  • dc91628a7b Merge branch 'master' into drafts/e2e Richard van der Hoff 2016-11-30 07:46:36 +0000
  • d9894aeffd Make m.notice description use stricter language Johannes Löthberg 2016-11-29 23:31:09 +0100
  • 8a9629167a httpsify the speculator link Richard van der Hoff 2016-11-27 17:28:56 +0000
  • 18a83ea299 Add Freebird Oddvar Lovaas 2016-11-24 16:51:39 +0000
  • 83f58baba2 Add j Oddvar Lovaas 2016-11-22 18:10:28 +0000
  • 7adf95b4ad Merge pull request #740 from matrix-org/rav/fix_736 Richard van der Hoff 2016-11-22 09:52:19 +0000
  • c83a556097 Set default account 'kind' to 'user' Richard van der Hoff 2016-11-21 17:54:47 +0000
  • 02a8715197 Merge pull request #388 from matrix-org/erikj/public_rooms Richard van der Hoff 2016-11-21 13:13:45 +0000
  • c175039a08 Final public_rooms clarifications Richard van der Hoff 2016-11-21 13:08:41 +0000
  • dca1d0c745 Merge branch 'master' into erikj/public_rooms Richard van der Hoff 2016-11-21 12:22:08 +0000
  • 20f0437374 Merge dc977a4643 into 9debd7c1ad Erik Johnston 2016-11-16 16:59:46 +0000
  • 9debd7c1ad Add Hangouts Bridge Oddvar Lovaas 2016-11-16 15:34:53 +0000
  • 42f7aed69a Add fork of matrix-xmpp-bridge Oddvar Lovaas 2016-11-16 15:28:10 +0000
  • e5bd9deeeb Add Hello Matrix Bot and fix link in faq Oddvar Lovaas 2016-11-11 16:54:39 +0000
  • 4abdcc6f05 Merge pull request #402 from matrix-org/rav/device_management Richard van der Hoff 2016-11-09 15:09:46 +0000
  • 32cc1ded86 Update PTO; add matrix-ircd Oddvar Lovaas 2016-11-09 14:55:20 +0000
  • d5b3af0228 Add Revolt Oddvar Lovaas 2016-11-09 14:55:01 +0000
  • 2bf0abcb9d Add missing tag to PUT /devices/{deviceId} Richard van der Hoff 2016-11-09 14:37:34 +0000