mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 20:41:46 +03:00
Code Issues Projects Releases Packages Wiki Activity
30181 commits 219 branches 562 tags 474 MiB
Commit graph

8958 commits

Author SHA1 Message Date
Michael Telatynski
4e12aeca9e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets 
 Conflicts:
	src/components/views/elements/AppTile.js
 2020-10-21 12:48:51 +01:00
nurjinn jafar
1c6d28b861 refactoring roomView / slashCommands / SendMessageComposer with the new effects configurations and fix confetti animation timeout 2020-10-21 13:37:36 +02:00
Michael Telatynski
a5468c918e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 
 Conflicts:
	src/resizer/distributors/collapse.ts
	src/resizer/distributors/fixed.ts
	src/resizer/index.ts
	src/resizer/item.ts
	src/resizer/resizer.ts
	src/resizer/sizer.ts
 2020-10-21 09:56:22 +01:00
Michael Telatynski
5a9bac68c6 iterate PR based on feedback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-21 09:48:02 +01:00
Michael Telatynski
9cd146aa33 remove debug lines 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-21 09:46:37 +01:00
Michael Telatynski
9348c8a23b Fix some widget auto tiling issues 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-20 16:07:47 +01:00
Michael Telatynski
9181e3e89a
Merge pull request #5338 from matrix-org/t3chguy/fix/15166 
Hide filtering microcopy when left panel is minimized
 2020-10-20 15:21:43 +01:00
Michael Telatynski
b6fd2a0691 Iterate the Modal Widget Dialog paddings and phishing warning 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-20 15:05:22 +01:00
Michael Telatynski
bec1d718e0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets 
 Conflicts:
	src/components/views/elements/AppTile.js
	src/utils/WidgetUtils.ts
 2020-10-19 20:50:16 +01:00
Michael Telatynski
16362440b3 Iterate Modal Widgets 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 20:39:43 +01:00
Steffen Kolmer
607e33feba Extensibility, TypeScript and lazy loading 2020-10-19 21:25:01 +02:00
Michael Telatynski
00b1a03a3e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets 
 Conflicts:
	src/@types/global.d.ts
	src/FromWidgetPostMessageApi.js
	src/WidgetMessaging.js
	src/widgets/WidgetApi.ts
 2020-10-19 19:46:07 +01:00
Michael Telatynski
5fcdaf66cc Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 2020-10-19 18:50:02 +01:00
Michael Telatynski
fefd374a32 Fix case where sublist context menu missed an update 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 14:34:47 +01:00
Michael Telatynski
744a4abd1c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 2020-10-19 13:08:17 +01:00
Michael Telatynski
73489b7c6d AppsDrawer watch ResizeNotifier isResizing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 13:08:11 +01:00
Michael Telatynski
47744a4344 Hide filtering microcopy when left panel is minimized 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 12:55:01 +01:00
Michael Telatynski
35d12171b1 Remove unused prop for clarity 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 12:54:53 +01:00
Steffen Kolmer
41160ff08e Render confetti the react way 2020-10-19 13:54:09 +02:00
Steffen Kolmer
c86964cd5e Merge remote-tracking branch 'upstream/develop' into feature_confetti#14676 2020-10-19 13:15:33 +02:00
Steffen Kolmer
6e97baf09f Added license 2020-10-19 12:53:17 +02:00
David Baker
b10f7a47fd
Merge pull request #5324 from matrix-org/dbkr/hang_up_your_hangups 
Support rejecting calls
 2020-10-19 09:57:13 +01:00
Bryan Kok
176c7c32da Search through the list of unfiltered rooms rather than the rooms in the state which are already filtered by the search text 2020-10-17 14:35:11 +08:00
Travis Ralston
5f3f7b5263 Don't show admin tooling if we're not in the room 
Fixes https://github.com/vector-im/element-web/issues/15480
 2020-10-16 13:43:08 -06:00
Michael Telatynski
999d83cb8d Show Integrations error if iframe failed to load too 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-16 13:54:37 +01:00
Michael Telatynski
da93be4677 Iterate Widget Context Menu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-16 11:51:27 +01:00
Michael Telatynski
6b01b6ac6c Discard all mx_fadable legacy cruft which is totally useless 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-15 16:13:16 +01:00
Michael Telatynski
f198b95579 Iterate PR; tidy and improve widget context menu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-15 15:24:42 +01:00
David Baker
7ad366603a Support rejecting calls 
Use the 'reject' method when we want to reject an incoming call
rather than end one that's in progress. Also get our error messages
right for the other side rejecting the call (albeit still with
placeholder dialog-box UX).

Requires https://github.com/matrix-org/matrix-js-sdk/pull/1510
 2020-10-15 14:54:03 +01:00
Michael Telatynski
f5479d87fe delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-15 11:28:14 +01:00
Michael Telatynski
a6c81a903c Iterate with new buttons and resize locking 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-15 11:14:48 +01:00
Arsh Sharma
49d99c6dc7 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into fix-final-10 2020-10-14 16:58:05 +05:30
Michael Telatynski
2ea2068d95 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/3 2020-10-14 10:43:38 +01:00
Michael Telatynski
dce047e25c
Merge pull request #5317 from matrix-org/t3chguy/fix/11510 
Fix broken rendering of Room Create when showHiddenEvents enabled
 2020-10-14 10:27:18 +01:00
Michael Telatynski
d36fafd0c6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 
 Conflicts:
	res/css/views/rooms/_AppsDrawer.scss
	src/components/views/elements/AppTile.js
	src/components/views/rooms/AppsDrawer.js
 2020-10-14 10:23:44 +01:00
Michael Telatynski
e3155fe58f
Merge pull request #5313 from matrix-org/t3chguy/other/1 
Improve LHS resize performance and tidy stale props&classes
 2020-10-14 10:06:37 +01:00
