mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 23:31:30 +03:00
Code Issues Projects Releases Packages Wiki Activity
29180 commits 219 branches 562 tags 474 MiB
Commit graph

8715 commits

Author SHA1 Message Date
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
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