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

87 commits

Author SHA1 Message Date
Michael Telatynski
0e51fcc761 Fix pinning event in a room which hasn't had events pinned in before 2021-06-23 21:12:25 +01:00
Šimon Brandner
903f898bee
Remove ComposerInsertPayload as this is a JS file 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-21 18:28:30 +02:00
Michael Telatynski
f38cd38bd3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/12740 
 Conflicts:
	src/components/structures/TimelinePanel.js
	src/components/views/context_menus/MessageContextMenu.js
	src/components/views/right_panel/UserInfo.tsx
	src/dispatcher/actions.ts
 2021-06-17 15:31:06 +01:00
Robin Townsend
a06306d560 Merge branch 'develop' into improved-forwarding-ui 2021-06-05 11:04:17 -04:00
Michael Telatynski
83d223475b delint imports 2021-06-03 08:41:22 +01:00
Robin Townsend
c78167977a Remove unused class 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-01 17:57:26 -04:00
Michael Telatynski
1ff870927a When pinning a message automatically mark it as read 2021-05-26 15:40:24 +01:00
Michael Telatynski
1ffbaee560 update style of imports in all modified files 2021-05-26 14:14:55 +01:00
Michael Telatynski
4a5c634d82 Iterate PR 2021-05-24 22:02:50 +01:00
Michael Telatynski
d8acc0612a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/12740 
 Conflicts:
	src/components/views/rooms/EditMessageComposer.js
	src/components/views/rooms/SendMessageComposer.js
 2021-05-24 21:57:38 +01:00
Robin Townsend
121ed5eba9 Pass Matrix client around as matrixClient 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-24 08:51:04 -04:00
Robin Townsend
6ced61b709 Use camelCase 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-24 08:34:03 -04:00
Robin Townsend
c39d9649ba Merge branch 'develop' into improved-forwarding-ui 2021-05-10 13:38:02 -04:00
Robin Townsend
100efb1a90 Fix ForwardDialog crashing when rendering reply 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-10 00:40:54 -04:00
Robin Townsend
219c983d19 Use import instead of sdk.getComponent 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-09 10:58:44 -04:00
Robin Townsend
b9b237fc9a Replace forwarding UI with dialog 
Replaces the old forwarding UI with a dialog based on designs from
https://github.com/vector-im/element-web/issues/14690.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-08 21:11:06 -04:00
Robin Townsend
119c14c3f9 Forbid redaction of encryption events 
Redacting m.room.encryption events will leave the room in a broken
state, and so we shouldn't allow the user to do this.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-07 12:49:37 -04:00
Šimon Brandner
46bfbbadf9
Enable indent rule and fix indent 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-27 17:23:27 +02:00
Travis Ralston
c5dd6b4dfb Update action bar to incorporate sending states 
This moves most of them out of the context menu.
 2021-04-21 16:24:17 -06:00
Michael Telatynski
5f59e39958 Apply the same to quoting & inserting of emoji then consolidate 2021-04-13 15:09:37 +01:00
Šimon Brandner
f1c80fcede
Call onCloseDialog straigh away 
This avoids some delay in the dialog disappearing

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-13 08:04:50 +02:00
Šimon Brandner
829bef45a2
Close dialog on redact 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-09 08:13:42 +02:00
Šimon Brandner
b723092ed2
Add null check 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-09 08:05:49 +02:00
Šimon Brandner
e5a563f887
Close ImageView after forward click 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-02 08:17:05 +02:00
Travis Ralston
1d9d0cd7be Convert a bunch more js-sdk imports to absolute paths 
Turns out a lot of the typescript warnings about improper warnings were correct. TypeScript appears to be pulling in two copies of the js-sdk when we do this, which can lead to type conflicts (or worse: the wrong code entirely). We fix this at the webpack level by explicitly importing from `src`, but some alternative build structures have broken tests because of this - jest ends up pulling in the "wrong" js-sdk, breaking things.
 2021-03-18 20:50:34 -06:00