Michael Telatynski
38bf7b3055 Apply the fix more generically 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-14 09:46:54 +01:00
Michael Telatynski
910bdf0802 Fix broken rendering of Room Create when showHiddenEvents enabled 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-14 09:38:45 +01:00
Michael Telatynski
e885d9cb0d TS improvements 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 22:58:21 +01:00
Travis Ralston
294c35347c Ensure widgets are destroyed cleanly when minimized 
Fixes https://github.com/vector-im/element-web/issues/15444 (an artifact of joining a call then minimizing the widget)

Also fixes other issues relating to widgets not loading when being minimized/maximized.
 2020-10-13 14:55:44 -06:00
Michael Telatynski
20cc3911ed switch form global to window 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 18:48:02 +01:00
Arsh Sharma
4baf3b8deb error fix in PreferencesUserSettingsTab.js 2020-10-13 21:26:08 +05:30
Michael Telatynski
bb52bad099 Remove stale props and CSS classes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 16:23:49 +01:00
Michael Telatynski
ba21c6ed36 Iterate on Widget icons and resizing handles 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 15:56:53 +01:00
Michael Telatynski
a1d25efceb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 
 Conflicts:
	src/components/structures/RoomView.tsx
 2020-10-13 13:45:22 +01:00
Michael Telatynski
7be5ff0fe6 First cut of app drawer tiled resizing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 12:29:12 +01:00
Michael Telatynski
f72b1e0c7d Remove stale things 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 12:27:50 +01:00
David Baker
40ba342aa2
Merge pull request #5308 from matrix-org/dbkr/call_state_machine 
Rewrite call state machine
 2020-10-13 10:39:15 +01:00
Michael Telatynski
c1fef5a941 Improve the styling 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-12 13:36:09 +01:00
Michael Telatynski
7820f9c28a Switch to WidgetAvatar 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-12 13:16:55 +01:00
David Baker
414901dfae More enums 2020-10-12 11:38:32 +01:00
Michael Telatynski
37558f1f0d Improve the context menu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-12 09:51:49 +01:00
RinkiyaKeDad
f5a40eff4b updated TagFilterStore 2020-10-10 18:02:58 +05:30
RinkiyaKeDad
4f8b0afc41 updated TagPanel 2020-10-10 18:00:06 +05:30
David Baker
55f77b04ae Rewrite call state machine 
* Remove the two separate enumerations of call state: now everything
   uses the js-sdk version of call state. Stop adding a separate
   'call_state' field onto the call object(!)
 * Better reflection of the actual state of the call in the call bar,
   so when it's connecting, it says connecting, and only says 'active call'
   when the call is actually active.
 * More typey goodness
 2020-10-09 18:56:07 +01:00
Michael Telatynski
b2dc5542b3 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-09 09:00:38 +01:00
Michael Telatynski
317dc68135 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 
 Conflicts:
	src/components/views/elements/AppTile.js
 2020-10-09 08:45:11 +01:00
Michael Telatynski
ada6d1aa46 Iterate PR 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-09 08:42:21 +01:00
Travis Ralston
d38b544a42 Use new preparing event for widget communications 
Fixes https://github.com/vector-im/element-web/issues/15404

We need to make sure we don't accidentally call the widget before its ready, but we can happily show it once it is loaded/prepared.
 2020-10-08 15:35:22 -06:00
Travis Ralston
2cd431db1c Appease the linter 2020-10-08 14:50:17 -06:00
Travis Ralston
d5b264b7a0 Fix parsing issue in event tile preview for appearance tab 
Fixes https://github.com/vector-im/element-web/issues/15419
 2020-10-08 14:21:39 -06:00
Michael Telatynski
177b76d882
Merge pull request #5284 from matrix-org/t3chguy/fix/10353 
Track replyToEvent along with Cider state & history
 2020-10-08 14:59:14 +01:00
Michael Telatynski
b8080a7d2d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 2020-10-08 13:04:59 +01:00
Michael Telatynski
017d2d40fe Update CIDER local and session storage keys to unbrick downgrade compat 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-08 09:51:31 +01:00
J. Ryan Stinnett
779e43b8dd
Merge pull request #5296 from matrix-org/jryans/sso-4s-integration 
Convert auth lifecycle to TS, remove dead ILAG code
 2020-10-07 15:42:42 +01:00
Michael Telatynski
7205e5d2e5
Merge pull request #5295 from matrix-org/t3chguy/fix/15403 
Fix edited replies being wrongly treated as big emoji
 2020-10-07 13:16:46 +01:00
J. Ryan Stinnett
f2b72efe39 Remove various remaining bits of ILAG flows 
TypeScript helpfully pointed me towards this dead code, which has been floating
around unused for a while. If we want to bring back ILAG in the future, we can
always revive it from history.
 2020-10-07 12:53:59 +01:00
Michael Telatynski
8a226781c4 Fix edited replies being wrongly treated as big emoji 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-07 11:08:43 +01:00
Michael Telatynski
dbb011b8f1 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-07 10:53:17 +01:00
Michael Telatynski
0e42fc45e2 Resolve couple of React warnings/errors 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-07 10:40:20 +01:00
Michael Telatynski
29e3881fb3 Iterate design and fix post-merge conflict 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-07 10:36:45 +01:00
Michael Telatynski
c784039cf6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 
 Conflicts:
	src/components/views/right_panel/WidgetCard.tsx
	src/stores/WidgetStore.ts
 2020-10-07 10:04:45 +01:00
Michael Telatynski
430bceb91d
Merge pull request #5281 from matrix-org/t3chguy/fix/9836 
Fix editing and redactions not updating the Reply Thread
 2020-10-07 00:14:56 +01:00
Michael Telatynski
ab518a469f Replace MatrixClientPeg with access to context in SendMessageComposer 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-07 00:09:09 +01:00
Michael Telatynski
35c7ccfcbd
Merge pull request #5282 from matrix-org/t3chguy/fix/15380 
Hide Jump to Read Receipt button for users who have not yet sent an RR
 2020-10-06 22:58:56 +01:00
