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

317 commits

Author SHA1 Message Date
Šimon Brandner
fd022310b3
Merge remote-tracking branch 'upstream/develop' into fix/end-of-line-emoji 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-11 10:21:56 +02:00
Michael Telatynski
f9527c9d6b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/a11y/composer-list-autocomplete 
 Conflicts:
	src/components/views/rooms/BasicMessageComposer.tsx
	src/editor/autocomplete.ts
 2021-08-12 11:21:20 +01:00
Šimon Brandner
422c27fcef
Reorder code 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 07:46:01 +02:00
Šimon Brandner
4f0c800cad
Merge remote-tracking branch 'upstream/develop' into feature/improved-composer 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 07:45:17 +02:00
Michael Telatynski
fa550a65af Fix editing of <sub> & <sup> & <u> 2021-07-23 19:01:12 +01:00
Michael Telatynski
ce78cdf4ad Conform to new react and typescript eslint rules 2021-07-19 22:43:11 +01:00
Michael Telatynski
ebfe38dc4a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/a11y/composer-list-autocomplete 
 Conflicts:
	src/components/views/rooms/BasicMessageComposer.tsx
	src/editor/autocomplete.ts
 2021-07-15 09:59:40 +01:00
Michael Telatynski
51f0f5718a improve types 2021-07-12 13:26:34 +01:00
Michael Telatynski
8139aeb073 skip loading room & finding member, use existing member field 2021-07-12 12:51:49 +01:00
Michael Telatynski
3515b2ca05 Fix edge case behaviour caused by our weird reuse of DOM nodes between owners 2021-07-12 12:51:27 +01:00
Šimon Brandner
b79f2d0699
Fix the ugly solution 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-12 12:21:59 +02:00
Šimon Brandner
113b6319b1
This looks a bit nicer 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-12 09:52:01 +02:00
Šimon Brandner
667abca31f
Handle pill onclick 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-11 20:02:32 +02:00
Šimon Brandner
98808aabca
Set contentEditable for PillParts to false 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-11 18:53:29 +02:00
Michael Telatynski
e768ecb3d0 Typescript conversion of Composer components and more 2021-06-30 13:01:26 +01:00
J. Ryan Stinnett
ae0a8b8da4 Auto-fix lint errors 2021-06-29 13:11:58 +01:00
Michael Telatynski
1ffbaee560 update style of imports in all modified files 2021-05-26 14:14:55 +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
Michael Telatynski
28eaac0ef8 remove dead code and fix some types 2021-05-20 22:25:19 +01:00
Michael Telatynski
60e7089c77 post-merge fixes, the new keybindings stuff made it messy 2021-05-11 11:14:21 +01:00
Michael Telatynski
60d3da2441 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/a11y/composer-list-autocomplete 
 Conflicts:
	src/components/structures/LoggedInView.tsx
	src/components/views/rooms/BasicMessageComposer.tsx
	src/editor/autocomplete.ts
 2021-05-11 10:59:22 +01:00
J. Ryan Stinnett
7821e00bc6 Revert to internal option 2021-05-10 17:36:33 +01:00
J. Ryan Stinnett
9c8e89ff79 Fix importing 2021-05-10 16:55:27 +01:00
J. Ryan Stinnett
f41fc7e46c Upgrade cheerio and resolve type errors 
This helps resolve some type errors with `domhandler`. In addition, we convert
to the new way of using `htmlparser2` with `cheerio`.
 2021-05-10 16:10:39 +01:00
Michael Telatynski
ed8b05b730
Merge pull request #5951 from SimonBrandner/fix/room-pill-history 
Fix saving room pill part to history
 2021-05-04 12:32:04 +01:00
