imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
29703 commits 222 branches 563 tags 470 MiB
Commit graph

12164 commits

Author SHA1 Message Date
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
Michael Telatynski
a1f1334250 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785.3 
 Conflicts:
	src/components/structures/RoomView.tsx
 2020-09-09 15:16:19 +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
Michael Telatynski
29c2a0ef35 Fix FilePanel and NotificationPanel overscroll issues 2020-09-09 09:50:08 +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
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
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
Michael Telatynski
9d85d0436c iterate PR 2020-09-08 15:22:23 +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
3bc42d7470 delint 2020-09-08 11:05:33 +01:00
Michael Telatynski
906d4defd5 Convert RoomView and RoomContext to TS 2020-09-08 10:52:37 +01:00
Michael Telatynski
6a304ce16e Remove ancient RoomView props.eventPixelOffset 2020-09-08 10:52:27 +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
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