Commit graph

3344 commits

Author SHA1 Message Date
Michael Telatynski
1ba19e78f8 Merge branches 'develop' and 't3chguy/qrcode' of github.com:matrix-org/matrix-react-sdk into t3chguy/qrcode
 Conflicts:
	package.json
2020-05-14 10:50:42 +01:00
Travis Ralston
fa83df4bde Convert dispatcher to TypeScript and replace async usage with new class
Due to TypeScript and flux's types being annoying and highly typesafe, we need an AsyncActionPayload which intentionally doesn't use the 'action' property. This looks a bit awkward, though for the rare cases we do actually fire async actions it should be fine enough.

The call signature changes slightly for async events, therefore this commit also updates its usages for async events. 

The `fire()` function is to be used in a future commit.
Remove biased comment
2020-05-13 21:07:50 -06:00
Michael Telatynski
911bd2e469 Replace favico.js dependency with simplified variant grown from it
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-13 05:19:08 +01:00
Michael Telatynski
f4e21c3fc7 Remove electron_app as we now have riot-desktop repo
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-06 11:32:13 +01:00
RiotRobot
fb33b6082d Reset matrix-react-sdk back to develop branch 2020-05-05 11:41:33 +01:00
RiotRobot
99af02eecd Reset matrix-js-sdk back to develop branch 2020-05-05 11:41:11 +01:00
RiotRobot
aa0c6f1f71 Reset matrix-js-sdk back to develop branch 2020-05-05 11:40:37 +01:00
RiotRobot
d5d4b95fee Merge branch 'master' into develop 2020-05-05 11:39:12 +01:00
RiotRobot
3e13de3069 Upgrade matrix-react-sdk to 2.5.0 2020-05-05 11:31:28 +01:00
RiotRobot
cc192ab882 Upgrade matrix-js-sdk to 6.0.0 2020-05-05 11:30:41 +01:00
RiotRobot
338486b561 Merge branch 'master' into develop 2020-05-05 11:27:52 +01:00
RiotRobot
1423c2e4bc Upgrade matrix-js-sdk to 6.0.0 2020-05-05 11:04:24 +01:00
RiotRobot
1edfde3932 Upgrade matrix-react-sdk to 2.5.0-rc.6 2020-05-01 16:33:00 +01:00
RiotRobot
43879c410c Upgrade matrix-js-sdk to 6.0.0-rc.2 2020-05-01 16:32:34 +01:00
RiotRobot
b5cb912cfd Upgrade matrix-js-sdk to 6.0.0-rc.2 2020-05-01 16:24:59 +01:00
RiotRobot
3c7de2c08f Upgrade matrix-react-sdk to 2.5.0-rc.5 2020-04-30 11:34:11 +01:00
RiotRobot
ecc73905c1 Upgrade matrix-js-sdk to 6.0.0-rc.1 2020-04-30 11:33:23 +01:00
RiotRobot
5a29bf569d Upgrade matrix-js-sdk to 6.0.0-rc.1 2020-04-30 11:21:33 +01:00
Michael Telatynski
42a857cb5e Revert "Update emojibase for fixed emoji codepoints and Emoji 13 support"
(cherry picked from commit 972f9d354d)
2020-04-24 13:24:54 +01:00
Michael Telatynski
972f9d354d
Revert "Update emojibase for fixed emoji codepoints and Emoji 13 support" 2020-04-24 12:25:19 +01:00
RiotRobot
e7cb2e4022 Upgrade matrix-react-sdk to 2.5.0-rc.4 2020-04-23 15:58:10 +01:00
RiotRobot
7600571cf5 Upgrade matrix-js-sdk to 5.3.1-rc.4 2020-04-23 15:57:32 +01:00
RiotRobot
86200812a5 Upgrade matrix-js-sdk to 5.3.1-rc.4 2020-04-23 15:49:21 +01:00
Travis Ralston
3eadf35819 Manually undo emojibase changes in lockfile 2020-04-20 09:49:09 -06:00
Travis Ralston
a55698e943 Merge branch 'travis/moar-jitsi' into travis/addwidget-improvements 2020-04-20 09:22:38 -06:00
Michael Telatynski
3bc5a0a0b2 Convert submit-rageshake to typescript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-19 12:06:56 +01:00
RiotRobot
393d701ee9 Upgrade matrix-js-sdk to 5.3.1-rc.3 2020-04-17 17:58:52 +01:00
RiotRobot
ef5d1f421d Upgrade matrix-react-sdk to 2.5.0-rc.3 2020-04-17 17:57:33 +01:00
RiotRobot
383915d5cc Upgrade matrix-js-sdk to 5.3.1-rc.3 2020-04-17 17:46:55 +01:00
RiotRobot
6ca2f4c87d Upgrade matrix-react-sdk to 2.5.0-rc.2 2020-04-16 20:06:01 +01:00
RiotRobot
0c12630b89 Upgrade matrix-js-sdk to 5.3.1-rc.2 2020-04-16 20:04:19 +01:00
RiotRobot
c6746e68b2 Upgrade matrix-js-sdk to 5.3.1-rc.2 2020-04-16 19:56:11 +01:00
Travis Ralston
005269e2ad Make Jitsi download script a JS script
It's awful but means that we create the directory on all platforms in-process.