Šimon Brandner
0c869364e9
Don't serialize resourceId in AtRoomPill 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-01 12:27:52 +02:00
Šimon Brandner
c1549dfac5
Make optional params optional 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-01 11:32:35 +02:00
Šimon Brandner
ee8d688de1
Fix saving room pill part to history 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-01 10:59:28 +02:00
Sven Mäder
bbce1ac704 Disallow inline display maths 2021-04-28 19:39:38 +02:00
Travis Ralston
14f1388522
Merge pull request #5830 from SimonBrandner/fix-trailing-colon 
Fix inserting trailing colon after mention/pill
 2021-04-28 09:51:50 -06:00
Michael Telatynski
915f8b3c9c Scale all mxc thumbs using device pixel ratio for hidpi 
as we are notoriously bad at doing it everywhere we ought to, like the TopLeftMenu avatar
 2021-04-26 18:25:49 +01:00
Šimon Brandner
d36f8ccb95
Rename moveStart to moveStartForwards 
So it it's clear what it does

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-18 10:18:49 +02:00
Šimon Brandner
609196a240
Replace emoticon before a newline 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-18 10:13:51 +02:00
Michael Telatynski
5f59e39958 Apply the same to quoting & inserting of emoji then consolidate 2021-04-13 15:09:37 +01:00
Sven Mäder
31e85ec580 Use cheerio api for code replacements 2021-04-08 11:38:05 +02:00
Sven Mäder
7205995dea Remove unused function arguments 2021-04-07 17:22:30 +02:00
Šimon Brandner
715fff6f0c
Redo and fix trailing characters in user pills 
This removes the handling of trailing chars from createMentionParts as we need to determine whether or not to insert the trailing char differently in different situations

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-07 11:52:07 +02:00
Sven Mäder
1d70045065 Refactor maths config options to nested structure 2021-04-06 14:52:55 +02:00
Sven Mäder
3c1169c7a2 Merge remote-tracking branch 'upstream/develop' into maths-parsing-latex 2021-04-06 12:34:51 +02:00
Sven Mäder
73130cad02 Refactor latex replace code 2021-04-01 12:09:51 +02:00
Clemens Zeidler
57cd8afbc4 Split ApplySelection into CompleteOrPrevSelection and CompleteOrNextSelection 
When moving through the autocomplete selection list distinguish between
the following cases:
1) When there is no autocomplete window open, only open one and select
the first item when the CompleteOrPrevSelection /
CompleteOrNextSelection actions are emitted (e.g. by pressing SHIFT +
TAB, TAB)
2) Otherwise navigate through the selection list (e.g. SHIFT + TAB, TAB,
UP, DOWN)

- Remove references to raw keyboard events in autocomplete.ts
- Clarify the purpose of startSelection (previously onTab)

Signed-off-by: Clemens Zeidler <clemens.zeidler@gmail.com>
 2021-03-29 13:38:03 +13:00
Travis Ralston
7c8c85161d
Merge pull request #5748 from SimonBrandner/compat-for-non-rich-text-clients 
Show room alias in plain/formatted body
 2021-03-11 11:29:26 -07:00
Šimon Brandner
d4f67d94a4
Use resourceId in plain body 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-11 18:53:06 +01:00
Šimon Brandner
62fa60f109
Use resourceId in formatted body 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-11 18:50:54 +01:00
Panagiotis
a1eabde3a3 fix: create a PillCandidatePart on the beginning of a part string 2021-03-11 19:14:04 +02:00
J. Ryan Stinnett
b12cf7912a
Merge pull request #5624 from SimonBrandner/show-room-name 
Display room name in pills instead of address
 2021-03-08 16:27:43 +00:00
Jaiwanth
d731e82fba Fixed edit for markdown images 
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
 2021-03-01 22:44:48 +05:30
Michael Telatynski
c05eceef7f Rework composer autocomplete to be smarter and not trap tab 2021-02-17 15:39:07 +00:00
Šimon Brandner
cb5237a18b
Display room name instead of alias 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-12 14:21:07 +01:00
Sven Mäder
ac1f9b4247 Add config keys for alternative patterns 2021-01-29 15:49:20 +01:00