nikrozman/element-web
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity
28,055 Commits 258 Branches 582 Tags
517b594edc56e193db0200751601ecf58ca75168
Commit Graph

11642 Commits

Author SHA1 Message Date
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
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
83c2ae2479 Merge pull request #5180 from matrix-org/t3chguy/fix/15123 
null-guard roomId in RightPanel and pass Room to UserView
 2020-09-08 17:46:02 +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
8d03799ffe Fix create-react-class regression. 
Can't call setState in c'tor
 2020-09-08 16:51:55 +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
8f94a42daf Update Right Panel phase recall behaviour 2020-09-08 15:42:31 +01:00
Michael Telatynski
2527344294 Create name/title Widget utils 2020-09-08 15:42:31 +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
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
Michael Telatynski
05c3f5c381 remove redundant key 2020-09-03 17:05:33 +01:00
J. Ryan Stinnett
4ef3ef40db Change to import 2020-09-03 16:47:56 +01:00
Michael Telatynski
bdfb77077a Fix RightPanel propTypes 2020-09-03 16:08:10 +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
6d4de4d22b tidy up ScrollPanel comments 2020-09-03 15:05:35 +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
Michael Telatynski
1479690ac4 RightPanel use room instead of roomId 2020-09-03 15:03:47 +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