Michael Telatynski
1bd0d9e02b Iterate 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-06 22:53:34 +01:00
Michael Telatynski
2e45374cf8
Update src/components/views/right_panel/UserInfo.tsx 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-10-06 22:49:50 +01:00
Travis Ralston
3fdefa354e
Merge pull request #5279 from Sorunome/soru/fix-img-rendering 
fix img tags not always being rendered correctly
 2020-10-06 14:36:14 -06:00
Michael Telatynski
6f5f66e255
Merge pull request #5283 from matrix-org/t3chguy/fix/w1 
Fix naive pinning limit and app tile widgetMessaging NPE
 2020-10-06 14:57:46 +01:00
Michael Telatynski
120f269190 Track replyToEvent along with CIDER state & history 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-06 14:47:53 +01:00
Michael Telatynski
55a18b8c2d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15255 
 Conflicts:
	src/components/views/settings/ProfileSettings.js
 2020-10-06 10:51:30 +01:00
Michael Telatynski
17a04f2915 Fix naive pinning limit and app tile widgetMessaging NPE 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-06 10:48:55 +01:00
Michael Telatynski
39c49125ce
Merge pull request #5273 from matrix-org/t3chguy/fix/15323 
Update copy for `redact` permission
 2020-10-06 10:24:26 +01:00
Michael Telatynski
0bb26831ae Hide Jump to Read Receipt button for users who have not yet sent an RR 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-06 08:28:06 +01:00
Michael Telatynski
fbcea7d2cc Fix editing and redactions not updating the Reply Thread 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-06 08:23:48 +01:00
Michael Telatynski
1e34365caa
Merge pull request #5268 from matrix-org/t3chguy/fix/15349 
Fix right panel for peeking rooms
 2020-10-06 00:32:05 +01:00
Michael Telatynski
fdb8cb78f9
Merge pull request #5277 from matrix-org/t3chguy/fix/9551 
Use Own Profile Store for the Profile Settings
 2020-10-05 14:46:12 +01:00
Sorunome
34c15b5221
fix img tags not always being rendered correctly 2020-10-05 09:50:19 +02:00
Michael Telatynski
01031e33cb
Merge pull request #5257 from matrix-org/t3chguy/fix/14112 
Choose first result on enter in the emoji picker
 2020-10-02 22:15:47 +01:00
Michael Telatynski
a6246a7e9f
Merge pull request #5278 from matrix-org/t3chguy/fix/15362 
Decorate failed e2ee downgrade attempts better
 2020-10-02 18:19:05 +01:00
Michael Telatynski
6caf53bd1e
Merge pull request #5262 from matrix-org/t3chguy/fix/15286 
MELS use latest avatar rather than the first avatar
 2020-10-02 18:18:36 +01:00
Michael Telatynski
f01ea32397
Merge pull request #5261 from matrix-org/t3chguy/fix/15279 
Fix Encryption Panel close button clashing with Base Card
 2020-10-02 18:18:20 +01:00
Michael Telatynski
7d11c3092d Decorate failed e2ee downgrade attempts better 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-02 16:38:02 +01:00
Michael Telatynski
d3cbb51ecb Use Own Profile Store for the Profile Settings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-02 15:39:34 +01:00
Travis Ralston
d640490595 Fix iframe reference 2020-10-01 10:03:52 -06:00
Michael Telatynski
c73ef57887 Update copy for redact permission 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-01 15:51:35 +01:00
Michael Telatynski
4bd7ae5131 Show server errors from saving profile settings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-01 15:49:22 +01:00
Michael Telatynski
a9cee7cf70 Fix right panel for peeking rooms 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-01 12:30:41 +01:00
Travis Ralston
2ec94e8a69 Appease the linter 2020-09-30 20:49:31 -06:00
Travis Ralston
f27071ee64 Transition all remaining messaging over (delete the old stuff) 2020-09-30 20:20:31 -06:00
Travis Ralston
9377306b81 Fix the screenshot button on the right panel card 2020-09-30 20:11:27 -06:00
Travis Ralston
b46f58274e Fix the hangup button and other custom actions 2020-09-30 20:09:23 -06:00
Travis Ralston
9b984a35e0 Remove dead AppTile2 2020-09-30 19:58:16 -06:00
Travis Ralston
b710d42832 Fix stickerpicker to use new messaging 2020-09-30 16:12:00 -06:00
Michael Telatynski
23d95df30b Rebuild the room summary card's widgets section 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-30 17:08:41 +01:00
Michael Telatynski
ed30750f63 Extract RoomWidgetContextMenu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-30 15:38:35 +01:00
Travis Ralston
555bcc6010 Document remaining (known) cases to fix 2020-09-29 15:32:18 -06:00
Travis Ralston
fc1cbc668c Get the widget loading again 2020-09-29 14:33:46 -06:00
Travis Ralston
cd93b2c22a First rough cut of cutting AppTile over to the ClientWidgetApi 2020-09-29 14:14:51 -06:00
Travis Ralston
14766e24b8 Merge branch 'develop' into travis/widget-api 2020-09-29 13:18:18 -06:00
Travis Ralston
5534206e77
Merge pull request #5223 from matrix-org/travis/ft-sep1620/04-jitsi-hangup 
Make the hangup button do things for conference calls
 2020-09-29 11:06:21 -06:00
Travis Ralston
36882b85d7
Merge pull request #5222 from matrix-org/travis/ft-sep1620/03-jitsi-obvious 
Render Jitsi widget state events in a more obvious way
 2020-09-29 11:05:40 -06:00
Travis Ralston
a5569303d1 Merge branch 'develop' into travis/ft-sep1620/04-jitsi-hangup 2020-09-29 10:20:02 -06:00
Travis Ralston
c75628844d
Merge pull request #5226 from matrix-org/travis/ft-sep1620/10-pip 
Make the PIP Jitsi look and feel like the 1:1 PIP
 2020-09-29 10:18:30 -06:00
