c4b7e3866f
Merge branch 'develop' into travis/update-qr-code
2020-01-29 14:58:16 +00:00
c76dd0f67e
Merge pull request #3977 from matrix-org/jryans/cs-polish
...
Adjust icons with in person with design
2020-01-29 14:37:05 +00:00
6d47f9620f
Adjust icons with in person with design
2020-01-29 14:28:19 +00:00
64e96331ca
Merge pull request #3973 from matrix-org/t3chguy/update_copy
...
Update copy for right panel verification
2020-01-29 14:09:09 +00:00
c0e88bede9
Merge pull request #3972 from matrix-org/jryans/missing-timeline-uisi
...
Check for timeline in pre-join UISI path
2020-01-29 14:04:45 +00:00
957e862939
Update copy some more
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 13:58:02 +00:00
227e6f6376
regen i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 12:16:42 +00:00
a549c42022
Update copy for right panel verification
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 12:10:50 +00:00
336f623aa9
Check for timeline in pre-join UISI path
...
Somehow, live events can be missing a timeline, even though that should not
happen... This restores @uhoreg's previous version where we test for this case.
Fixes https://github.com/vector-im/riot-web/issues/12120
2020-01-29 12:00:04 +00:00
a8cfde72e1
Merge branch 'develop' into travis/update-qr-code
2020-01-29 11:47:59 +00:00
45735d5ae3
Merge pull request #3970 from matrix-org/travis/user-lists/fix-paste
...
Let users paste text if they've already started filtering invite targets
2020-01-29 11:45:21 +00:00
e200988dbf
Merge pull request #3969 from matrix-org/travis/user-lists/suggestions
...
Filter event types when deciding on activity metrics for DM suggestions
2020-01-29 11:40:32 +00:00
8fd174f1d5
Merge pull request #3971 from matrix-org/foldleft/fix-login-loop
...
Revert a change causing a login loop
2020-01-29 11:32:14 +00:00
7d6981ba1a
Revert "reload on enabling cross-signing just to make things generally happier"
...
This reverts commit 2aa21d9199
2020-01-29 11:29:56 +00:00
95a78538e0
Break after getting timestamp
2020-01-29 11:23:48 +00:00
a138a66e77
Let users paste text if they've already started filtering invite targets
...
Fixes https://github.com/vector-im/riot-web/issues/11814
2020-01-29 11:22:03 +00:00
ce7b860d61
Merge branch 'poljar/eventindex-docs' into develop
2020-01-29 12:17:48 +01:00
95edadbfa1
Merge pull request #3968 from matrix-org/travis/user-lists/autofocus
...
Automatically focus on the invite dialog input
2020-01-29 11:14:48 +00:00
8d12657483
Filter event types when deciding on activity metrics for DM suggestions
...
Fixes https://github.com/vector-im/riot-web/issues/12083
2020-01-29 11:14:33 +00:00
610354220e
Automatically focus on the invite dialog input
...
Fixes https://github.com/vector-im/riot-web/issues/12070
2020-01-29 11:01:00 +00:00
fa1f2cd7e0
Merge pull request #3966 from matrix-org/dbkr/restore_key_backup_in_complete_security
...
Restore key backup in Complete Security dialog
2020-01-29 09:55:50 +00:00
b24c7f3a04
Merge pull request #3967 from matrix-org/t3chguy/cs_verification_decoration
...
Right Panel Verification improvements
2020-01-29 09:46:24 +00:00
e9854f5e44
i18n
2020-01-29 09:32:09 +00:00
7d1c61fa55
Use new constant for QR code verification
2020-01-29 09:29:45 +00:00
37e568448d
delint
2020-01-29 08:08:52 +00:00
0bb423fd5a
Add console log on unhandled error to track down rageshake
2020-01-29 08:00:32 +00:00
61d0021c8e
Fix styling special case for DialogButtons
2020-01-29 07:58:43 +00:00
2aa21d9199
reload on enabling cross-signing just to make things generally happier
2020-01-29 07:54:28 +00:00
d824145638
show as pending whilst in an empty state until told better to prevent a flash
2020-01-29 07:54:10 +00:00
3d47e25955
improve PropTypes for better rageshakes
2020-01-29 07:53:45 +00:00
83fdeeb180
Fix MemberInfo handling User objects without crashing
2020-01-29 07:53:23 +00:00
2fbda42374
Fix buttons in right panel verif
2020-01-29 07:53:06 +00:00
797b23ecfa
Merge branch 'develop' into travis/update-qr-code
2020-01-29 00:19:47 +00:00
2c973f7467
Merge pull request #3950 from matrix-org/t3chguy/cs_verification_decoration
...
Cross Signing Right Panel Verification Decoration
2020-01-28 23:57:48 +00:00
5c44ff8f8a
other PR iteration based on feedback
2020-01-28 23:48:00 +00:00
2fb6e73794
speed up user info verification css transitions by 2x
2020-01-28 23:43:27 +00:00
c632c72f25
tidy up right-panel if-else-if statement
2020-01-28 23:43:09 +00:00
4a26a72684
Restore key backup in Complete Security dialog
...
Fixes https://github.com/vector-im/riot-web/issues/11889
2020-01-28 22:46:21 +00:00
c6a827995f
Merge pull request #3965 from matrix-org/t3chguy/members_button_regression
...
Passing refireParams actually prevented this from working
2020-01-28 22:13:29 +00:00
7b5a8856a4
Passing refireParams actually prevented this from working
2020-01-28 22:06:04 +00:00
8c471d6713
Merge pull request #3964 from matrix-org/dbkr/start_key_backup_in_bootstrap
...
Start new key backup in security setup flow
2020-01-28 22:02:20 +00:00
463bddb7e9
Merge pull request #3958 from mstange/fix-unread-scroll-button-hittarget-and-alignment
...
Tweak styling of the unread indicator circle.
2020-01-28 21:53:50 +00:00
793ff2cccc
Hide pre-join UTDs ( #3881 )
2020-01-28 15:36:24 -05:00
02ba548a62
Merge pull request #3963 from matrix-org/jryans/user-info-device-id
...
Add device IDs in user info tooltips
2020-01-28 20:05:43 +00:00
32cb3b8ccb
onClick to separate line
2020-01-28 19:55:53 +00:00
39c8a9d204
Start new key backup in security setup flow
...
Part of https://github.com/vector-im/riot-web/issues/11889
2020-01-28 19:42:09 +00:00
d1cbec98b7
Merge pull request #3962 from matrix-org/dbkr/better_flow_for_upgrade_on_login
...
Improve encryption upgrade on login flow
2020-01-28 18:05:09 +00:00
6fb8f6eef1
Add device IDs in user info tooltips
...
For easier device identification, add the device ID in an HTML tooltip for now.
Fixes https://github.com/vector-im/riot-web/issues/12103
2020-01-28 18:03:51 +00:00
de295cc350
Merge remote-tracking branch 'origin/develop' into dbkr/better_flow_for_upgrade_on_login
2020-01-28 17:49:57 +00:00
b002806639
Use DialogButtons because reusability :((
2020-01-28 17:42:39 +00:00
Travis Ralston