Commit Graph

413 Commits

Author SHA1 Message Date
Travis Ralston
3dad15de72 Fix bad merge 2018-10-20 13:51:05 -06:00
Travis Ralston
2416718065 Merge remote-tracking branch 'origin/master' into travis/webhooks2 2018-10-20 13:19:45 -06:00
Travis Ralston
570348fabf
Merge pull request #216 from turt2live/travis/telegram
Basic Telegram bridging support
2018-10-20 13:17:49 -06:00
Travis Ralston
93b532de44 Add backend support for the webhooks bridge 2018-10-19 21:13:57 -06:00
Travis Ralston
5f0e9fec51 Fix rooms claiming they are bridged when they aren't 2018-10-19 19:34:11 -06:00
Travis Ralston
a0467c46e2 Merge branch 'master' into travis/telegram 2018-10-17 22:13:36 -06:00
Travis Ralston
235d8051fe Package updates 2018-10-17 22:11:40 -06:00
Travis Ralston
c5e887bfd0 Linting 2018-10-17 21:51:18 -06:00
Travis Ralston
83c06c8591 Warn the user when they try to bridge chats that are already bridged 2018-10-17 21:37:29 -06:00
Travis Ralston
c0936745c0 Frontend interface for basic bridging and unbridging of chats
Requires https://github.com/tulir/mautrix-telegram/pull/235

Puppeting is scheduled to be handled in https://github.com/turt2live/matrix-dimension/issues/214

The TODO comments about asking for unbridge/permission denied will be handled in a later commit.
2018-10-17 21:09:19 -06:00
Travis Ralston
b7ba9d2c8d Add a log statement when a toWidget request comes in 2018-10-17 19:53:46 -06:00
Andrew Morgan
c811b273dd Jitsi widget supports audio toggling programmatically 2018-10-18 01:46:29 +02:00
Travis Ralston
1c4b38b53a
Merge pull request #213 from anoadragon453/patch-3
Make things clearer
2018-10-17 17:36:54 -06:00
Andrew Morgan
7a74663296
Make things clearer 2018-10-18 01:31:34 +02:00
Travis Ralston
e9e0af5292
Merge pull request #212 from anoadragon453/patch-2
Deps before running
2018-10-17 16:53:47 -06:00
Andrew Morgan
528bdff910
Deps before running 2018-10-18 00:48:26 +02:00
Travis Ralston
d5707404d6
Merge pull request #211 from anoadragon453/patch-1
npm install is needed to grab deps
2018-10-17 15:38:18 -06:00
Andrew Morgan
30831b2367 Add install command to DEVELOPMENT 2018-10-17 23:21:44 +02:00
Andrew Morgan
3860ea5070
npm install is needed to grab deps 2018-10-17 23:07:47 +02:00
Travis Ralston
0b39168503
Merge pull request #210 from turt2live/imgbot
[ImgBot] optimizes images
2018-10-08 23:24:34 -06:00
ImgBotApp
532bf6747a
[ImgBot] optimizes images
*Total -- 162.56kb -> 132.63kb (18.41%)

