7efa9ba77d
Fix DOM nesting error in cross-signing panel
...
The spinner can't be inside a `<p>` element. This also changes to block spinner
to match key backup.
2020-09-03 13:23:50 +01:00
24006588d5
iterate PR
2020-09-03 10:34:19 +01:00
03588f8450
Merge pull request #5161 from matrix-org/travis/communities/proto/userinfo
...
Communities v2 prototype: "In community" view
2020-09-02 10:50:07 -06:00
8484422c55
Merge pull request #5165 from matrix-org/t3chguy/fix/15080
...
Respect user preference for whether pills should have an avatar or not
2020-09-02 17:45:34 +01:00
6d62d85ad2
Merge branch 'develop' into travis/communities/proto/userinfo
2020-09-02 10:33:52 -06:00
c849f56458
Merge pull request #5153 from matrix-org/travis/copy2
...
Communities v2 prototype: DM copy updates
2020-09-02 10:26:56 -06:00
beb77799f6
Respect user preference for whether pills should have an avatar or not
2020-09-02 17:26:23 +01:00
9b12355b2a
Appease the linter
2020-09-02 08:59:24 -06:00
129b9459a3
Merge pull request #5164 from matrix-org/jryans/cross-signing-verif-errors
...
Only wait for public keys during verification
2020-09-02 15:07:34 +01:00
4262a99f67
Tune cross-signing toasts when 4S is missing
...
For the case where cross-signing is trusted on device but secret storage does
not exist, we were showing "verify this device", which is not the best match
from the existing toasts. This tunes the checks to instead show "set up
encryption" which is at least a bit closer.
Part of https://github.com/vector-im/element-web/issues/14970
2020-09-02 14:29:41 +01:00
dd87e9a2f1
During verification, only check user trust status
...
As part of new device verification, we were waiting for "cross-signing ready"
which means _both_ the public keys are trusted by this device _and_ private keys
are available. There's no guarantee that the private keys will ever arrive, so
it's too strict to wait for this as a blocking flow. This relaxes things to wait
only for the current device to trust public keys.
Fixes https://github.com/vector-im/element-web/issues/14970
2020-09-02 14:13:36 +01:00
cffe902504
Add feature to ResizeNotifier to maintain isResizing state and use it to skip onScroll handling
2020-09-02 12:00:35 +01:00
6178b3c0e2
Wire up resizeNotifier
2020-09-02 11:13:00 +01:00
243af3c9f2
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785
2020-09-02 09:27:06 +01:00
92c184385c
Merge branch 'develop' into travis/communities/proto/userinfo
2020-09-01 10:51:42 -06:00
afec470ec3
Merge branch 'develop' into travis/copy2
2020-09-01 10:50:58 -06:00
0d290c9bd2
Reset matrix-js-sdk back to develop branch
2020-09-01 17:39:09 +01:00
52691a1a42
Merge branch 'master' into develop
2020-09-01 17:38:21 +01:00
9df5371dca
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop
2020-09-01 17:37:52 +01:00
d1d823dcc7
v3.3.0
2020-09-01 17:36:21 +01:00
69e5ed56ae
Prepare changelog for v3.3.0
2020-09-01 17:36:20 +01:00
bb248670a6
Upgrade matrix-js-sdk to 8.2.0
2020-09-01 17:02:49 +01:00
7c4a84aae0
Merge pull request #5155 from matrix-org/t3chguy/lint-ts
...
Fix eslint ts override tsx matching and delint
2020-09-01 16:44:22 +01:00
d668f8018b
undo some delint
2020-09-01 15:59:19 +01:00
6c39213116
remove unused class TextHighlighter
2020-09-01 15:37:07 +01:00
a13cc0ce6a
Merge pull request #5159 from matrix-org/t3chguy/react-err
...
Fix react error about functional components can't take refs
2020-09-01 09:13:42 +01:00
3b68da5f42
Merge pull request #5156 from matrix-org/t3chguy/crc
...
Remove redundant components and devDependencies
2020-09-01 09:12:46 +01:00
842821b038
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/lodash
2020-09-01 09:09:50 +01:00
656a815991
delint some more
2020-09-01 09:07:46 +01:00
78d5b87fbc
Use a different border variable for compatibility with custom themes
2020-08-31 11:20:28 -06:00
b4f62e9c88
use valid jsdoc
2020-08-31 11:07:29 -06:00
29089821f4
Merge branch 'develop' into travis/copy2
2020-08-31 11:03:01 -06:00
7f7414ed5a
Appease the linter
2020-08-31 10:59:37 -06:00
fdbaddbace
Add a simple edit dialog for communities
2020-08-31 10:52:08 -06:00
133f981fa8
Run the tag selection behaviour through the prototype store too
2020-08-31 10:22:29 -06:00
724e3f6905
Run all selected prototype community logic through one store
2020-08-31 10:19:05 -06:00
93d67a6689
Wire up members button to member view
...
Ideally this would open up the group members panel, but that's exceedingly difficult. Instead, we switch to the general chat and rename the button to be a bit more helpful.
2020-08-31 10:12:12 -06:00
8cae2fa0aa
update translations with new command string
2020-08-30 15:17:21 +09:00
3c5eb1f42c
fix Registration Form
2020-08-29 18:28:15 +01:00
da97d8885b
Fix react error about functional components can't take props
2020-08-29 13:51:43 +01:00
85f2f46d13
fix tests
2020-08-29 13:38:28 +01:00
646c9f1a83
Fix this contexts
2020-08-29 13:19:05 +01:00
c120458b81
fix test stub
2020-08-29 13:02:45 +01:00
517dee413e
Delint
2020-08-29 12:57:11 +01:00
78812b6f85
Fix some stuff
2020-08-29 12:53:04 +01:00
bc9ea04118
add lenny face command
2020-08-29 20:29:43 +09:00
34b960d8cb
fix naming conflict
2020-08-29 12:17:50 +01:00
e2ec89c39d
Merge branch 't3chguy/crc' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/crc1
2020-08-29 12:16:54 +01:00
ac9108a9a6
i18n
2020-08-29 12:16:14 +01:00
72498df28f
Remove create-react-class
2020-08-29 12:14:16 +01:00
J. Ryan Stinnett