Zoe
|
a9d85e1fa3
|
lint
|
2020-01-30 16:27:35 +00:00 |
|
David Baker
|
4f62fc16bd
|
lint
|
2020-01-30 16:19:04 +00:00 |
|
Weblate
|
a92b14c7ab
|
Merge branch 'origin/develop' into Weblate.
|
2020-01-30 16:13:00 +00:00 |
|
J. Ryan Stinnett
|
ddc628c804
|
Merge pull request #3994 from matrix-org/jryans/verify-user-text
Change verify user text
|
2020-01-30 16:12:55 +00:00 |
|
Zoe
|
4a3ea30e52
|
copy for verification screen
|
2020-01-30 16:11:05 +00:00 |
|
David Baker
|
77618d30fd
|
Actually this is green because it's a link
not because the things were verified. Use the linkButton class
|
2020-01-30 16:08:42 +00:00 |
|
Zoe
|
9f5f15d1d3
|
Update copy when the user verifies their own devices
|
2020-01-30 15:59:59 +00:00 |
|
David Baker
|
0956d00637
|
Make shields in UserInfo black if user isn't verified
|
2020-01-30 15:59:03 +00:00 |
|
Weblate
|
e94af1e643
|
Merge branch 'origin/develop' into Weblate.
|
2020-01-30 15:19:38 +00:00 |
|
Zoe
|
f6e2f3082e
|
Merge pull request #3996 from matrix-org/foldleft/12097-lock-login-inputs
Disable all inputs in login form while busy, not just the submit button
|
2020-01-30 15:19:32 +00:00 |
|
Zoe
|
318689f40b
|
Disable all inputs in login form while busy, not just the submit button
|
2020-01-30 15:06:36 +00:00 |
|
J. Ryan Stinnett
|
788cb24093
|
Add advanced option to keep secret storage in memory for session
This adds a default-off option to keep the secret storage passphrase cached in
memory for the current session to avoid death by prompts.
|
2020-01-30 14:18:12 +00:00 |
|
J. Ryan Stinnett
|
fd5798aa87
|
Change verify user text
|
2020-01-30 13:21:51 +00:00 |
|
Weblate
|
e18e01217c
|
Merge branch 'origin/develop' into Weblate.
|
2020-01-30 13:10:37 +00:00 |
|
Zoe
|
767015d19d
|
Merge pull request #3993 from matrix-org/foldleft/12106-round-two
fix SAS dialog width
|
2020-01-30 13:10:32 +00:00 |
|
Weblate
|
ae57feaf70
|
Merge branch 'origin/develop' into Weblate.
|
2020-01-30 13:08:47 +00:00 |
|
J. Ryan Stinnett
|
9c8ffb6c4e
|
Merge pull request #3990 from matrix-org/t3chguy/fix_composer_placeholder
Update placeholder in the composer when it gets changed
|
2020-01-30 13:08:42 +00:00 |
|
Zoe
|
4c1cc6feba
|
fix SAS dialog width
used fixedWidth to accomplish the same goal
clean up css
|
2020-01-30 12:48:41 +00:00 |
|
Weblate
|
4de9a2074e
|
Merge branch 'origin/develop' into Weblate.
|
2020-01-30 11:53:34 +00:00 |
|
David Baker
|
e43de26720
|
Merge pull request #3992 from matrix-org/dbkr/default_display_name_register
Send initial device display name on register
|
2020-01-30 11:53:29 +00:00 |
|
David Baker
|
c8673452be
|
Merge remote-tracking branch 'origin/develop' into dbkr/default_display_name_register
|
2020-01-30 11:45:54 +00:00 |
|
David Baker
|
2f4b3272da
|
Send initial device display najme on register
Fixes https://github.com/vector-im/riot-web/issues/12140
|
2020-01-30 11:27:54 +00:00 |
|
Weblate
|
cbd9c52ad8
|
Merge branch 'origin/develop' into Weblate.
|
2020-01-30 11:26:19 +00:00 |
|
Travis Ralston
|
67468d85c6
|
Merge pull request #3959 from matrix-org/travis/update-qr-code
Update QR code handling for new spec
|
2020-01-30 11:26:13 +00:00 |
|
Weblate
|
68c61a057e
|
Merge branch 'origin/develop' into Weblate.
|
2020-01-30 11:16:24 +00:00 |
|
random
|
f2dda28ad3
|
Translated using Weblate (Italian)
Currently translated at 95.5% (2002 of 2096 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
|
2020-01-30 11:16:24 +00:00 |
|
Jeff Huang
|
7038481394
|
Translated using Weblate (Chinese (Traditional))
Currently translated at 94.8% (1988 of 2096 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
|
2020-01-30 11:16:22 +00:00 |
|
J. Ryan Stinnett
|
1cd2b7d190
|
Merge pull request #3989 from matrix-org/t3chguy/olympics
Apply the Olympic effect to SAS Emoji Verification
|
2020-01-30 11:16:14 +00:00 |
|
Michael Telatynski
|
52ed55d887
|
Update placeholder when it changes, not sure how this ever worked
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-01-30 00:23:19 +00:00 |
|
Michael Telatynski
|
ea0fafc4e9
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/olympics
|
2020-01-29 22:55:02 +00:00 |
|
Michael Telatynski
|
afecaa1662
|
fix left margins in UserInfo
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-01-29 22:54:56 +00:00 |
|
Michael Telatynski
|
d17a2ff80c
|
clean up unused CSS rules
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-01-29 22:54:45 +00:00 |
|
Weblate
|
4de21aa676
|
Merge branch 'origin/develop' into Weblate.
|
2020-01-29 22:45:40 +00:00 |
|
Michael Telatynski
|
1475f5c73a
|
Merge pull request #3988 from matrix-org/t3chguy/fix_Field_usage
Pass an ID to the <Field/> as needed and fix div inside p nesting
|
2020-01-29 22:45:34 +00:00 |
|
Michael Telatynski
|
33ec73095e
|
Apply the Olympic effect to SAS Emoji Verification
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-01-29 22:44:49 +00:00 |
|
Michael Telatynski
|
a180dddc66
|
Pass an ID to the <Field/> as needed and fix div inside p nesting
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-01-29 22:31:19 +00:00 |
|
Weblate
|
6d6813efaa
|
Merge branch 'origin/develop' into Weblate.
|
2020-01-29 22:22:59 +00:00 |
|
J. Ryan Stinnett
|
c851cc6070
|
Merge pull request #3987 from matrix-org/jryans/update-user-info-trust
Update user info for device and trust changes
|
2020-01-29 22:22:54 +00:00 |
|
J. Ryan Stinnett
|
eaa48665d2
|
Guard request input
|
2020-01-29 21:59:30 +00:00 |
|
J. Ryan Stinnett
|
7a5bf8f102
|
Update user info for device and trust changes
This ensure the user info panel updates automatically for device and trust
changes.
Fixes https://github.com/vector-im/riot-web/issues/12134`
|
2020-01-29 21:55:29 +00:00 |
|
Weblate
|
7e8392456e
|
Merge branch 'origin/develop' into Weblate.
|
2020-01-29 20:40:18 +00:00 |
|
J. Ryan Stinnett
|
786ddb8a7e
|
Merge pull request #3985 from matrix-org/jryans/relax-account-data-check
Relax secret storage account data check
|
2020-01-29 20:40:13 +00:00 |
|
Weblate
|
7c20bb8e78
|
Merge branch 'origin/develop' into Weblate.
|
2020-01-29 19:55:38 +00:00 |
|
J. Ryan Stinnett
|
d362cc0f41
|
Fix room device level send setting
|
2020-01-29 19:55:27 +00:00 |
|
Weblate
|
b2fe0c5dde
|
Merge branch 'origin/develop' into Weblate.
|
2020-01-29 19:54:06 +00:00 |
|
catborise
|
d854afdfd4
|
Translated using Weblate (Turkish)
Currently translated at 70.4% (1475 of 2095 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
|
2020-01-29 19:54:06 +00:00 |
|
J. Ryan Stinnett
|
3ff3a3cebd
|
Fix delete button for one session
|
2020-01-29 19:53:50 +00:00 |
|
David Baker
|
ac173e9d50
|
Merge pull request #3984 from matrix-org/dbkr/rightpanel_verif_phase
Fix various races that prevented the right panel being in the right state for verifications
|
2020-01-29 18:03:27 +00:00 |
|
David Baker
|
d63bb240aa
|
those words again
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
|
2020-01-29 17:52:12 +00:00 |
|
David Baker
|
de6ef9ec90
|
words
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
|
2020-01-29 17:51:51 +00:00 |
|