/web/public/img/infrastructure.png -- 13.02kb -> 4.94kb (62.07%)
/web/public/img/avatars/github.png -- 4.73kb -> 2.62kb (44.71%)
/web/public/img/avatars/circleci.png -- 4.38kb -> 2.43kb (44.48%)
/web/public/img/avatars/twitch.png -- 3.76kb -> 2.12kb (43.61%)
/web/public/img/avatars/irc.png -- 3.56kb -> 2.11kb (40.88%)
/web/public/img/logo/banner-sm.png -- 3.55kb -> 2.37kb (33.34%)
/web/public/img/avatars/rssbot.png -- 5.63kb -> 4.33kb (23.1%)
/web/public/img/avatars/youtube.png -- 3.61kb -> 2.82kb (21.98%)
/web/public/img/avatars/echo.png -- 4.40kb -> 3.45kb (21.57%)
/web/public/img/avatars/etherpad.png -- 6.90kb -> 5.46kb (20.93%)
/web/public/img/avatars/jira.png -- 4.10kb -> 3.25kb (20.82%)
/web/public/img/avatars/imgur.png -- 3.44kb -> 2.76kb (19.85%)
/web/public/img/avatars/customwidget.png -- 10.98kb -> 9.85kb (10.26%)
/web/public/img/logo/favicon/android-chrome-512x512.png -- 7.42kb -> 6.69kb (9.8%)
/web/public/img/avatars/google.png -- 5.70kb -> 5.19kb (9.04%)
/web/public/img/avatars/travisci.png -- 19.72kb -> 18.21kb (7.68%)
/web/public/img/avatars/wikipedia.png -- 19.33kb -> 17.86kb (7.6%)
/web/public/img/avatars/jitsi.png -- 9.18kb -> 8.54kb (7.04%)
/web/public/img/avatars/guggy.png -- 8.89kb -> 8.30kb (6.57%)
/web/public/img/avatars/giphy.png -- 3.18kb -> 2.98kb (6.39%)
/web/public/img/avatars/googlecalendar.png -- 5.44kb -> 5.16kb (5.08%)
/web/public/img/avatars/googledocs.png -- 5.07kb -> 4.82kb (4.97%)
/web/public/img/logo/favicon/mstile-150x150.png -- 2.06kb -> 1.98kb (3.85%)
/web/public/img/logo/favicon/android-chrome-192x192.png -- 2.33kb -> 2.26kb (3.02%)
/web/public/img/logo/favicon/apple-touch-icon.png -- 2.17kb -> 2.16kb (0.81%)
2018-10-09 05:20:10 +00:00
Travis Ralston
242ad3bf3a Admin interface for managing Telegram bridges
Currently only one bridge is supported at a time, however in the future we may wish to load balance between bridges or something.
2018-09-16 02:26:10 -06:00
Travis Ralston
c5247ddc0b Support appservice r0 spec 2018-09-16 02:25:17 -06:00
Travis Ralston
cd655cbc26 Make the Dockerfile safe for Windows 2018-09-16 02:25:05 -06:00
Travis Ralston
60da1fc4db Merge branch 'travis/security' 2018-09-09 09:58:25 -06:00
Travis Ralston
edbeeb4e85 Security: Ensure the OpenID subject matches the homeserver 2018-09-08 12:51:08 -06:00
Travis Ralston
2eaa78c1c7 Up the default request limit size
For larger transactions
2018-08-13 20:44:57 -06:00
Travis Ralston
6b21ac4443 Support always on screen Jitsi widgets
Fixes #202
2018-07-30 21:55:57 -06:00
Travis Ralston
a706f29f44 Document Riot 0.16's new config.json parameter 2018-07-30 21:55:27 -06:00
Travis Ralston
339f6a7c60 Fix background color on jitsi widget 2018-07-30 21:53:56 -06:00
Travis Ralston
28b3670696 Override the database path in Docker containers 2018-07-21 09:20:47 -06:00
Travis Ralston
ce512ed47d Upgrade sqlite
Fixes #189. Fixes #206.
2018-07-20 18:30:12 -06:00
Travis Ralston
f6b05949e1 Add a dockerignore and README instruction for Docker 2018-07-20 18:30:08 -06:00
Travis Ralston
66bbda6b8e
Merge pull request #205 from mvgorcum/master
Addition of a dockerfile
2018-07-20 18:29:52 -06:00
Mathijs van Gorcum
734f985b0e
Add upstream URL 2018-07-20 01:20:43 +02:00
Mathijs van Gorcum
54087bdf83
no need to install git 2018-07-19 23:21:37 +02:00
Mathijs van Gorcum
8d4488be72 add docker file 2018-07-19 20:57:07 +02:00
Travis Ralston
f773b7a3ae
Merge pull request #201 from leprasmurf/systemd_integration
Systemd service file and accompanying integration notes.
2018-06-28 16:05:36 -06:00
Travis Ralston
53634853cb
Make the markdown processor happier 2018-06-28 16:01:14 -06:00
Tim Forbes
25be87f949 Systemd service file and accompanying integration notes. 2018-06-28 17:32:24 -04:00
Travis Ralston
8f125f3ba6 Add the official Loading Artist sticker pack 2018-06-19 08:32:40 -06:00
Travis Ralston
7f446c7b9c Move the author information to below the pack name 2018-06-17 12:10:58 -06:00
Travis Ralston
c89bb6df5e
Only declare NodeJS 8 as the supported version
Related: https://github.com/turt2live/matrix-dimension/issues/194
2018-06-08 08:41:40 -06:00
Travis Ralston
31c565abc9 Make sure the auth error message is shown 2018-05-20 18:25:37 -06:00
Travis Ralston
a249d6dd68 Revert "Change the authorization flow for the sticker picker"
This reverts commit f28f817ca2.
2018-05-20 18:24:24 -06:00
Travis Ralston
11772f54e7 Make the app blend in less with the Riot light theme
Fixes #188.
2018-05-20 18:16:13 -06:00
Travis Ralston
f468226148 Add target=_blank to licenses in the sticker picker
Fixes #187
2018-05-20 17:44:20 -06:00
Travis Ralston
d750530a2e Add a temporary notice that there's no sticker packs
This obviously needs improving, and CSS. This will work for now though. Part of #186
2018-05-20 17:43:09 -06:00
Travis Ralston
f28f817ca2 Change the authorization flow for the sticker picker
This probably still needs to be reviewed though.
2018-05-20 17:41:06 -06:00
Travis Ralston
ad3c0d7f11 Appease the linter 2018-05-13 22:41:19 -06:00