6597e0bd42
Merge pull request #3646 from matrix-org/travis/integration-manager-opt
...
Add an option to disable the use of integration managers for provisioning
2019-11-21 08:10:56 -07:00
1e13cbb442
Merge branch 'origin/develop' into Weblate.
2019-11-21 15:10:35 +00:00
86783e4439
Merge pull request #3645 from matrix-org/travis/widget-menu
...
Move many widget options to a context menu
2019-11-21 08:10:28 -07:00
f3ac2c2a1e
Merge branch 'origin/develop' into Weblate.
2019-11-21 15:05:12 +00:00
598901b483
Translated using Weblate (Latvian)
...
Currently translated at 47.8% (918 of 1919 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lv/
2019-11-21 15:05:11 +00:00
87167f42f8
Translated using Weblate (Italian)
...
Currently translated at 99.9% (1917 of 1919 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-11-21 15:05:11 +00:00
d786017d08
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (1919 of 1919 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-11-21 15:05:10 +00:00
ad941b96e0
Translated using Weblate (French)
...
Currently translated at 100.0% (1919 of 1919 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-11-21 15:05:09 +00:00
670d44ecd8
Translated using Weblate (Finnish)
...
Currently translated at 96.1% (1845 of 1919 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2019-11-21 15:05:08 +00:00
5670a52469
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (1919 of 1919 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-11-21 15:05:04 +00:00
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
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
3242e2da72
Merge pull request #3593 from matrix-org/t3chguy/remove_bluebird
...
get rid of bluebird
2019-11-21 11:22:49 +00:00
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
04641a0f87
Merge pull request #3638 from matrix-org/dbkr/dedup_theming_code
...
Remove getBaseTheme
2019-11-21 09:44:37 +00:00
8c02893da7
Update CIDER docs now that it is used for main composer as well
2019-11-21 08:58:13 +00:00
670c14b2e3
Circumvent the linter
2019-11-20 20:54:21 -07:00
a69d818a0d
Our linter is seriously picky.
2019-11-20 20:49:41 -07:00
560c0afae3
Appease the linter
2019-11-20 20:45:16 -07:00
94fed922cf
Intercept cases of disabled/no integration managers
...
We already intercepted most of the cases where no integration manager was present, though there was a bug in many components where openAll() would be called regardless of an integration manager being available.
The integration manager being disabled by the user is handled in the IntegrationManager classes rather than on click because we have quite a few calls to these functions. The StickerPicker is an exception because it does slightly different behaviour.
This also removes the old "no integration manager configured" state from the IntegrationManager component as it is now replaced by a dialog.
2019-11-20 20:40:39 -07:00
81c9bdd9f3
It's called an "Integration Manager" (singular)
...
Fixes https://github.com/vector-im/riot-web/issues/11256
This was finally annoying me enough to fix it.
2019-11-20 20:14:25 -07:00
3391cc0d90
Add the toggle switch for provisioning
2019-11-20 20:05:32 -07:00
0a0e952691
Update integration manager copy
2019-11-20 19:53:52 -07:00
b0eb54541c
Rip out options to change your integration manager
...
We are not supporting this due to the complexity involved in switching integration managers. We still support custom ones under the hood, just not to the common user. A later sprint on integrations will consider re-adding the option alongside fixing the various bugs out there.
2019-11-20 19:50:13 -07:00
66c51704cc
Fix indentation
2019-11-20 19:21:10 -07:00
fd12eb28e7
Move many widget options to a context menu
...
Part of https://github.com/vector-im/riot-web/issues/11262
2019-11-20 19:17:42 -07:00
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
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
62a2c7a51a
Re-add encryption warning to widget permission prompt
2019-11-20 16:26:06 -07:00
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
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
ef475bbdad
v1.7.3-rc.1
2019-11-20 18:29:16 +00:00
318a720e75
Prepare changelog for v1.7.3-rc.1
2019-11-20 18:29:16 +00:00
966f84115d
js-sdk rc.1
2019-11-20 18:26:29 +00:00
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
8abc0953d5
Remove the import my IDE should have removed for me
2019-11-20 11:08:53 -07:00
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
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
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
3409ad97d8
Merge remote-tracking branch 'origin/develop' into matthew/nunito-ransom-fix
2019-11-20 17:49:26 +00:00
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
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
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
e36f4375b0
Bugfix & clearer setting name
2019-11-20 16:12:14 +00:00
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
518130c912
add bug link
2019-11-20 15:37:48 +00:00
a744415221
Add hack to work around mystery settings bug
2019-11-20 15:34:32 +00:00
6121420113
Merge branch 'develop' into t3chguy/remove_bluebird
2019-11-20 15:21:23 +00:00
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
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
Travis Ralston