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

28036 commits

This branch
This branch
All branches
Author SHA1 Message Date
Clemens Zeidler
9031c58aeb Make settings label platform specific 2020-09-09 19:27:11 +12: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
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
15aafa019d
Merge pull request #5178 from matrix-org/t3chguy/crc.2 
Fix create-react-class regression.
 2020-09-08 17:27:51 +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
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
Michael Telatynski
a80bcaa292
Merge pull request #5174 from matrix-org/t3chguy/fix/15100 
Fix permalink local linkification to not strip via servers
 2020-09-08 15:23:38 +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
1b99c11b11 tidy 2020-09-08 15:09:45 +01:00
Michael Telatynski
5c3c8cfb06 Make Travis an ounce happier 2020-09-08 15:07:16 +01:00
Michael Telatynski
73b8493fe8
Merge pull request #5177 from matrix-org/t3chguy/fix/15115 
Fix create-react-class regression.
 2020-09-08 15:03:03 +01:00
Travis Ralston
5c878ddfdd
Merge pull request #5172 from matrix-org/travis/widgets/msc1960-1 
Update openid_credentials Widget API action for MSC1960 updates
 2020-09-08 07:20:35 -06: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
b75e2aa299 WidgetEchoStore improve update event to include roomId and widgetId 2020-09-08 11:01:55 +01:00
Michael Telatynski
07f7ff6831 Fix WatchManager global room watchers 2020-09-08 11:01:36 +01:00
Jason Robinson
3af0d33e3b Make a few fields readonly 
As they're only set in the constructor.
 2020-09-08 13:00:00 +03:00
Jason Robinson
c19336591e Add OpenID token request flow to WidgetApi 
As per MSC1960.
 2020-09-08 12:59:05 +03:00
Michael Telatynski
d0c716d61c Fix permalink local linkification to not strip via servers 2020-09-08 10:26:37 +01:00
Michael Telatynski
ddba5c6223
Merge pull request #5138 from matrix-org/t3chguy/dpsah/6785 
Allow persistent resizing of the widget app drawer
 2020-09-08 09:47:11 +01:00
Jason Robinson
4b43e39d2a Code review related changes 
* drop room ID from jitsi widget data
* reame queryParts variable
 2020-09-08 11:31:40 +03:00
Jason Robinson
d2e9ea58fd Add links to prosody openidtoken-jwt auth docs 2020-09-07 19:22:40 +03: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
Michael Telatynski
80b22d1f82
Merge pull request #5158 from dkanada/patch-1 
add lenny face command
 2020-09-07 14:28:40 +01:00
Jason Robinson
ae83222d52 Add GetOpenIDCredentials constant to WidgetApi 2020-09-07 14:32:00 +03:00
Travis Ralston
db1eb89552 MSC numbers are hard to remember 2020-09-05 15:10:28 -06:00
Travis Ralston
355d8f5843 Update openid_credentials Widget API action for MSC1960 updates 
We now need to send a `state` and `original_request_id` per MSC1960's recent adjustments
 2020-09-05 15:06:31 -06: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
4b748b41ca
Merge pull request #5170 from matrix-org/t3chguy/fix/15091 
Fix soft crash from TruncatedList in the createReactClass conversion
 2020-09-04 09:46:00 +01:00
Michael Telatynski
6d811734f4 Fix soft crash from TruncatedList in the createReactClass conversion 2020-09-04 09:24:12 +01:00
Jason Robinson
a511ad6633 Add (potential) Jitsi auth type to widget data 
So we don't have to fetch the auth type when joining
the conference.
 2020-09-04 10:20:58 +03:00
Jason Robinson
680de2af95 Create Jitsi "openidtoken-jwt" auth compatible conference ID's 
If the Jitsi server we're using for a Jitsi conference call has auth of
"openidtoken-jwt" then instead of a random human readable room ID, encode
the room ID in base32 (without padding). This can then be decoded back to
the room ID on the Jitsi end of things.
 2020-09-04 10:05:47 +03:00
Jason Robinson
db2e1a9cd0 Add rfc4648 (base64/32/16) encoder to dependencies 2020-09-04 10:04:18 +03:00
Jason Robinson
5d8a082eb1 Add Jitsi auth check 
Checks for auth needed by looking up a well-known file from the preferred Jitsi domain. No file existing will assume no auth.
 2020-09-04 10:03:30 +03: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
3a8499259e factor out the useIsEncrypted hook 2020-09-03 15:06:41 +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