nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
34,022 Commits 258 Branches 582 Tags
c1bc4b0027cd438c8a6e5dca8facf890e877f3b1
Commit Graph

219 Commits

Author SHA1 Message Date
Travis Ralston
273fb75fc9 Merge branch 'develop' into travis/event-fixes 2021-06-18 11:26:51 -06:00
Travis Ralston
a687391b98 Switch order 2021-06-17 14:21:01 -06: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
Travis Ralston
ea46df0d48 Partially restore immutable event objects at the rendering layer 
This is primarily to fix some extremely rare edge cases in local echo, but also restores the accuracy of some comments in the stack regarding immutable event objects (which were made mutable many years ago).

This shouldn't have any impact on the daily usage of the app, only adding a measured 0ms of latency to the stack.
 2021-06-15 14:23:19 -06:00
Michael Telatynski
bc89cf14dd ignore hash/fragment when de-duplicating links for url previews 2021-06-02 11:53:47 +01:00
Michael Telatynski
1ffbaee560 update style of imports in all modified files 2021-05-26 14:14:55 +01:00
Michael Telatynski
974d62e347 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/12740 
 Conflicts:
	src/components/views/messages/TextualBody.js
	src/components/views/right_panel/UserInfo.tsx
	src/dispatcher/actions.ts
 2021-05-26 14:08:01 +01:00
Germain Souquet
f156c2db15 prevent reflow in app when accessing window dimensions 2021-05-25 10:28:43 +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
Š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
Michael Telatynski
5f59e39958 Apply the same to quoting & inserting of emoji then consolidate 2021-04-13 15:09:37 +01:00
Robin Townsend
f1a9c5ae93 Fix line numbers when missing trailing newline 
_addLineNumbers expected code blocks to contain a trailing newline, but
this is not always the case.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-03-25 17:38:34 -04:00
Travis Ralston
fc5b1ed9d6 Batch of views getting replaceableComponent decorators 2021-03-08 20:23:39 -07:00
Šimon Brandner
986950697b Rmove unnecessary code 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 14:10:09 +01:00
Šimon Brandner
024871f59d Merge branch 'dont-show-copy-button' of https://github.com/SimonBrandner/matrix-react-sdk into dont-show-copy-button 2021-02-24 13:41:16 +01:00
Šimon Brandner
363b753306 Avoid innerHTML 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 13:40:37 +01:00
Šimon Brandner
61cd026d7a Improve comment 
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
 2021-02-24 13:07:25 +01:00
Šimon Brandner
ce1be7a4cd Use length instead of the first element 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-23 07:49:26 +01:00
Šimon Brandner
c9baff1e10 Move the _addCodeElement() call down a bit 
We can skip this if the first if statement is true

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-23 07:46:03 +01:00
Šimon Brandner
c965119410 Add _addCodeElement method 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-23 07:40:53 +01:00
Šimon Brandner
6149567c62 Add <code> if it's missing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-22 13:43:57 +01:00
Šimon Brandner
87a2454556 Revert "Don't show copy button if there is no <code>" 
This reverts commit c76cc33ebf.
 2021-02-22 13:41:20 +01:00
Šimon Brandner
c76cc33ebf Don't show copy button if there is no <code> 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-22 13:23:39 +01:00
Šimon Brandner
6b0b46b917 Fix duplication caused by highlighting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-10 14:20:19 +01:00
Šimon Brandner
895be6e7a6 Added second comment back 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-10 14:02:45 +01:00
Šimon Brandner
5cf126dea3 Added comment back 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-10 13:41:24 +01:00
Šimon Brandner
b97d8979c7 Remove nested for loop 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-10 13:18:23 +01:00
Šimon Brandner
4a7bc74e99 Fix duplication of codeblock elements 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-09 19:46:30 +01:00
Šimon Brandner
ec73f2ec49 Change comment styling 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-05 08:30:54 +01:00
Šimon Brandner
77248725ed Added onHeightChanged call 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-05 08:29:24 +01:00
Šimon Brandner
ad5c8fe7e4 Revert "Rerender MessagePanel" 
This reverts commit c7e61ac71d.
 2021-02-05 08:27:07 +01:00
Šimon Brandner
9bd8fef6b3 Change comment styling 
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
 2021-02-05 08:22:02 +01:00
Šimon Brandner
9db86a38f6 Update src/components/views/messages/TextualBody.js 
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
 2021-02-04 17:58:21 +01:00
Šimon Brandner
c7e61ac71d Rerender MessagePanel 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-21 17:32:57 +01:00
Šimon Brandner
97c5058f00 Removed log 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-21 13:10:21 +01:00
Šimon Brandner
da09362f99 Added option to hide line numbers 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-21 13:08:55 +01:00
Šimon Brandner
c737543114 Remove commented lines 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-21 13:04:51 +01:00
Šimon Brandner
bd2423a52c Added line numbering 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-21 10:53:18 +01:00
Šimon Brandner
14bf169631 Handle small codeblocks 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-20 15:01:23 +01:00
Šimon Brandner
f8179f0c7a Fix inverted icon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-20 14:08:57 +01:00
Šimon Brandner
25f30ca79f Fix indent 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-20 13:05:23 +01:00
Šimon Brandner
072cbe98b5 Simplifie 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-20 13:03:05 +01:00
Šimon Brandner
8535a11dd2 Rename some variable and cleanup a bit 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-20 08:44:32 +01:00
Šimon Brandner
58b2c18cf5 This somehow works 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-19 21:02:39 +01:00
Šimon Brandner
95939f3d6c Added _wrapInDiv() method 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-19 18:21:59 +01:00
Šimon Brandner
e6ab47ff76 Fix bug 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-19 17:30:02 +01:00
Šimon Brandner
61281a855c Redo expanding 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-19 16:35:32 +01:00
Šimon Brandner
8a4af2f348 Merge branch 'develop' into expand-codeblock 2021-01-18 17:54:06 +01:00
Šimon Brandner
49dce58027 Added expanding based on the option 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-18 17:49:09 +01:00