Michael Telatynski
e51136f902
Merge pull request #5263 from matrix-org/t3chguy/fix/15310 
Trim range when formatting so that it excludes leading/trailing spaces
 2020-09-29 17:07:49 +01:00
Michael Telatynski
76a9803c6c Fix button label on the Set Password Dialog 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-29 14:24:01 +01:00
Michael Telatynski
ffa7ceb70e Trim range when formatting so that it excludes leading/trailing spaces 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-29 14:15:20 +01:00
Michael Telatynski
0f10ffa3c5 fix sequence sorting 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-29 11:09:17 +01:00
Michael Telatynski
48d9aa2c3e MELS use latest avatar rather than the first avatar 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-29 10:53:04 +01:00
Michael Telatynski
8a9d38b702 convert MemberEventListSummary and ELS to Typescript 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-29 10:51:48 +01:00
Michael Telatynski
c4ee8e4a6c Fix Encryption Panel close button clashing with Base Card 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-29 10:11:04 +01:00
Michael Telatynski
f945155d04 Convert UserInfo to Typescript 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-29 10:10:32 +01:00
Travis Ralston
78a04a6106 Remove unused prop 2020-09-28 21:23:55 -06:00
Travis Ralston
6b2e34dc00 Fix export 2020-09-28 21:14:50 -06:00
Travis Ralston
3e8d7b172f Merge branch 'develop' into travis/widget-api 2020-09-28 21:08:08 -06:00
Daniel Maslowski
43ff97c178 Add support for giving reason when redacting 
Signed-off-by: Daniel Maslowski <info@orangecms.org>
 2020-09-28 23:29:33 +02:00
Travis Ralston
9df175212e Merge branch 'develop' into travis/ft-sep1620/04-jitsi-hangup 2020-09-28 13:43:47 -06:00
Travis Ralston
42955856d5 Merge branch 'develop' into travis/ft-sep1620/03-jitsi-obvious 2020-09-28 13:41:48 -06:00
Travis Ralston
4ea3376abf WIP on AppTile2 transformation 2020-09-28 13:34:13 -06:00
Michael Telatynski
330337c993 Disable autocompletion on security key input during login 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-28 16:25:23 +01:00
Michael Telatynski
abd7bf37f4 Choose first result on enter in the emoji picker 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-28 15:56:22 +01:00
Michael Telatynski
6873402666 Convert emojipicker to typescript 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-28 15:48:05 +01:00
Michael Telatynski
290ef5e652 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets 
 Conflicts:
	src/@types/global.d.ts
 2020-09-28 12:47:47 +01:00
Michael Telatynski
13d09df7d7 tidy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-28 11:59:39 +01:00
Michael Telatynski
30d2e61a0d Continuation 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-28 10:50:31 +01:00
Matthew Hodgson
45e5903226 fix uninitialised state and eventlistener leak 2020-09-27 21:48:36 +01:00
David Baker
585c7637d6
Merge pull request #5248 from matrix-org/dbkr/callhandler_to_ts 
Convert CallHandler to typescript
 2020-09-25 15:52:21 +01:00
Michael Telatynski
e3b0bf1915 Fix url encoding issue for modal widgets widgetId 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-25 15:03:54 +01:00
Michael Telatynski
fbbba75f81 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets 2020-09-25 14:31:44 +01:00
Michael Telatynski
44bc8fc67e Initial Modal Widget work tweaks MSC2790 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-25 14:08:27 +01:00
David Baker
8962f7ae9e Convert CallHandler to typescript 
and remove the old conference call stuff while we're at it: enough
time should have passed since those mistakes that we can move on.
The old conference call rooms will still appear for anyone whose
account dates back to that time, but they've presumably been appearing
in any other matrix client they used too.
 2020-09-24 16:16:20 +01:00
Travis Ralston
2d46ca1d15
Merge pull request #5243 from matrix-org/travis/workflow/design/sep2120 
Rework profile area for user and room settings to be more clear
 2020-09-24 08:39:01 -06:00
Travis Ralston
a2860e698a Clean up other unlinted lint issues 2020-09-24 08:26:59 -06:00
Michael Telatynski
1fb4d22233
Merge pull request #5241 from matrix-org/t3chguy/fix/14724 
Validation improve pattern for derived data
 2020-09-23 17:03:32 +01:00
Michael Telatynski
f699be971e Prepare AppTile to be usable outside of rooms for User Widgets 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-23 11:02:41 +01:00
Travis Ralston
09dd3cea08
Merge pull request #5225 from matrix-org/travis/ft-sep1620/09-enc-files 
Add a note to use the desktop builds when seshat isn't available
 2020-09-22 10:25:34 -06:00
Travis Ralston
3e0cbd7bfe Appease the linters 2020-09-21 21:09:46 -06:00
Travis Ralston
4f983ad9a1 Rework profile sections of user and room settings 
Mostly by design request. Some is freehand, to be reviewed.
 2020-09-21 21:00:51 -06:00
Travis Ralston
342f1d5b43 Extremely bad support for "temporary widgets" 2020-09-21 14:36:24 -06:00
Michael Telatynski
c1d9d96702
Merge pull request #5234 from matrix-org/t3chguy/fix/15192 
Only show User Info verify button if the other user has e2ee devices
 2020-09-21 17:09:29 +01:00
Michael Telatynski
ed0e188b4f Validation improve pattern for derived data 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-21 14:35:35 +01:00
Michael Telatynski
42cdf4b7c9 fix undefined devices case 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-21 13:57:33 +01:00
Travis Ralston
07f46fa3ec
Merge pull request #5238 from matrix-org/travis/uifeat/paranoia 
Add a UI feature to disable advanced encryption options
 2020-09-18 15:06:20 -06:00
Michael Telatynski
02f58edd74 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15182 2020-09-18 19:30:42 +01:00
Michael Telatynski
2492041ee4
Merge pull request #5236 from matrix-org/t3chguy/fix/15237 
Rename apps back to widgets
 2020-09-18 19:04:34 +01:00
