cc9c5cabb3
adapt encryption info to self-verification
...
- hide text when shown in a dialog
- adapt "waiting for ... to accept" text to self-verif
2020-04-02 17:51:25 +02:00
081baa2359
set dialog title for self-verification
...
use request.isSelfVerification helper
2020-04-02 17:51:06 +02:00
009941a6ac
Merge branch 'bwindels/qr-reciprocate' into bwindels/selfverifux
2020-04-02 16:57:44 +02:00
fffd5a4a5e
fix stylelint
2020-04-02 16:46:29 +02:00
1baaafe7b9
some comments to explain the mess
2020-04-02 16:44:42 +02:00
0307361fa2
more polish for self-verification
2020-04-02 16:42:39 +02:00
9944ce71b6
Merge pull request #4337 from matrix-org/dbkr/fix_inhibit_login_case
...
Fix spurious extra devices on registration
2020-04-02 15:29:55 +01:00
705fd57a4b
Fix spurious extra devices on registration
...
We send a parameter to prevent being immediately logged in after
registration, but we regressed it from snake case to camelcase
during the course of cross-signing dev.
Fixes https://github.com/vector-im/riot-web/issues/12865
2020-04-02 15:09:33 +01:00
31ca52dede
fix stylelint
2020-04-02 13:44:19 +02:00
1f65cfb7f6
polish design and disable buttons after click
2020-04-02 13:44:19 +02:00
ccf6c9efdc
fixup: more i18n
2020-04-02 13:44:19 +02:00
a4f448d4ca
update i18n
2020-04-02 13:44:19 +02:00
119fd2f519
fixup: these are actually on the verifier
2020-04-02 13:44:19 +02:00
fd04f248c4
fix proptype typo
2020-04-02 13:44:19 +02:00
00b1afe0fa
first go at reciprocate UX
2020-04-02 13:44:19 +02:00
1353ddaa96
move qr code data generation to js-sdk
2020-04-02 13:41:19 +02:00
5cce31b39e
Merge pull request #4333 from matrix-org/dbkr/fix_edit_composer
...
Fix the edit messager composer
2020-04-02 11:59:51 +01:00
74186740ee
Fix the edit messager composer
...
Broken in https://github.com/matrix-org/matrix-react-sdk/pull/4313
Fixes https://github.com/vector-im/riot-web/issues/13001
2020-04-02 11:30:43 +01:00
6db51cf9aa
Merge pull request #4321 from matrix-org/t3chguy/room_settings_notif_icon
...
Fix Room Settings Dialog Notifications tab icon
2020-04-02 09:50:57 +01:00
f7fa86f3ac
Merge pull request #4331 from matrix-org/travis/react-warnings/5-misc-cases
...
Fix various cases of React warnings by silencing them
2020-04-01 18:56:38 -06:00
9ff587520c
Merge pull request #4332 from matrix-org/t3chguy/userinfo_regression
...
Only apply padding to standard textual buttons (kind buttons)
2020-04-02 00:50:51 +01:00
faa4f54c97
Only apply padding to standard textual buttons (kind buttons)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-02 00:12:48 +01:00
c5cf04f6d2
More appeasing of the linter
2020-04-01 16:25:59 -06:00
8e405dda2e
Fix soft crash when editing message
...
Fixes https://github.com/matrix-org/riot-web-rageshakes/issues/2504
2020-04-01 16:22:42 -06:00
31ec984c86
Actually appease the linter
2020-04-01 14:49:39 -06:00
5c2841323e
Appease the linter by turning it off
2020-04-01 14:45:54 -06:00
f2c41a5da7
Silence another console.warn that should have been a log
2020-04-01 14:40:51 -06:00
47e5cfecf2
Silence usages of componentWillReceiveProps
...
For https://github.com/vector-im/riot-web/issues/12877
2020-04-01 14:35:39 -06:00
ab6bd4104f
Flag componentWillUpdate as UNSAFE in MatrixChat
...
For https://github.com/vector-im/riot-web/issues/12877
2020-04-01 14:32:35 -06:00
0bb8973ee6
Move rendering of PersistedElements into other lifecycle stages
...
For https://github.com/vector-im/riot-web/issues/12877
Original error:
```
Warning: Render methods should be a pure function of props and state; triggering nested component updates from render is not allowed. If necessary, trigger nested updates in componentDidUpdate.
Check the render method of PersistedElement.
in PersistedElement (created by AppTile)
in div (created by AppTile)
in div (created by AppTile)
in AppTile (created by AppsDrawer)
in div (created by AppsDrawer)
in div (created by AppsDrawer)
in AppsDrawer (created by AuxPanel)
in div (created by AutoHideScrollbar)
in AutoHideScrollbar (created by AuxPanel)
in AuxPanel (created by RoomView)
in div (created by RoomView)
in div (created by MainSplit)
in MainSplit (created by RoomView)
in ErrorBoundary (created by RoomView)
in main (created by RoomView)
in RoomView (created by LoggedInView)
in div (created by LoggedInView)
in DragDropContext (created by LoggedInView)
in div (created by LoggedInView)
in LoggedInView (created by MatrixChat)
in ErrorBoundary (created by MatrixChat)
in MatrixChat
```
2020-04-01 14:30:57 -06:00
05b58dc81d
Merge pull request #4330 from matrix-org/travis/react-warnings/4-false-positives
...
Use console.log in place of console.warn for less warnings
2020-04-01 14:14:51 -06:00
9e14e2d77b
Merge pull request #4329 from matrix-org/travis/fix-breadcrumbs
...
Revert componentDidMount changes on breadcrumbs
2020-04-01 14:13:39 -06:00
8680e50dd1
Merge pull request #4309 from matrix-org/uhoreg/check_sssss_passphrase
...
Use new method for checking secret storage key
2020-04-01 16:02:06 -04:00
ba0a9c8439
Use console.log in place of console.warn for less warnings
...
These aren't react warnings, but they are distracting in the logs.
2020-04-01 13:59:48 -06:00
620c2effda
Appease the linter by turning it off
2020-04-01 13:52:49 -06:00
e741d0d577
Revert componentDidMount changes on breadcrumbs
...
Fixes https://github.com/vector-im/riot-web/issues/12990
Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/4313
2020-04-01 13:41:24 -06:00
c0ffa8b59a
Fix merge conflict between react warnings and SSO
2020-04-01 11:32:13 -06:00
36ccb7e752
Merge pull request #4315 from matrix-org/travis/react-warnings/3-componentCannotDidMount
...
Label and use UNSAFE_componentWillMount to minimize warnings
2020-04-01 11:14:26 -06:00
07030a9466
Merge branch 'develop' into travis/react-warnings/3-componentCannotDidMount
2020-04-01 11:14:19 -06:00
0fcbe40bec
Merge pull request #4314 from matrix-org/travis/react-warnings/2-code-quality
...
Fix a number of minor code quality issues
2020-04-01 11:13:46 -06:00
59a99bbad8
Merge pull request #4313 from matrix-org/travis/react-warnings/1-componentDidMount
...
Use componentDidMount in place of componentWillMount where possible
2020-04-01 11:13:04 -06:00
8f04746e4e
Revert to UNSAFE_componentWillMount where componentDidMount will not work
2020-04-01 11:05:49 -06:00
47ee7e6ec2
Merge branch 'poljar/eventindex-initial-full-crawl' into develop
2020-04-01 18:52:35 +02:00
544bd09667
Merge pull request #4320 from matrix-org/t3chguy/user_info_buttons
...
Fix UserInfo e2e buttons to match Figma
2020-04-01 17:47:05 +01:00
7143c91d16
Merge pull request #4316 from matrix-org/t3chguy/room-tile-auto-scroll
...
Only auto-scroll to RoomTile when clicking on RoomTile or via shortcuts
2020-04-01 17:46:41 +01:00
094d006928
Merge pull request #4292 from matrix-org/travis/sso-uia
...
Support SSO for interactive authentication
2020-04-01 10:27:24 -06:00
138d280e4e
Merge pull request #4328 from matrix-org/t3chguy/slashcommands
...
fix /invite Slash Command
2020-04-01 17:02:47 +01:00
8736867dcf
fix /invite Slash Command
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 16:53:25 +01:00
84da483264
Reset matrix-js-sdk back to develop branch
2020-04-01 15:00:05 +01:00
d8d48275c3
Merge branch 'master' into develop
2020-04-01 14:59:01 +01:00
Bruno Windels