Michael Telatynski
c74d890774
Merge branches 'develop' and 't3chguy/toasts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3
...
Conflicts:
src/@types/global.d.ts
src/components/structures/ToastContainer.tsx
2020-05-26 13:38:17 +01:00
Michael Telatynski
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
Michael Telatynski
efeb8a8487
Merge branches 'develop' and 't3chguy/toasts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3
2020-05-23 11:01:36 +01:00
RiotRobot
af59d3a094
Reset matrix-js-sdk back to develop branch
2020-05-22 14:14:09 +01:00
Michael Telatynski
dc37469808
Convert ToastContainer and ToastStore to Typescript
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-22 12:47:40 +01:00
Travis Ralston
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
RiotRobot
833eccf5cd
Reset matrix-js-sdk back to develop branch
2020-05-19 11:25:07 +01:00
RiotRobot
19e496cacc
Merge branch 'master' into develop
2020-05-19 11:23:16 +01:00
RiotRobot
406839e89a
Upgrade matrix-js-sdk to 6.1.0
2020-05-19 11:13:57 +01:00
Travis Ralston
38920e7f30
Merge branch 'develop' into travis/room-list-2
2020-05-18 23:23:59 -06:00
Travis Ralston
9aff2e836e
Merge pull request #4593 from matrix-org/travis/dispatcher-types
...
Convert the dispatcher to TypeScript
2020-05-18 23:22:32 -06:00
Michael Telatynski
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
Travis Ralston
798e7a1f86
Merge branch 'develop' into travis/dispatcher-types
2020-05-15 09:56:02 -06:00
Michael Telatynski
e79959a4ec
try fix tests
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-15 00:31:30 +01:00
Travis Ralston
2b4c19e9ba
Merge branch 'travis/dispatcher-types' into travis/room-list-2
2020-05-14 13:40:37 -06:00
Michael Telatynski
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
Travis Ralston
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
Travis Ralston
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
RiotRobot
d8003df24c
Upgrade matrix-js-sdk to 6.1.0-rc.1
2020-05-14 16:22:30 +01:00
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
RiotRobot
aa0c6f1f71
Reset matrix-js-sdk back to develop branch
2020-05-05 11:40:37 +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
b5cb912cfd
Upgrade matrix-js-sdk to 6.0.0-rc.2
2020-05-01 16:24:59 +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
86200812a5
Upgrade matrix-js-sdk to 5.3.1-rc.4
2020-04-23 15:49:21 +01: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
383915d5cc
Upgrade matrix-js-sdk to 5.3.1-rc.3
2020-04-17 17:46:55 +01:00
RiotRobot
c6746e68b2
Upgrade matrix-js-sdk to 5.3.1-rc.2
2020-04-16 19:56:11 +01:00
RiotRobot
5022eaf483
Upgrade matrix-js-sdk to 5.3.1-rc.1
2020-04-15 19:13:00 +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
c87d6c22df
yarn upgrade
2020-04-08 14:49:52 +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
RiotRobot
84da483264
Reset matrix-js-sdk back to develop branch
2020-04-01 15:00:05 +01:00
RiotRobot
78fd8e4569
Reset matrix-js-sdk back to develop branch
2020-03-30 13:42:52 +01:00
RiotRobot
d369695e22
Upgrade matrix-js-sdk to 5.2.0
2020-03-30 13:31:42 +01:00
RiotRobot
a1c83a4f0e
Upgrade matrix-js-sdk to 5.2.0-rc.1
2020-03-26 13:02:54 +00:00
Travis Ralston
94d23c815a
Improve naming of Jitsi conferences
...
Fixes https://github.com/vector-im/riot-web/issues/12812
2020-03-20 14:19:47 -06:00
Michael Telatynski
d593a76f28
Merge branches 'develop' and 't3chguy/kbd' of github.com:matrix-org/matrix-react-sdk into t3chguy/kbd
2020-03-18 20:41:13 +00:00
Michael Telatynski
cad28c81c0
Add Keyboard shortcuts dialog
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-18 16:40:21 +00:00
Michael Telatynski
42ee157645
Merge pull request #4217 from matrix-org/t3chguy/gemini
...
Remove Gemini Scrollbars
2020-03-18 14:03:51 +00:00
RiotRobot
b09c063d1b
Reset matrix-js-sdk back to develop branch
2020-03-17 14:25:44 +00:00
RiotRobot
8e8723bb36
Merge branch 'master' into develop
2020-03-17 14:24:35 +00:00