Travis Ralston
5630f35715 Add a UI feature to disable advanced encryption options 2020-09-18 11:33:02 -06:00
Michael Telatynski
6f7d6f27f1 move the check 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-18 18:15:05 +01:00
Travis Ralston
4ef4e67642
Merge pull request #5229 from matrix-org/travis/workflow/design/sep1720 
Adjust layout and formatting of notifications / files cards
 2020-09-18 11:11:35 -06:00
Travis Ralston
189233447b Merge branch 'develop' into t3chguy/fix/15182 2020-09-18 11:06:32 -06:00
Michael Telatynski
84f0a610a9
Merge pull request #5232 from matrix-org/t3chguy/fix/15229 
Fix Search Results Tile undefined variable access regression
 2020-09-18 18:03:08 +01:00
Travis Ralston
8838bd724b Update copy for files 2020-09-18 10:58:17 -06:00
Travis Ralston
870c35be6f Merge branch 'develop' into travis/ft-sep1620/09-enc-files 2020-09-18 10:56:20 -06:00
Michael Telatynski
949b8d9afe Rename apps back to widgets 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-18 16:35:42 +01:00
Travis Ralston
46f6c140e6
Merge pull request #5231 from matrix-org/travis/e2e-default-serverside 
Disable the e2ee toggle when creating a room on a server with forced e2e
 2020-09-18 07:50:45 -06:00
Michael Telatynski
adcb75facb Only show User Info verify button if the other user has e2ee devices 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-18 14:34:51 +01:00
Michael Telatynski
5a6ab95f84
Merge pull request #5215 from matrix-org/t3chguy/fix/15179 
UI Feature Flag: Disable advanced options and tidy up some copy
 2020-09-18 12:34:38 +01:00
Michael Telatynski
de1d9e0e09 Fix Search Results Tile undefined variable access regression 2020-09-18 12:15:56 +01:00
Michael Telatynski
9dbc1dbc85 Hide Advanced Appearance Settings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-18 11:34:35 +01:00
Michael Telatynski
687a2e56b2 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15179 
 Conflicts:
	src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
	src/settings/Settings.ts
	src/settings/UIFeature.ts
 2020-09-18 11:29:38 +01:00
Michael Telatynski
598c982f02 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/15187 
 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts
 2020-09-18 11:14:36 +01:00
J. Ryan Stinnett
ec4bf0c057
Merge pull request #5219 from matrix-org/jryans/defer-cross-signing-setup 
Defer encryption setup until first E2EE room
 2020-09-18 10:28:33 +01:00
Travis Ralston
38f8c0a835 Disable the e2ee toggle when creating a room on a server with forced e2e 
Fixes https://github.com/vector-im/element-web/issues/15186
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1470
 2020-09-17 22:46:01 -06:00
Travis Ralston
14a7b83988 Don't show a bottom border ahead of the date separator 2020-09-17 10:40:48 -06:00
Travis Ralston
24d0950b7e Adjust layout and formatting of notifications / file cards 
This follows some polish time with a designer.

The placeholder text on the two panels was tracking up/down when the width was changed. This is fixed by adjusting some of the flexbox properties to center it more safely. 

We also spent some time making the notifications panel more legible while we wait for the overhaul to land.
 2020-09-17 09:23:06 -06:00
Michael Telatynski
c904b4f416 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15178 
 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts
 2020-09-17 14:10:51 +01:00
Michael Telatynski
c1cf8db78f Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15181 
 Conflicts:
	src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
	src/i18n/strings/en_EN.json
	src/settings/Settings.ts
	src/settings/UIFeature.ts
 2020-09-17 13:55:11 +01:00
Michael Telatynski
ae44a6d1fa Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15180 
 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts
 2020-09-17 13:42:27 +01:00
Michael Telatynski
1e9e0dee87
Merge pull request #5227 from matrix-org/t3chguy/fix/15188 
UI Feature Flag: Registration, Password Reset, Deactivate
 2020-09-17 13:40:06 +01:00
Michael Telatynski
5bf6697e48 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15178 
 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts
 2020-09-17 13:31:00 +01:00
Michael Telatynski
eda2dee63f UI Feature Flag: 3PIDs 2020-09-17 13:25:18 +01:00
Michael Telatynski
4213a557f2 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15175 
 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts
 2020-09-17 11:58:26 +01:00
Michael Telatynski
d340dd58d1 UI Feature Flag: Registration, Password Reset, Deactivate 2020-09-17 11:55:10 +01:00
Travis Ralston
8129333dcc Make the PIP Jitsi look and feel like the 1:1 PIP 
* Similar sizing
* Fix pointers so the jitsi widget doesn't feel clickable when it's not
  * We might want to introduce click-to-visit-room for the Jitsi widget (like the 1:1 call), however the Jitsi widget has many more controls to worry about
* Remove the menu bar from the widget to avoid accidents
 2020-09-16 22:38:12 -06:00
Travis Ralston
c3a3754432 Appease the linter 2020-09-16 17:27:45 -06:00
Travis Ralston
e52a02d733 Appease the linter 2020-09-16 17:26:00 -06:00
Travis Ralston
bfbbf44dfc Add a note to use the desktop builds when seshat isn't available 
Fixes https://github.com/vector-im/element-web/issues/15184

This is currently temporary design for https://github.com/vector-im/element-web/issues/12896 but does not fix it.
 2020-09-16 17:23:37 -06:00
Travis Ralston
dca48b984f Be more sane 2020-09-16 15:47:06 -06:00
Travis Ralston
959b8dd314 de-state 2020-09-16 14:59:40 -06:00
Travis Ralston
f412f8defe Change copy if the widget is unpinned 2020-09-16 14:59:15 -06:00
Travis Ralston
1ffc6d5bd3 Make the hangup button do things for conference calls 
Behaviour constraints:
* If you're not in the conference, use a grey button that does nothing.
* If you're in the conference, show a button:
  * If you're able to modify widgets in the room, annotate it in the context of ending the call for everyone and remove the widget. Use a confirmation dialog.
  * If you're not able to modify widgets in the room, hang up.

