264ca1ecba
Merge pull request #3850 from matrix-org/zip/11225-shields-distinguish-encrypt-from-verify
...
Room header & message box shields now reflect cross-signing state
2020-01-17 13:49:59 +00:00
908630c0d9
*rude grumbling noises about @dbkr*
2020-01-17 11:30:45 +00:00
d02185e4af
whoops, the number of unverified users matters to the logic
2020-01-17 10:22:53 +00:00
510b08c88b
changed logic to reflect the task
2020-01-17 10:18:50 +00:00
8efc45b31a
no need to verify our own devices for every room
2020-01-17 10:04:34 +00:00
83b1505401
Add a ToastStore
...
To store toast. Rather than them being stored in the state of the
ToastContainer component, they now have a dedicated store. This mostly
fixes problems involving showing toasts when the app loaded because
we would otherwise have a race condition where something tries to
show a toast before the ToastContainer is mounted.
2020-01-16 20:23:47 +00:00
82c5349c4e
Updated to properly handle logic
2020-01-16 16:31:50 +00:00
5926e277c4
Avoid logged in event race
2020-01-16 11:52:02 +00:00
9ac3cb6fd0
Merge remote-tracking branch 'origin/develop' into zip/11225-shields-distinguish-encrypt-from-verify
2020-01-16 11:23:57 +00:00
ff05041a5a
Update room shield icons to represent encrypted but unverified chats in less alarmed tones
2020-01-16 11:10:23 +00:00
71fa3222fe
Fix component index import
...
Co-Authored-By: Travis Ralston <travpc@gmail.com >
2020-01-15 22:11:22 +00:00
6e027badc0
Tweak comparison
...
Co-Authored-By: Travis Ralston <travpc@gmail.com >
2020-01-15 22:10:59 +00:00
27ee90cad5
Add post-login complete security flow
...
This adds a step after login to complete security for your new session. At the
moment, the only verification method is entering your SSSS passphrase, but nicer
paths will be added soon.
This new step only appears when crypto is available and the account has
cross-signing enabled in SSSS.
Fixes https://github.com/vector-im/riot-web/issues/11214
2020-01-15 21:53:36 +00:00
7bfb3686cd
Merge pull request #3839 from matrix-org/travis/sourcemaps
...
Fix sourcemaps by refactoring the build system
2020-01-15 10:11:33 -07:00
fa174512cc
Merge pull request #3837 from matrix-org/dbkr/dont_error_on_unknown_devices
...
Don't error on unverified/unknown devices.
2020-01-14 17:12:14 +00:00
90c7535a69
Export VIEWS from MatrixChat for riot-web tests
2020-01-13 20:15:58 -07:00
14501b748b
lint again
2020-01-13 21:58:26 +00:00
9a1be1a24d
Don't try to set crypto options without crypto enabled
2020-01-13 21:54:14 +00:00
bf6798e109
Appease the linter
2020-01-13 13:28:33 -07:00
5fd27a10bb
Merge branch 'develop' into travis/sourcemaps
2020-01-13 11:19:41 -07:00
e47240d838
Lint Eastwood
2020-01-13 17:56:40 +00:00
76fe87c941
Don't error on unverifie/unknownd devices.
...
When cross-signing is enabled, we no longer want to fail and
prompt the user to ack every device in the room. All the info should
be conveyed in the shield colour (although isn't fully just yet).
Fixes https://github.com/vector-im/riot-web/issues/11750
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1150
2020-01-13 17:41:58 +00:00
66b55495bb
Fix right panel buttons highlighting
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-01-13 12:40:45 +00:00
9c686bf501
Fix right panel buttons highlighting
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-01-13 12:15:54 +00:00
63942d5200
Fix listener leak on RoomView
...
It looks like this was causing entire detached DOM trees to leak
in memory by react's internal fibers holding onto them from the
component.
2020-01-10 11:12:52 +00:00
727ce892de
Fix remaining RoomView conflict
...
RoomContext was pulled out to its own file.
2020-01-09 14:17:33 -07:00
3e5cc9550b
Fix import merge conflicts, removing any that aren't needed anymore
...
Many imports were removed as part of refactoring work, so here we are.
2020-01-09 14:17:33 -07:00
fde32f13a5
[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop
2020-01-09 14:15:09 -07:00
d31c863563
Remove all usages of slate in favour of CIDER
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-01-06 00:15:48 +00:00
9edc361afc
Use new imports for js-sdk's ContentRepo
...
Per https://github.com/matrix-org/matrix-js-sdk/pull/1134/commits/f4d1c5c006027962cd18dffb3f7c521d9e24e831
2020-01-03 12:29:22 -07:00
c88efa5c2c
Merge pull request #3778 from bit/master
...
support channel names with slash in name/alias
2020-01-02 09:19:02 -07:00
9eed423994
support channel names with slash in name/alias
...
Signed-off-by: Jan Gerber <j@mailb.org >
2019-12-29 12:10:31 +01:00
e9ebfa100f
Do not show Top Unread Messages Bar and Jump to bottom button if searching
2019-12-26 20:32:25 +00:00
92ea1157be
Reintroduce working resizer code for right panel
...
Fixes https://github.com/vector-im/riot-web/issues/11674
This re-introduces and adapted version of what was there before, but fixed for the new collapsed logic: https://github.com/matrix-org/matrix-react-sdk/pull/3703/files#diff-633a0248e235d7446a8868a9145efce2L77-L93
We no longer have a collapsedRhs variable and only set the panel when it is opened, so we can accurately track expanded/collapsed state through presence of a panel.
2019-12-23 19:26:59 -07:00
6e9791c950
Merge pull request #3755 from matrix-org/t3chguy/tags_changes
...
Apply new design to highlighted tags and add toggle mechanic
2019-12-23 17:18:07 +00:00
1098fc939a
Merge pull request #3771 from matrix-org/t3chguy/ReactDOM.findDOMNode
...
stop using ReactDOM.findDOMNode in componentWillUnmount, use refs
2019-12-23 17:16:47 +00:00
17f5849985
stop using ReactDOM.findDOMNode in componentWillUnmount, use refs
2019-12-23 12:24:49 +00:00
661701f7ca
Merge branches 'develop' and 't3chguy/tags_changes' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/tags_changes
...
Conflicts:
src/components/views/elements/TagTile.js
2019-12-23 11:00:42 +00:00
615648af13
Fix tabbed view export for component index
2019-12-22 21:23:14 -07:00
0d2cb6e731
Import haveTileForEvent() from the right place
2019-12-22 21:23:07 -07:00
d002c2ccde
Merge branch 'travis/babel7-wp-es6-export' into travis/sourcemaps-es6
2019-12-22 21:20:13 -07:00
f1ac3d2f64
Convert imports to ES6 from CommonJS
...
This is needed because `require()` means something different in webpack - it ends up importing the module as something we didn't expect (and is occasionally async)
2019-12-22 21:16:06 -07:00
042bd35d79
Fix MatrixClientPeg imports
2019-12-22 21:15:54 -07:00
d56f0f2a25
Convert many imports to handle ES6 exports
...
Reliant upon https://github.com/matrix-org/matrix-react-sdk/pull/3761
2019-12-22 21:04:42 -07:00
4aec432b30
Convert the more complicated CommonJS exports to ES6-style
2019-12-22 21:01:03 -07:00
344dac4fb9
Convert CommonJS exports to ES6-compatible exports
...
We use `export default` begrudgingly here. Ideally we'd use just `export`, though this entire SDK expects things to be exported as a default. Instead of breaking everything, we'll sacrifice our export pattern for a smaller diff - a later commit can always do the default export -> regular export conversion.
2019-12-22 21:01:02 -07:00
3a36d61fab
delint
2019-12-19 21:10:22 +00:00
d9ea9b4ad3
Iterate to match design on Zeplin
2019-12-19 20:53:34 +00:00
24d0d0d596
Merge pull request #3743 from matrix-org/t3chguy/react16_contexts
...
Migrate away from React Legacy contexts API
2019-12-19 20:32:11 +00:00
b2249d0561
Initial rejig
2019-12-19 20:09:05 +00:00
Zoe