Panagiotis
be7fb33a67 Merge branch 'develop' into edit-view-source 2021-03-11 17:07:56 +02:00
Travis Ralston
5b3367d44e Merge remote-tracking branch 'origin/develop' into travis/skinning/pt3-easy-comps 2021-03-09 09:33:19 -07:00
Travis Ralston
3e189d2728 Batch of views getting replaceableComponent decorators 2021-03-08 20:23:29 -07:00
Panagiotis
7963d7f49e address PR comments 
cleanup, change to isEncrypted, comments
 2021-03-08 21:21:37 +02:00
Panagiotis
51ac5421c9 chore: refactor code 
pass only the mxEvent object to ViewSource
derive the necessary values inside the component
 2021-03-06 11:30:31 +02:00
Panagiotis
af5cfff51d feat: edit button on View Source dialog 
reuse component SendCustomEvent
swap it in place in the View Source dialog
the Back button takes you to the View Source dialog, not the DevTools dialog
do not display the flip toggle box for changing between State Event and Normal Event
 2021-03-04 23:17:29 +02:00
Panagiotis
ae08f74336 feat: improve "view source" 
display encrypted and decrypted event source on the same dialog
keep only one "View Source" action on event context menu
 2021-03-03 22:38:30 +02:00
J. Ryan Stinnett
c13891c670
Merge pull request #5260 from orangecms/redact-with-reason 
add support for giving reason when redacting
 2020-12-04 15:13:40 +00:00
Travis Ralston
b4de01b1f1 Don't let users accidentally redact ACL events 
Fixes https://github.com/vector-im/element-web/issues/15633
Fixes https://github.com/vector-im/element-web/issues/15632

Slightly more information is in the issues above and in the diff, however the short version is redacting an ACL event can obliterate a room which is bad.
 2020-11-02 12:55:59 -07: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
Michael Telatynski
72498df28f Remove create-react-class 2020-08-29 12:14:16 +01:00
Travis Ralston
96087d61f6 Convert feature setting usages to regular settings 2020-08-17 13:12:18 -06:00
David Baker
7e45a71a8a Remove EncryptedEventDialog 
https://github.com/matrix-org/matrix-react-sdk/pull/4412 disabled it
when cross signing was enabled so it is essentially gone now anyway.

Fixes https://github.com/vector-im/riot-web/issues/11752
 2020-05-26 13:37:57 +01:00
Travis Ralston
90a898d03f Move dispatcher into a subdirectory 
We're expecting to have a whole bunch of types for the dispatched payloads, so pull the thing into a directory we can throw them in.
 2020-05-13 21:07:50 -06:00
Michael Telatynski
0e8bd59d2f View Source should target the replacing event rather than the root one 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-11 15:43:34 +01:00
Travis Ralston
3f99332f4b Use componentDidMount in place of componentWillMount where possible 
This fixes a common React warning we see. Most of these components should be using constructors instead, however componentDidMount is just as good (and doesn't require converting most of these).

Conversion to classes will be done in a later stage of React warning fixes.

For https://github.com/vector-im/riot-web/issues/12877
 2020-03-31 14:14:17 -06:00
Michael Telatynski
d5177ddc04
Merge pull request #4133 from matrix-org/t3chguy/pinned 
Fix message context menu breaking on invalid m.room.pinned_events event
 2020-02-26 11:36:46 +00:00
Michael Telatynski
9a1236a016 Fix message context menu breaking on invalid m.room.pinned_events event 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-26 10:40:33 +00:00
Michael Telatynski
d783ce86c8 Use noreferrer in addition to noopener for edge case browsers 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-23 22:14:29 +00:00
Michael Telatynski
600cb64d00 don't nest <a> inside <AccessibleButton> 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-18 15:04:57 +00:00
Michael Telatynski
42b63fbc81 Fix share message context menu option keyboard a11y 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-14 09:36:10 +00:00
Travis Ralston
fde32f13a5 [CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop 2020-01-09 14:15:09 -07:00
Michael Telatynski
8116ac74ce
Update src/components/views/context_menus/MessageContextMenu.js 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2020-01-09 12:10:44 +00:00
Travis Ralston
59f608ffd6
Merge pull request #3761 from matrix-org/travis/babel7-wp-es6-export 
Convert CommonJS exports to ES6 exports
 2020-01-08 09:09:11 -07:00
Travis Ralston
042bd35d79 Fix MatrixClientPeg imports 2019-12-22 21:15:54 -07:00