For this we know that persistent Jitsi widgets will mean that the user is in the call, so we use that to determine if they are actually participating.
 2020-09-16 14:35:55 -06:00
Travis Ralston
b4af0140d4 Render Jitsi widget state events in a more obvious way 
A clear improvement to this would be to include join/leave buttons in the tiles, however this is currently deferred.
 2020-09-16 12:38:47 -06:00
Michael Telatynski
4db9ac16b5
Merge pull request #5211 from matrix-org/t3chguy/fix/15173 
Hide Analytics sections if piwik config is not provided
 2020-09-16 16:34:55 +01:00
Michael Telatynski
93323febcb undo change 2020-09-16 16:10:24 +01:00
Michael Telatynski
c11abb74e0 UI Feature Flag: Share dialog QR code and social icons 2020-09-16 16:06:17 +01:00
Michael Telatynski
4d15a44d61
Merge pull request #5220 from matrix-org/t3chguy/fix/15202 
Clean up UserInfo to not show a blank Power Selector for users not in room
 2020-09-16 16:04:15 +01:00
Michael Telatynski
4e2b6c2a30
Merge pull request #5212 from matrix-org/t3chguy/fix/15172 
Also hide bug reporting prompts from the Error Boundaries
 2020-09-16 15:59:07 +01:00
Michael Telatynski
06c4abd65e Clean up UserInfo to not show a blank Power Selector for users not in room 2020-09-16 15:23:08 +01:00
Michael Telatynski
feb37878d8 tidy 2020-09-16 15:04:13 +01:00
J. Ryan Stinnett
550a53e49c Check cross-signing cached keys when showing setup button 2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
0d25f62a9a Tweak diagnostics for session backup key 2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
26b465f1fd Remove room recovery reminder 
The Secure Backup toast replaces this with better UX.

Part of https://github.com/vector-im/element-web/issues/13895
 2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
46f37fb969 Create cross-signing keys during authentication 
With this change, Element now creates cross-signing keys during auth flows for
password login. For other auth flows like token / SSO, it will not happen until
a cross-signing / secret storage dialog flow as before.
 2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
7be27e70c9 Add component key to actions array 2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
685878a101 Clarify diagnostic about keys in storage 
Part of https://github.com/vector-im/element-web/issues/13895
 2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
3259ab1f25 Place cross-signing action buttons on a single row 
Part of https://github.com/vector-im/element-web/issues/13895
 2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
7bd5e3fa31 Move security-related dialogs to a common directory 2020-09-16 15:03:06 +01:00
Michael Telatynski
aa25bad689 tidy 2020-09-16 14:57:46 +01:00
Michael Telatynski
1c44f15d2d i18n 2020-09-16 14:54:30 +01:00
Michael Telatynski
d3c84e25f5 UI Feature Flag: Identity server 2020-09-16 14:45:34 +01:00
Michael Telatynski
d1070c05dd UI Feature Flag: Disable VoIP 2020-09-16 13:40:27 +01:00
Michael Telatynski
2bea8457e9 UI Feature Flag: Communities 2020-09-16 12:56:40 +01:00
Michael Telatynski
7a448be1dc UI Feature Flag: Disable advanced options and tidy up some copy 2020-09-16 12:14:33 +01:00
Michael Telatynski
f4f94e31d1 UI Feature Flag: Disable integrations entry UI 2020-09-16 11:38:50 +01:00
Michael Telatynski
9cc789756b UI Feature Flag: Hide flair 2020-09-16 11:26:15 +01:00
Michael Telatynski
caef9b27a0 Also hide bug reporting prompts from the Error Boundaries 2020-09-16 10:50:53 +01:00
Michael Telatynski
d990986407 Also hide Privacy heading in settings and fix React Key warning 2020-09-16 10:37:15 +01:00
Michael Telatynski
771ab82598 Hide Analytics sections if piwik config is not provided 2020-09-16 10:29:21 +01:00
Travis Ralston
3d9c520af8
Merge pull request #5201 from matrix-org/travis/3pid-invites 
Tactical improvements to 3PID invites
 2020-09-15 10:42:55 -06:00
Michael Telatynski
6f0f427ef4
Merge pull request #5210 from matrix-org/t3chguy/fix/15172 
If no bug_report_endpoint_url, hide rageshaking from the App
 2020-09-15 16:23:48 +01:00
Travis Ralston
88115b4f46
Merge pull request #5208 from matrix-org/travis/ui-func/base 
Introduce a concept of UI features, using it for URL previews at first
 2020-09-15 08:53:48 -06:00
Travis Ralston
246b802206 Merge branch 'develop' into travis/3pid-invites 2020-09-15 08:53:32 -06:00
Michael Telatynski
6c166f0560 If no bug_report_endpoint_url, hide rageshaking from the App 2020-09-15 15:49:25 +01:00
Travis Ralston
f4f30a3274 Introduce a concept of UI features, using it for URL previews at first 
Fixes https://github.com/vector-im/element-web/issues/15176

This is effectively the base for all of https://github.com/vector-im/element-web/issues/15185
 2020-09-14 22:28:02 -06:00
Travis Ralston
b177843e45 Remove defunct "always show encryption icons" setting 
It doesn't do anything in practice.

Fixes https://github.com/vector-im/element-web/issues/8725
 2020-09-14 22:03:54 -06:00
Travis Ralston
61e8d3e3d7 Merge branch 'develop' into travis/3pid-invites 2020-09-14 11:50:08 -06:00
Michael Telatynski
e32cb175cb Fix Bridges tab crashing when the room does not have bridges 2020-09-14 15:44:00 +01:00
Travis Ralston
763309ae80 Show a spinner when processing a registration email confirmation 
See comment enclosed
 2020-09-11 20:58:10 -06:00
