880e16aaa2
Merge branches 'develop' and 't3chguy/leaks' of github.com:matrix-org/matrix-react-sdk into t3chguy/leaks
...
Conflicts:
src/components/views/avatars/BaseAvatar.js
test/components/views/messages/TextualBody-test.js
2020-05-23 11:12:58 +01:00
5ec8459468
Merge branch 'master' into develop
2020-05-22 14:13:01 +01:00
5a4da13e86
v2.6.1
2020-05-22 14:00:29 +01:00
7ff850deea
Merge pull request #4253 from matrix-org/travis/room-list-2
...
Rewrite the room list store
2020-05-21 13:30:32 -06:00
833eccf5cd
Reset matrix-js-sdk back to develop branch
2020-05-19 11:25:07 +01:00
19e496cacc
Merge branch 'master' into develop
2020-05-19 11:23:16 +01:00
26e6447be5
v2.6.0
2020-05-19 11:22:00 +01:00
406839e89a
Upgrade matrix-js-sdk to 6.1.0
2020-05-19 11:13:57 +01:00
38920e7f30
Merge branch 'develop' into travis/room-list-2
2020-05-18 23:23:59 -06:00
9aff2e836e
Merge pull request #4593 from matrix-org/travis/dispatcher-types
...
Convert the dispatcher to TypeScript
2020-05-18 23:22:32 -06:00
1eea203db6
Merge pull request #4599 from matrix-org/t3chguy/progress_colour
...
Consolidate password/passphrase fields into a component & add dynamic colour to progress
2020-05-18 11:08:08 +01:00
798e7a1f86
Merge branch 'develop' into travis/dispatcher-types
2020-05-15 09:56:02 -06:00
59f1657b43
Add jest-canvas-mock
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-15 00:25:19 +01:00
cf3c4d9e5f
Extract Password field from Registration into a reusable component
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-14 20:20:36 +01:00
861268d39f
Invent an AsyncStore and use it for room lists
...
This is to get around the problem of a slow dispatch loop. Instead of slowing the whole app down to deal with room lists, we'll just raise events to say we're ready.
Based upon the EventEmitter class.
2020-05-14 12:44:29 -06:00
08419d195e
Initial breakout for room list rewrite
...
This does a number of things (sorry):
* Estimates the type changes needed to the dispatcher (later to be replaced by https://github.com/matrix-org/matrix-react-sdk/pull/4593 )
* Sets up the stack for a whole new room list store, and later components for usage.
* Create a proxy class to ensure the app still functions as expected when the various stores are enabled/disabled
* Demonstrates a possible structure for algorithms
2020-05-14 12:44:29 -06:00
81174b5f55
v2.6.0-rc.1
2020-05-14 16:30:17 +01:00
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
aa0c6f1f71
Reset matrix-js-sdk back to develop branch
2020-05-05 11:40:37 +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
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
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
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
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
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
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
6ee09cd688
v2.5.0-rc.1
2020-04-15 19:18:45 +01:00
5022eaf483
Upgrade matrix-js-sdk to 5.3.1-rc.1
2020-04-15 19:13:00 +01:00
a054ea0653
Merge branch 'release-v2.4.0' into release-v2.5.0
2020-04-15 19:07:11 +01:00
77bdde4021
Merge branch 'travis/moar-jitsi' into travis/addwidget-improvements
2020-04-14 12:58:16 -06:00
4fc88d69a3
Remove unused react-addons-css-transition-group
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-12 01:04:54 +01:00
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
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
0d1b7b9963
v2.4.0-rc.1
2020-04-08 13:59:23 +01:00
6095a00703
Upgrade matrix-js-sdk to 5.3.0-rc.1
2020-04-08 13:52:46 +01:00
Michael Telatynski