050921e1f2
Merge branch 'origin/develop' into Weblate.
2020-03-31 15:00:16 +00:00
dcd75a801e
Translated using Weblate (Italian)
...
Currently translated at 100.0% (2244 of 2244 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-03-31 15:00:16 +00:00
6da01a9cf7
Merge pull request #4299 from JorikSchellekens/joriks/css-location
...
Update link to css location.
2020-03-31 16:00:11 +01:00
6596b7223a
Merge branch 'develop' into uhoreg/check_sssss_passphrase
2020-03-31 10:39:56 -04:00
4a9bc5e5bf
Update src/components/views/auth/InteractiveAuthEntryComponents.js
...
Co-Authored-By: David Baker <dbkr@users.noreply.github.com>
2020-03-31 08:29:42 -06:00
e2685b1cf0
Licensing info
2020-03-31 15:29:40 +01:00
6cf9166c4a
Use variables for the rem values.
...
It's become obvious that these random floating points everywhere
are unwieldy. Now they're all in one place with some fairly logical
variable names which will help out in design->implementation phase.
2020-03-31 15:26:23 +01:00
77f636c74b
Merge branch 'origin/develop' into Weblate.
2020-03-31 13:21:48 +00:00
9ed08e76f8
Merge pull request #4310 from matrix-org/t3chguy/fix_peeking
...
Fix peeking keeping two timeline update mechanisms in play
2020-03-31 14:21:42 +01:00
2624017ab9
Also stop peeking on unmount
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-31 12:51:03 +01:00
9e8a401dc8
Fix EventListSummary when RR rendering is disabled
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-31 12:29:58 +01:00
80479195c8
iterate PR based on feedback. Remove newballsplease cmd alias
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-31 11:53:26 +01:00
6e61761012
Merge branches 'develop' and 't3chguy/cmds' of github.com:matrix-org/matrix-react-sdk into t3chguy/cmds
...
Conflicts:
src/SlashCommands.tsx
2020-03-31 11:49:53 +01:00
77e6cb7c6e
Merge branch 'origin/develop' into Weblate.
2020-03-31 10:05:04 +00:00
223a4e285d
Merge pull request #4308 from matrix-org/jryans/4s-prompt-overload
...
Pass new secret storage key to bootstrap path
2020-03-31 11:04:58 +01:00
24c09cc4c8
Convert secret storage key creation to object
2020-03-31 10:45:53 +01:00
a2a9dc6cd0
Fix peeking keeping two timeline update mechanisms in play
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-31 10:37:56 +01:00
8340ac35cd
Merge branch 'origin/develop' into Weblate.
2020-03-31 09:07:33 +00:00
2455c5a850
Merge pull request #4303 from matrix-org/jryans/id-change-red
...
Show red shield for users that become unverified
2020-03-31 10:07:28 +01:00
2d8b0ccb80
Merge branch 'origin/develop' into Weblate.
2020-03-31 08:41:27 +00:00
b44c83aad7
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (2243 of 2243 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-03-31 08:41:27 +00:00
c094afbbe6
Merge pull request #4295 from matrix-org/t3chguy/a11y2
...
Accessibility fixed for Event List Summary and Composer Format Bar
2020-03-31 09:41:20 +01:00
1c5b7bf132
Merge pull request #4279 from matrix-org/t3chguy/instant_sso
...
Support $riot: Templates for SSO/CAS urls in the welcome.html page
2020-03-31 09:39:40 +01:00
1f8830e640
Merge branch 'origin/develop' into Weblate.
2020-03-31 02:56:35 +00:00
98c663a41d
Translated using Weblate (German)
...
Currently translated at 77.2% (1730 of 2242 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-31 02:56:34 +00:00
2557875fd2
Merge pull request #4296 from waylon531/upstream
...
Added the /html command
2020-03-30 20:56:24 -06:00
d899576578
Appease the linter
2020-03-30 20:24:53 -06:00
8bc86deaaa
Appease the style linter
2020-03-30 20:23:34 -06:00
de79520150
Add SSO dialog copy for 3PID adding (email/phone)
2020-03-30 20:18:52 -06:00
6112d92f80
Remove debugging
2020-03-30 20:11:23 -06:00
ffa75ef48c
Wire up all the dialog parts for SSO, using device deletion as a POC
2020-03-30 20:03:46 -06:00
bbb9a67ced
use new method for checking key
2020-03-30 17:28:01 -04:00
b35356833f
Merge branch 'develop' into travis/sso-uia
2020-03-30 14:56:52 -06:00
690b5945d0
Pass new secret storage key to bootstrap path
...
This passes the newly created secret storage key down to the bootstrap path for
temporary caching to avoid prompting the user for it again in the later stages
of bootstrapping.
Fixes https://github.com/vector-im/riot-web/issues/12867
2020-03-30 21:40:11 +01:00
9cf82d8743
Updated strings
...
I added a new string for the /html command and had to regerate strings
for i18
Signed-off-by: Waylon Cude <waylon.cude@finzdani.net>
2020-03-30 11:44:34 -07:00
dd4331cd18
Added the /html command
...
This command lets you send html messages through riot. This is
incredibly useful for doing advanced formatting not supported by
markdown and lets riot support even more html tags.
Signed-off-by: Waylon Cude <waylon.cude@finzdani.net>
2020-03-30 11:44:08 -07:00
f8051f9f6f
Merge branch 'origin/develop' into Weblate.
2020-03-30 18:13:22 +00:00
930f93b974
Merge branch 'poljar/event-index-log-skipped-events' into develop
2020-03-30 20:12:51 +02:00
1e2b175612
Merge branch 'origin/develop' into Weblate.
2020-03-30 18:08:35 +00:00
6517ed07bd
Merge pull request #4307 from matrix-org/t3chguy/fixes1111
...
Field: mark id as optional in propTypes
2020-03-30 19:08:29 +01:00
147e7bc57e
Field: mark id as optional in propTypes
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-30 18:42:47 +01:00
da34e6241d
Make all 'font-size's and 'line-height's rem
...
Font size of the whole app would ideally be controlled by a single
value. This value is currently hard coded using the :root CSS selector.
It is the intention to make this value configurable within riot. In the
interim all font-sizes have been converted to rem by the simple process
of regex. Replacing px values with their equivalent rem values assuming
a font size of 15px and then rounded to three decimal places, which was
the base at the time of this transformation.
I'm expecting another commit cleaning up rem values but I thought it
best to leave that to review.
This commit doesn't address any scaling issues. I thought it better to
land this unwieldy, mechanical, invisible change before the others
otherwise the pr would be impossible to review thoroughly.
2020-03-30 18:23:46 +01:00
fd593280e0
Merge branch 'origin/develop' into Weblate.
2020-03-30 17:20:54 +00:00
b5688ac2b6
Merge pull request #4254 from ThobyV/fix-css/_TagPanel.scss/mx_TagTile_context_button
...
Fix view community link icon contrast
2020-03-30 11:20:49 -06:00
b5587ea853
Merge branch 'origin/develop' into Weblate.
2020-03-30 17:08:55 +00:00
df60f9cd26
Merge pull request #4304 from matrix-org/travis/fix-confs
...
Remove underscore from Jitsi conference names
2020-03-30 11:08:49 -06:00
ca5d540311
Remove underscore from Jitsi conference names
...
Fixes https://github.com/vector-im/riot-web/issues/12929
Note: we don't need this to fix conferences in our hosted instance (riot.im or modular.im), but it is a common thing for self-hosters, including sometimes ourselves, to accidentally make mistakes on.
2020-03-30 10:40:26 -06:00
520b4c3e65
Add tests for was verified case
2020-03-30 16:33:22 +01:00
b53b5cc45d
Add wasCrossSigningVerified in test
2020-03-30 15:24:43 +01:00
a3555cacea
Merge remote-tracking branch 'origin/develop' into jryans/id-change-red
2020-03-30 14:52:22 +01:00
Weblate