Travis Ralston
77f8c48dc4
Merge pull request #5195 from matrix-org/travis/iconography-update 
Show verification status in the room summary card
 2020-09-11 09:12:46 -06:00
Travis Ralston
8862b8298c Use hooks better 2020-09-11 09:04:06 -06:00
David Baker
07693b71b1
Merge pull request #5194 from matrix-org/dbkr/dont_unpin_persistent_widgets 
Don't show 'unpin' for persistent widgets
 2020-09-11 09:53:09 +01:00
J. Ryan Stinnett
e7e6bc93ec
Merge pull request #5182 from matrix-org/jryans/defer-cross-signing-setup 
Split up cross-signing and secure backup settings
 2020-09-11 09:41:40 +01:00
Travis Ralston
4cb7381d03 Show verification status in the room summary card 
Fixes https://github.com/vector-im/element-web/issues/15143

Colours are the same for both light and dark theme.
 2020-09-10 13:53:42 -06:00
David Baker
b7058a33ad lint 2020-09-10 14:37:44 +01:00
David Baker
eeb4c5696f Don't show 'unpin' for persistent widgets 
This will mostly fix https://github.com/vector-im/element-web/issues/15139
although it could still break in a race condition.
 2020-09-10 14:30:35 +01:00
Matthew Hodgson
89d05ac952 bring back 1.2M style badge counts rather than 99+ 2020-09-10 13:51:34 +01:00
Travis Ralston
a765db8977
Merge pull request #5189 from matrix-org/travis/rageshake-fix 
Run the rageshake command through the bug report dialog
 2020-09-09 15:08:43 -06:00
Travis Ralston
9b5823cccb Run the rageshake command through the bug report dialog 
Ideally we encourage users to give us information like a github issue or options to download their logs.
 2020-09-09 14:53:38 -06:00
Travis Ralston
0a7090dd64 Account for via in pill matching regex 
Fixes https://github.com/vector-im/element-web/issues/15133

Regression first appeared in a80bcaa292

This also affects room IDs.
 2020-09-09 14:36:35 -06:00
David Baker
62556c2afe
Merge pull request #5184 from matrix-org/dbkr/always_allow_local_widgets 
Always allow widgets when using the local version
 2020-09-09 15:52:31 +01:00
David Baker
f9079975a1 write correct jsdoc 2020-09-09 15:42:25 +01:00
David Baker
99b0a0a78e Always allow widgets when using the local version 
Since we're not loading the widget URL, there's no need to ask
for permission to load it: it's just another part of the app.
 2020-09-09 15:35:05 +01:00
J. Ryan Stinnett
0219824d6f Merge remote-tracking branch 'origin/develop' into jryans/defer-cross-signing-setup 2020-09-09 14:13:23 +01:00
J. Ryan Stinnett
6d1b1d9460 Fix linting error 2020-09-09 14:12:36 +01:00
Michael Telatynski
0e58eb6d56 Update initial widget height 2020-09-09 13:15:07 +01:00
Michael Telatynski
8d66dce68d Update copy and use svg for ellipsis 2020-09-09 12:50:48 +01:00
Michael Telatynski
b635598bc3 Attempt to fix tests and fix RoomSummaryCard having wrong member count 2020-09-09 12:28:12 +01:00
Michael Telatynski
37c0d524bc re-order top right buttons 2020-09-09 11:06:15 +01:00
Clemens Zeidler
db61d343f5 Add option to send/edit a message with Ctrl + Enter / Command + Enter 
When editing multi-line text this option helps to prevent accidentally
sending a message too early. With this option, Enter just inserts a new
line.

For example, composing programming code in a dev chat becomes much
easier when Enter just inserts a new line instead of sending the
message.

Signed-off-by: Clemens Zeidler <clemens.zeidler@gmail.com>
 2020-09-09 19:27:11 +12:00
Michael Telatynski
517b594edc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785.1 
 Conflicts:
	src/components/structures/RightPanel.js
 2020-09-08 18:04:24 +01:00
J. Ryan Stinnett
bbe2084f66 Add independent set up / reset actions in Settings 
This adds set up and reset actions to each of cross-signing and secure backup
that do separate things, rather than mixing concerns together. (It's temporarily
still a bit of lie for backup, as more changes are needed to stop resetting
cross-signing as well.)
 2020-09-08 18:01:56 +01:00
Michael Telatynski
12a6bc8231 update copy 2020-09-08 18:00:21 +01:00
Michael Telatynski
596060c506 fix alignments and iterate PR 2020-09-08 17:57:08 +01:00
Michael Telatynski
27a65fff2b null-guard roomId in RightPanel and pass Room to UserView 2020-09-08 17:34:32 +01:00
Michael Telatynski
b982bf87b5 delint 2020-09-08 16:33:55 +01:00
Michael Telatynski
8d14d26e2b do the todos 2020-09-08 16:27:09 +01:00
Michael Telatynski
4a4a8cd611 styling and fix i button behaviour 2020-09-08 15:43:40 +01:00
Michael Telatynski
ef0843d4ad Iterate to match design 2020-09-08 15:43:40 +01:00
Michael Telatynski
98b59fb217 Consolidate all the work thus far 2020-09-08 15:43:38 +01:00
Michael Telatynski
31cca5e0f2 Create new right panel cards 2020-09-08 15:42:31 +01:00
Michael Telatynski
2527344294 Create name/title Widget utils 2020-09-08 15:42:31 +01:00
J. Ryan Stinnett
aae68f7d1a Move 4S status to backup panel 
This moves the various 4S status diagnostics to the backup panel and out of the
cross-signing panel. The available actions are unchanged as part of this commit,
but they will be updated next.
 2020-09-08 15:26:59 +01:00
J. Ryan Stinnett
2fbb551035 Put backup details in a table 2020-09-08 15:26:59 +01:00
Michael Telatynski
87b72de25f
Merge pull request #5176 from matrix-org/t3chguy/dpsah/6785.4 
Fix WatchManager for global room watchers and tidy widget code a little
 2020-09-08 15:24:10 +01:00
