mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-29 04:48:50 +03:00
Code Issues Projects Releases Packages Wiki Activity
19502 commits 216 branches 561 tags 417 MiB
Commit graph

8667 commits

Author SHA1 Message Date
David Baker
6d4abeef45 Convert MessagePanel to React class 
I was about to add the getDerivedStateFromProps function to change
how read markers worked, but doing that in an old style class
means the statics object, so let;s just convert the thing.
 2019-11-22 12:07:25 +00:00
David Baker
b239fde32d Workaround for soft-crash with calls on startup 
Fixes https://github.com/vector-im/riot-web/issues/11458
 2019-11-21 17:31:57 +00:00
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
a55e5f7759 Update copy for widgets not using message encryption 
Misc design update
 2019-11-21 09:12:07 -07:00
Travis Ralston
f7f22444e8 Rename section heading for integrations in settings 
Misc design update
 2019-11-21 09:03:07 -07: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
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
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
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
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
Travis Ralston
8abc0953d5 Remove the import my IDE should have removed for me 2019-11-20 11:08: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
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
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
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
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
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
Bruno Windels
43884923e8 merge the feature_user_info_panel flag into feature_dm_verification 2019-11-19 14:18:12 +01:00
Damir Jelić
6017473caf EventIndex: Move the event listener registration into the EventIndex class. 2019-11-19 14:05:00 +01:00
Travis Ralston
5b6ace2558 Appease the linter 2019-11-18 18:02:47 -07:00
Travis Ralston
b185eed462 Wire up the widget permission prompt to the cross-platform setting 
This doesn't have any backwards compatibility with anyone who has already clicked "Allow". We kinda want everyone to read the new prompt, so what better way to do it than effectively revoke all widget permissions?

Part of https://github.com/vector-im/riot-web/issues/11262
 2019-11-18 17:56:33 -07:00
Travis Ralston
f5ec9eb8f4 Ensure widgets always have a sender associated with them 
Fixes https://github.com/vector-im/riot-web/issues/11419
 2019-11-18 13:16:36 -07:00
Michael Telatynski
f9d1fed74a re-add missing case of codepath 2019-11-18 19:00:22 +00:00
Travis Ralston
ef1c575bff
Merge pull request #3622 from matrix-org/travis/new-widget-prompt 
Implement the bulk of the new widget permission prompt design
 2019-11-18 10:45:18 -07:00
J. Ryan Stinnett
d5d2f7f936
Merge pull request #3588 from matrix-org/jryans/identity-disco-opt 
Relax identity server discovery error handling
 2019-11-18 17:09:08 +00:00
Michael Telatynski
e144f1c368 remove Promise.config 2019-11-18 10:37:29 +00:00
Michael Telatynski
5c172a383d Merge branch 't3chguy/remove_bluebird_2' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/remove_bluebird 
 Conflicts:
	src/components/views/right_panel/UserInfo.js
 2019-11-18 10:36:43 +00:00
Michael Telatynski
d4d51dc61f Rip out the remainder of Bluebird 2019-11-18 10:03:05 +00:00
Damir Jelić
5149164010 MatrixChat: Revert the unnecessary changes in the MatrixChat class. 2019-11-18 10:58:40 +01:00
Michael Telatynski
1ab9b82c25
Merge pull request #3618 from matrix-org/t3chguy/remove_bluebird_2 
Remove Bluebird: phase 2.1
 2019-11-18 09:29:04 +00:00
Travis Ralston
6b726a8e13 Implement the bulk of the new widget permission prompt design 
Part 1 of https://github.com/vector-im/riot-web/issues/11262

This is all the visual changes - the actual wiring of the UI to the right places is for another PR (though this PR still works independently).

The help icon is known to be weird here - it's a bug in the svg we have. The tooltip also goes right instead of up because making the tooltip go up is not easy work for this PR - maybe a future one if we *really* want it to go up.
 2019-11-15 14:26:16 -07:00
Travis Ralston
616a5ab55d Merge branch 'develop' into travis/deactivate-2 2019-11-15 10:24:20 -07:00
Bruno Windels
0f39a9f72d fix pr feedback 2019-11-15 17:29:38 +01:00
Bruno Windels
d416ba2c0c add verify button while we don't have the verification in right panel 2019-11-15 16:14:18 +01:00