Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2025-12-22 01:08:37 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
2996 commits 30 branches 42 tags 32 MiB
Commit graph

2996 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christine Dodrill 1646d4b832 Remove Morpheus 
Closes #878
Closes #873
Closes #847
 2017-04-04 11:07:46 -07:00
Keyvan Fatehi 35605b4c1d Improvements to the "types of bridging" guide 
Signed-off-by: Keyvan Fatehi <keyvanfatehi@gmail.com>
 2017-04-01 08:44:29 -07:00
Richard van der Hoff f476688a63 Merge pull request #871 from matrix-org/dbkr/remove_unused_is_file_2 
Remove unused ID server file
 2017-03-30 14:09:15 +01:00
David Baker 6296d676c8 Remove unused ID server file 2017-03-30 13:14:57 +01:00
Keyvan Fatehi 94565933c2 Tempering the sales pitch of puppetted bridges. 
Folks are getting confused. The article sells the puppeted bridge
concept a little too hard and needs to temper it with the reality that
most networks people want to bridge (Facebook, Hangouts) suffer from the
fact that there is no means of representation for non-puppeted users.

Relevant discussions:

* https://matrix.to/#/!ChuQQIVJvwyJujhNIG:synapse.keyvan.pw/$149063160814JjbEL:gruenhage.xyz
* https://matrix.to/#/!svJUttHBtRMdXmEhEy:matrix.org/$149072185910105qOwCB:synapse.keyvan.pw

Signed-off-by: Keyvan Fatehi <keyvanfatehi@gmail.com>
 2017-03-28 10:56:56 -07:00
Andreas Brönnimann 0805bbbed7 The matrix-rocketchat bridge is in alpha 
Signed-off-by: Andreas Brönnimann <foss@exul.org>
 2017-03-22 10:58:01 +01:00
Matthew Hodgson 95fe2c3d82 fix merge 2017-03-15 01:54:24 +00:00
Matthew Hodgson 5508849315 fix merge 2017-03-15 01:52:33 +00:00
Matthew Hodgson d60aa4ba28 switch from one/two-way puppeting to simple/double puppeting 2017-03-15 01:51:35 +00:00
Richard van der Hoff 5563e8ea0e Merge pull request #836 from qznc/patch-1 
Fix device keys query
 2017-03-14 21:29:37 +00:00
Andreas Zwinkau 9304d6d71d Fix device keys query 
Omitting the "device_keys" wrap results in an empty response.
 2017-03-14 21:57:25 +01:00
Matthew Hodgson 6a5ab4e2ea Merge pull request #833 from turt2live/master 
Add matrix-appservice-instagram
 2017-03-11 23:56:28 +00:00
turt2live b314b30812 Add matrix-appservice-instagram 2017-03-11 16:49:49 -07:00
Matthew Hodgson 58fe19866a Merge pull request #832 from kfatehi/patch-1 
Tweaks to "How do I bridge thee? Let me count the ways…" article
 2017-03-11 22:02:24 +00:00
Keyvan Fatehi 012aa8fba4 fixes 
* Moved matrix-puppet-bridge out of one-way and into two-way
* Fixed server to server heading
 2017-03-11 13:57:08 -08:00
Matthew Hodgson b5acd9b3fd fix b0rk3d url 2017-03-11 20:45:51 +00:00
Matthew Hodgson 2c0048edfd fix link 2017-03-11 16:08:52 +00:00
Matthew Hodgson 4c41e07e87 cosmetics 2017-03-11 15:45:07 +00:00
Matthew Hodgson f5bf64d0bb bridging in the index 2017-03-11 15:38:51 +00:00
Matthew Hodgson 20e7a0ccfa types of bridging 2017-03-11 15:27:18 +00:00
Richard van der Hoff 2e9f260c3c Merge pull request #809 from aaronraimist/patch-1 
Maatrix => Matrix in matrix-appservice-discord
 2017-03-08 09:04:30 +00:00
Oddvar Lovaas ee9a3efdf5 Add Riotic 2017-03-03 15:45:42 +00:00
Oddvar Lovaas 16a4c77012 Add Go-NEB 2017-03-01 11:34:53 +00:00
Oddvar Lovaas f740e3fb08 Add Matrix Recorder 2017-03-01 11:28:05 +00:00
Richard van der Hoff ff0628f37a Merge pull request #821 from matrix-org/rav/unpadded_base64 
Specification of unpadded Base64
 2017-03-01 10:20:18 +00:00
Richard van der Hoff da686ba4eb Specification of unpadded Base64 2017-03-01 08:50:07 +00:00
Richard van der Hoff 8e35111f47 FAQ: remove 'Why don't you use websockets' todo 
... since we already have an answer that answers it
 2017-02-27 17:52:18 +00:00
Aaron Raimist 3b7fb8dc9a Maatrix => Matrix in matrix-appservice-discord 2017-02-22 14:54:41 -06:00
Oddvar Lovaas 242c8aa1c1 Discord bridge is alpha 2017-02-20 17:23:22 +00:00
Oddvar Lovaas 736ba5fb1f Add matrix-appservice-discord 2017-02-20 17:22:52 +00:00
Oddvar Lovaas b62f49ed61 Add matrix-dotnet-framework 2017-02-20 17:16:00 +00:00
Richard van der Hoff 39f177b5eb e2e guide: fix /claim response 2017-02-18 20:02:59 +00:00
Richard van der Hoff 857ff2573f e2e guide: add link about m.room_key events. 2017-02-18 20:02:16 +00:00
Oddvar Lovaas cdd4e71773 Fix date 2017-02-17 14:54:36 +00:00
Oddvar Lovaas e682db96c4 Add python-matrix-bot-api 2017-02-17 14:51:51 +00:00
Oddvar Lovaas 11e6f0c232 Merge pull request #801 from turt2live/travis/projects 
Add matrix-email-bot and matrix-appservice-minecraft
 2017-02-15 16:42:01 +00:00
Oddvar Lovaas f656aa55e4 Add Navi 2017-02-10 16:18:12 +00:00
Oddvar Lovaas 2e68afa3ca Add MatrixClient 2017-02-08 16:55:46 +00:00
Oddvar Lovaas ea62826739 Add SmartParking 2017-02-07 17:21:57 +00:00
Travis Ralston 15fb89002a Create 2017-02-02-matrix-appservice-minecraft.md 2017-02-06 12:29:21 -07:00
Travis Ralston 0f9d29cd07 Create 2016-12-17-matrix-email-bot.md 2017-02-06 12:21:48 -07:00
Oddvar Lovaas 3783ecb738 Add mxisd 2017-02-06 18:00:12 +00:00
Oddvar Lovaas 226f469156 Add more answers 2017-01-27 16:27:17 +00:00
Oddvar Lovaas 7fa45fbf18 Add TURN server Q. 2017-01-27 11:59:02 +00:00
Oddvar Lovaas 40022609f9 Add "Why can't I rename my homeserver?" 2017-01-25 16:59:07 +00:00
Matthew Hodgson fda1d13db9 Merge pull request #777 from GalPressman/matrigram 
projects: Add matrigram project
 2017-01-16 16:29:10 +00:00
Oddvar Lovaas b9f677ee94 Remove "what are redactions?" from to-be-answered-list 2017-01-12 17:47:06 +00:00
Oddvar Lovaas c47eff0d8d Answer "what are redactions?" 2017-01-12 17:45:19 +00:00
Oddvar Lovaas deda61649d Add new screens for riot-web 2017-01-12 15:20:17 +00:00
Oddvar Lovaas 857e072151 Add NPM packages and desktop builds to Riot project page 2017-01-11 17:52:17 +00:00