Jason Robinson
75518254fb
Merge pull request #5173 from matrix-org/jaywink/jitsi-openidjwt-auth 
Support creation of Jitsi widgets with "openidtoken-jwt" auth
 2020-09-08 17:16:50 +03:00
Michael Telatynski
99cd2dceec Fix create-react-class regression. 
Can't call setState in c'tor
 2020-09-08 12:07:24 +01:00
Michael Telatynski
48d9c94c88 Extract editWidget into WidgetUtils 2020-09-08 11:12:14 +01:00
Michael Telatynski
667c129ebc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785 
 Conflicts:
	src/components/structures/ScrollPanel.js
	src/components/views/rooms/AppsDrawer.js
 2020-09-07 14:33:57 +01:00
J. Ryan Stinnett
217f145910 Switch to imports in backup panel 2020-09-04 13:56:28 +01:00
J. Ryan Stinnett
b484bc5e09 Rearrange backup status to always have advanced 2020-09-04 13:56:28 +01:00
J. Ryan Stinnett
19e9e0137c Reorganise backup panel so feature description is always present 
This ensure the feature description is always shown at the top.
 2020-09-04 13:56:28 +01:00
J. Ryan Stinnett
e3f47525e5 Rename backup CSS classes 2020-09-04 13:56:28 +01:00
J. Ryan Stinnett
46bc6b1d14 Rename key backup to secure backup 2020-09-04 13:56:28 +01:00
J. Ryan Stinnett
7b1031d6a6
Merge pull request #5169 from matrix-org/jryans/defer-cross-signing-setup 
Prep work for Settings changes with cross-signing deferral
 2020-09-04 12:51:25 +01:00
Michael Telatynski
a713c9763b
Merge pull request #5168 from matrix-org/t3chguy/dpsah/6785.2 
Small code clean ups and tweaks
 2020-09-04 12:25:46 +01:00
Michael Telatynski
f28c396b1e Fix HeaderButtons handler bindings 2020-09-04 12:14:43 +01:00
Jason Robinson
13dbfa6b85 Remove debug statement 2020-09-04 12:44:43 +03:00
Jason Robinson
baa6d8a294 Correctly template in Jitsi widget auth if such exists 
Also add roomId to the widget data and URL template. It's needed by
the Element Web Jitsi code to produce auth for the Jitsi backend.
 2020-09-04 12:42:46 +03:00
Michael Telatynski
6d811734f4 Fix soft crash from TruncatedList in the createReactClass conversion 2020-09-04 09:24:12 +01:00
Michael Telatynski
e624ce11b4
Merge pull request #5157 from matrix-org/t3chguy/crc1 
Remove create-react-class
 2020-09-03 17:21:58 +01:00
J. Ryan Stinnett
4ef3ef40db Change to import 2020-09-03 16:47:56 +01:00
Michael Telatynski
368571bcff Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785.2 2020-09-03 16:07:37 +01:00
Michael Telatynski
97ebfa02c3
Merge pull request #5162 from matrix-org/t3chguy/lodash 
Consolidate Lodash files in bundle
 2020-09-03 15:54:43 +01:00
J. Ryan Stinnett
da6cc5c2e9 Tweak Security settings section headers 
This brings us slightly closer to the version Design is working from in terms of
section naming.

Prep for https://github.com/vector-im/element-web/issues/13895
 2020-09-03 15:41:17 +01:00
Michael Telatynski
280690cf3c use useIsEncrypted hook in UserInfo 2020-09-03 15:07:10 +01:00
Michael Telatynski
ad9be61477 Move HeaderButtons to an abstract class 2020-09-03 15:05:24 +01:00
Michael Telatynski
c7e40d0751 Fix MemberAvatar props interface 2020-09-03 15:05:10 +01:00
J. Ryan Stinnett
fb2bde94fa Rename CrossSigningManager to SecurityManager 
The file encompasses bits of cross-signing and also secret storage / secure
backup.
 2020-09-03 14:50:49 +01:00
J. Ryan Stinnett
7efa9ba77d Fix DOM nesting error in cross-signing panel 
The spinner can't be inside a `<p>` element. This also changes to block spinner
to match key backup.
 2020-09-03 13:23:50 +01:00
Michael Telatynski
24006588d5 iterate PR 2020-09-03 10:34:19 +01:00
Travis Ralston
03588f8450
Merge pull request #5161 from matrix-org/travis/communities/proto/userinfo 
Communities v2 prototype: "In community" view
 2020-09-02 10:50:07 -06:00
Michael Telatynski
8484422c55
Merge pull request #5165 from matrix-org/t3chguy/fix/15080 
Respect user preference for whether pills should have an avatar or not
 2020-09-02 17:45:34 +01:00
Michael Telatynski
beb77799f6 Respect user preference for whether pills should have an avatar or not 2020-09-02 17:26:23 +01:00
Travis Ralston
9b12355b2a Appease the linter 2020-09-02 08:59:24 -06:00
Michael Telatynski
cffe902504 Add feature to ResizeNotifier to maintain isResizing state and use it to skip onScroll handling 2020-09-02 12:00:35 +01:00
Michael Telatynski
6178b3c0e2 Wire up resizeNotifier 2020-09-02 11:13:00 +01:00
Michael Telatynski
243af3c9f2 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785 2020-09-02 09:27:06 +01:00
Travis Ralston
92c184385c Merge branch 'develop' into travis/communities/proto/userinfo 2020-09-01 10:51:42 -06:00
Travis Ralston
afec470ec3 Merge branch 'develop' into travis/copy2 2020-09-01 10:50:58 -06:00
Michael Telatynski
7c4a84aae0
Merge pull request #5155 from matrix-org/t3chguy/lint-ts 
Fix eslint ts override tsx matching and delint
 2020-09-01 16:44:22 +01:00
Michael Telatynski
d668f8018b undo some delint 2020-09-01 15:59:19 +01:00