19492 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Travis Ralston	9d5f3ce32d	Merge pull request #3650 from matrix-org/travis/widget-integration-copy ... Rename section heading for integrations in settings	2019-11-21 10:13:59 -07:00
Travis Ralston	9089744f07	Merge pull request #3651 from matrix-org/travis/widget-encryption-copy ... Update copy for widgets not using message encryption	2019-11-21 10:13:47 -07:00
David Baker	834e6819d5	Merge pull request #3649 from matrix-org/dbkr/ignore_media_keys ... Ignore media actions	2019-11-21 16:28:03 +00:00
Travis Ralston	a55e5f7759	Update copy for widgets not using message encryption ... Misc design update	2019-11-21 09:12:07 -07:00
David Baker	f0fbb20ee5	Detect support for mediaSession ... Firefox doesn't support mediaSession so don't try setting handlers	2019-11-21 16:11:42 +00:00
Travis Ralston	f7f22444e8	Rename section heading for integrations in settings ... Misc design update	2019-11-21 09:03:07 -07:00
David Baker	5c6ef10c6b	Ignore media actions ... Hopefully the comment explains all Fixes https://github.com/vector-im/riot-web/issues/11118	2019-11-21 15:55:30 +00:00
Travis Ralston	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
Travis Ralston	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
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	670c14b2e3	Circumvent the linter	2019-11-20 20:54:21 -07:00
Travis Ralston	a69d818a0d	Our linter is seriously picky.	2019-11-20 20:49:41 -07:00
Travis Ralston	560c0afae3	Appease the linter	2019-11-20 20:45:16 -07:00
Travis Ralston	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
Travis Ralston	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
Travis Ralston	3391cc0d90	Add the toggle switch for provisioning	2019-11-20 20:05:32 -07:00
Travis Ralston	0a0e952691	Update integration manager copy	2019-11-20 19:53:52 -07:00
Travis Ralston	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
Travis Ralston	66c51704cc	Fix indentation	2019-11-20 19:21:10 -07:00
Travis Ralston	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
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