Fixes https://github.com/vector-im/riot-web/issues/13215
2020-04-16 12:37:41 -06:00
RiotRobot
2cd585cd6c Upgrade matrix-react-sdk to 2.5.0-rc.1 2020-04-15 19:24:18 +01:00
RiotRobot
0b32f7c87f Upgrade matrix-js-sdk to 5.3.1-rc.1 2020-04-15 19:22:38 +01:00
RiotRobot
5022eaf483 Upgrade matrix-js-sdk to 5.3.1-rc.1 2020-04-15 19:13:00 +01:00
RiotRobot
08ef4ff3b1 Merge branch 'release-v1.5.16' into release-v1.6.0 2020-04-15 19:08:28 +01:00
Travis Ralston
77bdde4021 Merge branch 'travis/moar-jitsi' into travis/addwidget-improvements 2020-04-14 12:58:16 -06:00
Michael Telatynski
4fc88d69a3 Remove unused react-addons-css-transition-group
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-12 01:04:54 +01:00
Michael Telatynski
237084da78 wrap node-qrcode in a React FC and use it for ShareDialog instead of qrcode-react
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-11 23:46:58 +01:00
Travis Ralston
0165ff0bc9 Allow iframes and Jitsi URLs in /addwidget
Fixes https://github.com/vector-im/riot-web/issues/12784
2020-04-09 16:03:40 -06:00
J. Ryan Stinnett
a1ef707065 yarn upgrade 2020-04-08 14:55:46 +01:00
J. Ryan Stinnett
c87d6c22df yarn upgrade 2020-04-08 14:49:52 +01:00
RiotRobot
48018b33cc Upgrade matrix-react-sdk to 2.4.0-rc.1 2020-04-08 14:06:02 +01:00
RiotRobot
83af795358 Upgrade matrix-js-sdk to 5.3.0-rc.1 2020-04-08 14:03:43 +01:00
Michael Telatynski
b647e35c48
Merge pull request #13049 from vector-im/t3chguy/default_home
Add new default home page fallback
2020-04-07 14:47:01 +01:00
Michael Telatynski
e58cd1f73a Add new default home page fallback
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-07 10:48:56 +01:00
Michael Telatynski
5ac68d4ce0 Update emojibase for fixed emoji codepoints and Emoji 13 support
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-06 11:10:00 +01:00
Michael Telatynski
b1575524aa Switch things to typescript, use @types/modernizr, fix global.d.ts. Move mobile_guide redirect to index.ts
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-05 00:55:36 +01:00
RiotRobot
cb8319ea2d Reset matrix-react-sdk back to develop branch 2020-04-01 15:35:13 +01:00