Travis Ralston
5d612bb370
Merge pull request #3644 from matrix-org/travis/widget-encryption
...
Re-add encryption warning to widget permission prompt
2019-11-21 08:04:56 -07:00
Bruno Windels
ed024a0b10
Merge pull request #3647 from matrix-org/bwindels/updateciderdocs
...
Update CIDER docs now that it is used for main composer as well
2019-11-21 13:18:11 +00:00
Michael Telatynski
3242e2da72
Merge pull request #3593 from matrix-org/t3chguy/remove_bluebird
...
get rid of bluebird
2019-11-21 11:22:49 +00:00
Michael Telatynski
d3f872bf7a
Merge branches 'develop' and 't3chguy/remove_bluebird' of github.com:matrix-org/matrix-react-sdk into t3chguy/remove_bluebird
2019-11-21 11:15:32 +00:00
David Baker
04641a0f87
Merge pull request #3638 from matrix-org/dbkr/dedup_theming_code
...
Remove getBaseTheme
2019-11-21 09:44:37 +00:00
Bruno Windels
8c02893da7
Update CIDER docs now that it is used for main composer as well
2019-11-21 08:58:13 +00:00
Travis Ralston
f0066ff622
Merge pull request #3643 from bkil/bkil/fix-tooltip-of-nonmember-emojis
...
ReactionsRowButtonTooltip: fix null dereference if emoji owner left room
2019-11-20 18:06:37 -07:00
bkil
a40194194d
ReactionsRowButtonTooltip: fix null dereference if emoji owner left room
...
Signed-off-by: bkil <b.K.il.h.u+tigbuh@gmail.com>
2019-11-21 01:50:18 +01:00
Travis Ralston
62a2c7a51a
Re-add encryption warning to widget permission prompt
2019-11-20 16:26:06 -07:00
Michael Telatynski
2f084113f6
Merge pull request #3642 from matrix-org/t3chguy/pre_jest
...
Add eslint-plugin-jest because we inherit js-sdk's eslintrc and it wants
2019-11-20 22:43:16 +00:00
Michael Telatynski
fccf9f138e
Add eslint-plugin-jest because we inherit js-sdk's eslintrc and it wants
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-11-20 22:32:11 +00:00
Travis Ralston
e33bfe93b4
Merge pull request #3641 from matrix-org/travis/e2e-icon
...
Fix positioning, size, and colour of the composer e2e icon
2019-11-20 11:16:54 -07:00
Travis Ralston
8abc0953d5
Remove the import my IDE should have removed for me
2019-11-20 11:08:53 -07:00
Travis Ralston
f6394b1251
Remove stray colour correction on composer e2e icon
...
We want it to match the room header
2019-11-20 11:03:53 -07:00
Travis Ralston
93e4de9861
Fix positioning and sizing of e2e icon in the composer
...
This also removes the special case class for the composer because the input is now aligned regardless of icon.
2019-11-20 11:00:39 -07:00
David Baker
9bb1feecca
Merge pull request #3639 from matrix-org/matthew/nunito-ransom-fix
...
upgrade nunito from 3.500 to 3.504
2019-11-20 17:58:05 +00:00
David Baker
3409ad97d8
Merge remote-tracking branch 'origin/develop' into matthew/nunito-ransom-fix
2019-11-20 17:49:26 +00:00
Travis Ralston
1c1b8cf6b9
Merge pull request #3630 from matrix-org/travis/widget-permission
...
Wire up the widget permission prompt to the cross-platform setting
2019-11-20 10:37:51 -07:00
Matthew Hodgson
758dd4127f
upgrade nunito from 3.500 to 3.504
...
fixes https://github.com/vector-im/riot-web/issues/8092 by way of https://github.com/google/fonts/issues/632
2019-11-20 16:36:27 +00:00
David Baker
00241a8d0c
Merge pull request #3637 from matrix-org/dbkr/system_dark_mode
...
Get theme automatically from system setting
2019-11-20 16:32:37 +00:00
David Baker
e36f4375b0
Bugfix & clearer setting name
2019-11-20 16:12:14 +00:00
David Baker
b69cee0c67
Remove getBaseTheme
...
This was only used by vector/index.js, in the code removed by
https://github.com/vector-im/riot-web/pull/11445
React SDK does a very similar thing in setTheme but also gets the
rest of the custom theme name.
Requires https://github.com/vector-im/riot-web/pull/11445
2019-11-20 15:45:32 +00:00
David Baker
518130c912
add bug link
2019-11-20 15:37:48 +00:00
David Baker
a744415221
Add hack to work around mystery settings bug
2019-11-20 15:34:32 +00:00
Michael Telatynski
6121420113
Merge branch 'develop' into t3chguy/remove_bluebird
2019-11-20 15:21:23 +00:00
J. Ryan Stinnett
1e6472723a
Merge pull request #3636 from matrix-org/jryans/90-chars
...
Update code style for our 90 char life
2019-11-20 15:03:02 +00:00
Bruno Windels
d1554977a8
Merge pull request #3633 from matrix-org/bwindels/fix-roomstatus-e2e-icon
...
use general warning icon instead of e2e one for room status
2019-11-20 14:36:30 +00:00
David Baker
71f5c8b2b0
Lint
2019-11-20 13:47:54 +00:00
David Baker
5a700b518a
Get theme automatically from system setting
...
Uses CSS `prefers-color-scheme` to get the user's preferred colour
scheme. Also bundles up some theme logic into its own class.
2019-11-20 13:41:06 +00:00
Damir Jelić
44b212bc4c
Merge branch 'poljar/seshat-pr' into develop
2019-11-20 13:33:03 +01:00
Damir Jelić
4bd46f9d69
EventIndex: Silence the linter complaining about missing docs.
2019-11-20 12:47:20 +01:00
Damir Jelić
0631faf902
Settings: Fix the supportedLevels for event indexing feature.
2019-11-20 12:31:07 +01:00
Damir Jelić
2f5b0a9652
EventIndex: Use property initializer style for the bound callbacks.
2019-11-20 12:30:03 +01:00
J. Ryan Stinnett
8f79661725
Update code style for our 90 char life
...
We've been using 90 chars for JS code for quite a while now, but for some
reason, the code style guide hasn't admitted that, so this adjusts it to match
ESLint settings.
2019-11-20 10:30:42 +00:00
David Baker
55e5e63199
Merge pull request #3635 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate
2019-11-20 10:14:02 +00:00
Weblate
52d542debe
Merge branch 'origin/develop' into Weblate.
2019-11-20 09:41:27 +00:00
Karol Kosek
d277a1946b
Translated using Weblate (Polish)
...
Currently translated at 76.0% (1456 of 1917 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2019-11-20 09:41:27 +00:00
fenuks
870def5d85
Translated using Weblate (Polish)
...
Currently translated at 76.0% (1456 of 1917 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2019-11-20 09:41:26 +00:00
송태섭
f25236c3fb
Translated using Weblate (Korean)
...
Currently translated at 100.0% (1917 of 1917 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2019-11-20 09:41:20 +00:00
Szimszon
8df0aee12b
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (1917 of 1917 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-11-20 09:41:18 +00:00
Kévin C
df868a6b09
Translated using Weblate (French)
...
Currently translated at 100.0% (1917 of 1917 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-11-20 09:41:18 +00:00
Jeff Huang
ab8a9dd0e9
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (1917 of 1917 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-11-20 09:41:16 +00:00
David Baker
d3730175a2
Merge pull request #3634 from matrix-org/dbkr/theme_use_watcher
...
Use a settings watcher to set the theme
2019-11-20 09:41:07 +00:00
David Baker
a31d222570
Add catch handler for theme setting
2019-11-19 23:00:54 +00:00
David Baker
80ee68a42f
Use a settings watcher to set the theme
...
Rather than listening for account data updates manually
2019-11-19 22:36:55 +00:00
Bruno Windels
de0287213e
use general warning icon instead of e2e one for room status
2019-11-19 15:06:09 +01:00
Weblate
95e1b58e0d
Merge branch 'origin/develop' into Weblate.
2019-11-19 13:34:29 +00:00
Bruno Windels
a0dbd5f62c
Merge pull request #3632 from matrix-org/bwindels/merge-userinfo-flag
...
Merge the `feature_user_info_panel` flag into `feature_dm_verification`
2019-11-19 13:34:23 +00:00
Weblate
f14d7a7759
Merge branch 'origin/develop' into Weblate.
2019-11-19 13:24:31 +00:00
Alexis
0eedab4154
Translated using Weblate (Portuguese)
...
Currently translated at 33.3% (638 of 1918 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt/
2019-11-19 13:24:31 +00:00