Commit Graph

4407 Commits

Author SHA1 Message Date
a1b9fbe091 Merge pull request #256 from julianfoad/patch-1
Fix force-pulling of mautrix-whatsapp
2019-08-28 13:54:02 +03:00
a5eb845a2d Fix force-pulling of mautrix-whatsapp 2019-08-28 11:52:42 +01:00
9b541c8979 Merge pull request #254 from Sudneo/add-haproxy-doc
Add haproxy doc
2019-08-26 11:46:56 +03:00
2793e24b5b Addresses comments in PR. Fixes typo in docker-compose. Changes mount of static files to RO. Adds example and brief explaination for haproxy certificates. Fixes whitespaces in nginx.conf 2019-08-26 09:04:47 +03:00
7f0b52e9e1 Formatting of haproxy.cfg 2019-08-25 22:59:47 +03:00
f1a64df339 Formatting of haproxy.cfg 2019-08-25 22:58:55 +03:00
06e8056173 Formatting of haproxy.cfg 2019-08-25 22:56:32 +03:00
3dfa6a28f9 Typo 2019-08-25 22:55:27 +03:00
b2e0e4efe3 Adds doc for HAproxy 2019-08-25 22:53:34 +03:00
f2f3d41649 Make matrix-corporal configuration extensible
Fixes #70 (Github Issue).
2019-08-25 10:58:30 +03:00
2d4e19326d Add missing when statement 2019-08-25 10:44:01 +03:00
0edd7e8089 Make Riot-web configuration extensible
Fixes #71 (Github Issue).
2019-08-25 10:37:05 +03:00
c4eebc5355 Add information about community-grouping for the Facebook bridge 2019-08-24 12:14:17 +03:00
10a9deba4a Make Synapse configuration extensible 2019-08-22 09:49:22 +03:00
b440d5b73c Remove some fact definitions during runtime 2019-08-22 08:00:02 +03:00
dd0f35562b Update changelog 2019-08-21 07:48:42 +03:00
811a46ad07 Merge pull request #205 from kingoftheconnors/master
Add Slack bridging support
2019-08-21 07:43:07 +03:00
65da600426 Merge branch 'master' into master 2019-08-21 07:34:20 +03:00
63d1ed1d56 Update changelog and documentation 2019-08-21 07:24:58 +03:00
c8a4d59a81 Merge pull request #251 from Munfred/master
Add mautrix-hangouts bridge role and documentation
2019-08-21 07:15:14 +03:00
2ef8898421 Add comment 2019-08-21 07:14:31 +03:00
97fb71d98c Change privilege level 2019-08-21 07:12:46 +03:00
1bcbc4a9ba Update matrix-corporal (1.4.0 -> 1.5.0) 2019-08-20 11:20:26 +03:00
e4b67fdb6b Fix typo 2019-08-20 09:07:54 +03:00
4c9105eeec Fix typo 2019-08-20 09:06:54 +03:00
2efcf11ee8 Remove some whitespace 2019-08-20 09:06:14 +03:00
53ae84f627 Add documentation on mautrix-hangouts bridge 2019-08-19 23:00:05 -07:00
88aef08af2 Add description of mautrix hangouts bridge in readme 2019-08-19 22:36:16 -07:00
885338c4fb Merge pull request #249 from Munfred/master
Describe setting up SMTP server with Sendgrid
2019-08-19 18:58:57 +03:00
c464ab303c Merge pull request #250 from thedanbob/updates
Update synapse (1.3.0 -> 1.3.1) and riot-web (1.3.2 -> 1.3.3)
2019-08-19 18:58:05 +03:00
1ce3526bf2 Update riot-web (1.3.2 -> 1.3.3) 2019-08-19 06:46:11 -05:00
42ea3cb0e1 Update synapse (1.3.0 -> 1.3.1) 2019-08-19 06:45:51 -05:00
ecff0f4a67 Describe setting up SMTP server with Sendgrid 2019-08-18 19:55:54 -07:00
db57618abd Update nginx and certbot 2019-08-17 10:21:23 +03:00
fcd96b5dee Add missing options to ProxyPass 2019-08-17 10:14:40 +03:00
3cb34e6998 Improve Synapse reverse-proxying Apache examples
Thanks to @ralfi!
2019-08-17 10:13:45 +03:00
e22672911d Add Server-Server API proxying to Apache example configuration
Contributed by @ralfi.
2019-08-16 10:08:09 +03:00
fe3f523853 Merge pull request #245 from dreamflasher/patch-1
missing Map /.well-known/matrix/server for server discovery
2019-08-16 10:00:43 +03:00
d675cb3d4b Serve /.well-known/matrix/server with proper Content-Type 2019-08-16 10:00:26 +03:00
1b2191a0f1 Add new Synapse configuration options (since 1.3.0)
Continuation of #246 (Github Pull Request)
2019-08-16 09:57:51 +03:00
c5c1216f31 Merge pull request #246 from thedanbob/synapse-1.3.0
Update synapse (1.2.1 -> 1.3.0)
2019-08-15 15:45:11 +03:00
7b5e633776 Update synapse (1.2.1 -> 1.3.0) 2019-08-15 06:59:37 -05:00
a1afafeb35 Upgrade mxisd (1.4.5 -> 1.4.6) 2019-08-15 09:36:04 +03:00
d55db2bee2 quotes, simplify 2019-08-14 08:49:06 +02:00
18a2377472 missing Map /.well-known/matrix/server for server discovery 2019-08-13 20:40:04 +02:00
63cf891842 Improved documentation 2019-08-13 10:54:58 -04:00
59d807fca7 Ensure auth.clientID is passed as string in Discord configuration
Discord client IDs are numeric (e.g. 12345).
Passing them as integers however, causes the Discord bridge's YAML parser
to parse them as integers and its config schema validation will fail.

Fixes #240 (Github Issue)
2019-08-11 16:16:05 +03:00
0646d4b3ec Merge pull request #239 from thedanbob/postgres-11.5-10.10-9.6.15
Bump postgres versions (11.5, 10.10, 9.6.15)
2019-08-09 15:08:20 +03:00
dc11704c11 Bump postgres versions (11.5, 10.10, 9.6.15) 2019-08-09 06:03:26 -05:00
c2c0481d90 Mention Email2Matrix usage alongside Postfix 2019-08-09 12:15:44 +03:00