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

226 commits

Author SHA1 Message Date
Andrew Morgan
f4788a6427
Add dialpad to transfer dialog + various dialpad UI improvements (#6363) 
Co-authored-by: Germain <germain@souquet.com>
Co-authored-by: Andrew Morgan <andrew@amorgan.xyz>
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
 2021-07-15 09:55:58 +01:00
Michael Telatynski
f8907a6ea4 Fix bug which prevented more than one event getting pinned 2021-07-08 14:48:06 +01:00
Michael Telatynski
8e7e4c9e8d Convert MessageContextMenu to Typescript 2021-07-08 14:47:36 +01:00
J. Ryan Stinnett
bbdd93f592 Auto-fix more errors 2021-06-29 13:26:09 +01:00
J. Ryan Stinnett
b501665971 Fix parsing errors 2021-06-29 13:23:13 +01:00
J. Ryan Stinnett
ae0a8b8da4 Auto-fix lint errors 2021-06-29 13:11:58 +01:00
Michael Weimann
d3bc7fe806
remove list keys 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-28 18:29:32 +02:00
Michael Weimann
e685f1239d
use null vars for context menu lists 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-28 18:29:32 +02:00
Michael Weimann
086042f078
update message context texts and icons 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-24 22:20:53 +02:00
Michael Weimann
9a1be63baa
reorder message context menu items 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-24 22:20:52 +02:00
Michael Weimann
c2d51a115b
tweak message context labels 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-24 22:20:52 +02:00
Michael Weimann
ffca23344a
tweak context menu order 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-24 22:20:51 +02:00
Michael Weimann
62efea7e19
add message context menu icons 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-24 22:20:50 +02:00
Michael Weimann
e4eeafd485
migrate the message context menu to IconizedContextMenu 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-24 22:20:49 +02:00
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
David Baker
f0ad70f0e7
Merge pull request #5786 from DantrazTrev/DialPad 
Dial Pad UI bug fixes
 2021-06-23 11:41:41 +01:00
Michael Telatynski
b3b9135b1f
Merge pull request #6134 from matrix-org/t3chguy/fix/17529 2021-06-22 21:28:51 +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
Michael Telatynski
a52dd57eb2 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17529 
 Conflicts:
	package.json
	yarn.lock
 2021-06-15 13:59:54 +01:00
Robin Townsend
b97867271b Merge branch 'develop' into improved-forwarding-ui 2021-06-07 19:09:36 -04:00
Michael Telatynski
31d308a1fb Fix Stickerpicker context menu 2021-06-07 09:22:47 +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
Michael Telatynski
bc3c759feb Add temporary mechanism for managing communities without dnd 2021-06-02 11:33:25 +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
Ayush PS
b42872daa4 Fixed the Dial Pad and finalized the changes 2021-05-02 22:10:15 +05:30
Ayush PS
8660ab000e Merge branch 'develop' into DialPad 2021-04-28 08:55:44 +05:30
Ayush PS
7509481bb9 Added the LTR support for the dialpad 2021-04-28 02:46:43 +05:30
Š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