Commit Graph

6800 Commits (ae3673d2ef72156085d3e1f7dbd923e15dd2ae29)
 

Author SHA1 Message Date
Matthew Hodgson 01d7951f4a Merge pull request #880 from turt2live/patch-1
Create 2017-03-19-matrix-voyager-bot.md
8 years ago
Matthew Hodgson 87e4cb3ca9 Merge pull request #879 from Xe/master
Remove Morpheus
8 years ago
Travis Ralston 68d69d5fd5 Create 2017-03-19-matrix-voyager-bot.md 8 years ago
Christine Dodrill 1646d4b832 Remove Morpheus
Closes #878
Closes #873
Closes #847
8 years ago
Keyvan Fatehi 35605b4c1d Improvements to the "types of bridging" guide
Signed-off-by: Keyvan Fatehi <keyvanfatehi@gmail.com>
8 years ago
Richard van der Hoff f476688a63 Merge pull request #871 from matrix-org/dbkr/remove_unused_is_file_2
Remove unused ID server file
8 years ago
David Baker 6296d676c8 Remove unused ID server file 8 years ago
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>
8 years ago
Andreas Brönnimann 0805bbbed7 The matrix-rocketchat bridge is in alpha
Signed-off-by: Andreas Brönnimann <foss@exul.org>
8 years ago
Matthew Hodgson 95fe2c3d82 fix merge 8 years ago
Matthew Hodgson 5508849315 fix merge 8 years ago
Matthew Hodgson d60aa4ba28 switch from one/two-way puppeting to simple/double puppeting 8 years ago
Richard van der Hoff 5563e8ea0e Merge pull request #836 from qznc/patch-1
Fix device keys query
8 years ago
Andreas Zwinkau 9304d6d71d Fix device keys query
Omitting the "device_keys" wrap results in an empty response.
8 years ago
Matthew Hodgson 6a5ab4e2ea Merge pull request #833 from turt2live/master
Add matrix-appservice-instagram
8 years ago
turt2live b314b30812 Add matrix-appservice-instagram 8 years ago
Matthew Hodgson 58fe19866a Merge pull request #832 from kfatehi/patch-1
Tweaks to "How do I bridge thee? Let me count the ways…" article
8 years ago
Keyvan Fatehi 012aa8fba4 fixes
* Moved matrix-puppet-bridge out of one-way and into two-way
* Fixed server to server heading
8 years ago
Matthew Hodgson b5acd9b3fd fix b0rk3d url 8 years ago
Matthew Hodgson 2c0048edfd fix link 8 years ago
Matthew Hodgson 4c41e07e87 cosmetics 8 years ago
Matthew Hodgson f5bf64d0bb bridging in the index 8 years ago
Matthew Hodgson 20e7a0ccfa types of bridging 8 years ago
Richard van der Hoff 2e9f260c3c Merge pull request #809 from aaronraimist/patch-1
Maatrix => Matrix in matrix-appservice-discord
8 years ago
Oddvar Lovaas ee9a3efdf5 Add Riotic 8 years ago
Oddvar Lovaas 16a4c77012 Add Go-NEB 8 years ago
Oddvar Lovaas f740e3fb08 Add Matrix Recorder 8 years ago
Richard van der Hoff ff0628f37a Merge pull request #821 from matrix-org/rav/unpadded_base64
Specification of unpadded Base64
8 years ago
Richard van der Hoff da686ba4eb Specification of unpadded Base64 8 years ago
Richard van der Hoff 8e35111f47 FAQ: remove 'Why don't you use websockets' todo
... since we already have an answer that answers it
8 years ago
Aaron Raimist 3b7fb8dc9a Maatrix => Matrix in matrix-appservice-discord 8 years ago
Oddvar Lovaas 242c8aa1c1 Discord bridge is alpha 8 years ago
Oddvar Lovaas 736ba5fb1f Add matrix-appservice-discord 8 years ago
Oddvar Lovaas b62f49ed61 Add matrix-dotnet-framework 8 years ago
Richard van der Hoff 39f177b5eb e2e guide: fix /claim response 8 years ago
Richard van der Hoff 857ff2573f e2e guide: add link about m.room_key events. 8 years ago
Oddvar Lovaas cdd4e71773 Fix date 8 years ago
Oddvar Lovaas e682db96c4 Add python-matrix-bot-api 8 years ago
Oddvar Lovaas 11e6f0c232 Merge pull request #801 from turt2live/travis/projects
Add matrix-email-bot and matrix-appservice-minecraft
8 years ago
Oddvar Lovaas f656aa55e4 Add Navi 8 years ago
Oddvar Lovaas 2e68afa3ca Add MatrixClient 8 years ago
Oddvar Lovaas ea62826739 Add SmartParking 8 years ago
Travis Ralston 15fb89002a Create 2017-02-02-matrix-appservice-minecraft.md 8 years ago
Travis Ralston 0f9d29cd07 Create 2016-12-17-matrix-email-bot.md 8 years ago
Oddvar Lovaas 3783ecb738 Add mxisd 8 years ago
Oddvar Lovaas 226f469156 Add more answers 8 years ago
Oddvar Lovaas 7fa45fbf18 Add TURN server Q. 8 years ago
Oddvar Lovaas 40022609f9 Add "Why can't I rename my homeserver?" 8 years ago
Matthew Hodgson fda1d13db9 Merge pull request #777 from GalPressman/matrigram
projects: Add matrigram project
8 years ago
Konstantinos Sideris 09a768763d Add missing enum fields for the set_presence parameter
Signed-off-by: Konstantinos Sideris <siderisk@auth.gr>
8 years ago