d8003df24c
Upgrade matrix-js-sdk to 6.1.0-rc.1
2020-05-14 16:22:30 +01:00
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
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
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
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
fb33b6082d
Reset matrix-react-sdk back to develop branch
2020-05-05 11:41:33 +01:00
99af02eecd
Reset matrix-js-sdk back to develop branch
2020-05-05 11:41:11 +01:00
aa0c6f1f71
Reset matrix-js-sdk back to develop branch
2020-05-05 11:40:37 +01:00
d5d4b95fee
Merge branch 'master' into develop
2020-05-05 11:39:12 +01:00
beda6c3b25
v1.6.0
2020-05-05 11:35:22 +01:00
3e13de3069
Upgrade matrix-react-sdk to 2.5.0
2020-05-05 11:31:28 +01:00
cc192ab882
Upgrade matrix-js-sdk to 6.0.0
2020-05-05 11:30:41 +01:00
338486b561
Merge branch 'master' into develop
2020-05-05 11:27:52 +01:00
854855a5aa
v2.5.0
2020-05-05 11:10:36 +01:00
1423c2e4bc
Upgrade matrix-js-sdk to 6.0.0
2020-05-05 11:04:24 +01:00
be76d2ef3c
v1.6.0-rc.6
2020-05-01 16:35:10 +01:00
1edfde3932
Upgrade matrix-react-sdk to 2.5.0-rc.6
2020-05-01 16:33:00 +01:00
43879c410c
Upgrade matrix-js-sdk to 6.0.0-rc.2
2020-05-01 16:32:34 +01:00
ccb6d91988
v2.5.0-rc.6
2020-05-01 16:30:10 +01:00
b5cb912cfd
Upgrade matrix-js-sdk to 6.0.0-rc.2
2020-05-01 16:24:59 +01:00
29df8a8a2e
v1.6.0-rc.5
2020-04-30 11:37:43 +01:00
3c7de2c08f
Upgrade matrix-react-sdk to 2.5.0-rc.5
2020-04-30 11:34:11 +01:00
ecc73905c1
Upgrade matrix-js-sdk to 6.0.0-rc.1
2020-04-30 11:33:23 +01:00
619fbd6adc
v2.5.0-rc.5
2020-04-30 11:30:14 +01:00
5a29bf569d
Upgrade matrix-js-sdk to 6.0.0-rc.1
2020-04-30 11:21:33 +01:00
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
972f9d354d
Revert "Update emojibase for fixed emoji codepoints and Emoji 13 support"
2020-04-24 12:25:19 +01:00
08f9018cd4
remove wasmMock.js
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-04-23 16:28:42 +01:00
15894ed8bd
mock out wasm imports in jest
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-04-23 16:04:20 +01:00
58b7bbd3d2
v1.6.0-rc.4
2020-04-23 16:00:41 +01:00
e7cb2e4022
Upgrade matrix-react-sdk to 2.5.0-rc.4
2020-04-23 15:58:10 +01:00
7600571cf5
Upgrade matrix-js-sdk to 5.3.1-rc.4
2020-04-23 15:57:32 +01:00
941709d19a
v2.5.0-rc.4
2020-04-23 15:55:37 +01:00
86200812a5
Upgrade matrix-js-sdk to 5.3.1-rc.4
2020-04-23 15:49:21 +01:00
6584ff29af
mock out scss imports for jest
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-04-22 18:58:44 +01:00
a55698e943
Merge branch 'travis/moar-jitsi' into travis/addwidget-improvements
2020-04-20 09:22:38 -06:00
3bc5a0a0b2
Convert submit-rageshake to typescript
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-04-19 12:06:56 +01:00
4e07c64790
v1.6.0-rc.3
2020-04-17 18:00:55 +01:00
393d701ee9
Upgrade matrix-js-sdk to 5.3.1-rc.3
2020-04-17 17:58:52 +01:00
ef5d1f421d
Upgrade matrix-react-sdk to 2.5.0-rc.3
2020-04-17 17:57:33 +01:00
1ee2d6f3a2
v2.5.0-rc.3
2020-04-17 17:51:49 +01:00
383915d5cc
Upgrade matrix-js-sdk to 5.3.1-rc.3
2020-04-17 17:46:55 +01:00
6d46ef548e
Enable tests again to catch failures
2020-04-16 16:26:29 -06:00
c71338852e
v1.6.0-rc.2
2020-04-16 20:09:16 +01:00
6ca2f4c87d
Upgrade matrix-react-sdk to 2.5.0-rc.2
2020-04-16 20:06:01 +01:00
0c12630b89
Upgrade matrix-js-sdk to 5.3.1-rc.2
2020-04-16 20:04:19 +01:00
23f167d681
v2.5.0-rc.2
2020-04-16 20:01:46 +01:00
c6746e68b2
Upgrade matrix-js-sdk to 5.3.1-rc.2
2020-04-16 19:56:11 +01:00
c3f90ed289
Short-circuit all end to end tests
2020-04-16 12:42:42 -06:00
1deece3fb5
Short-circuit all end to end tests
2020-04-16 12:41:48 -06:00
RiotRobot
Michael Telatynski
Travis Ralston
Michael Telatynski