PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
17822 commits 1 branch 0 tags 338 MiB
Commit graph

17822 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
4d37c8dbf7 Merge branch 'origin/develop' into Weblate. 2019-09-09 08:06:55 +00:00
Bruno Windels
1422b1d73e
Merge pull request #3403 from matrix-org/bwindels/cider-italics 
New composer: use underscore for italics so it doesn't collide with bold when toggling
 2019-09-09 08:06:51 +00:00
Weblate
9abcfd49da Merge branch 'origin/develop' into Weblate. 2019-09-06 17:49:15 +00:00
Michael Telatynski
d8dbe28015
Merge pull request #3404 from matrix-org/t3chguy/react16_10 
Switch to createReactClass: views/elements & views/groups. React 16 :D
 2019-09-06 18:49:11 +01:00
Weblate
e6d6c9ce6f Merge branch 'origin/develop' into Weblate. 2019-09-06 17:46:30 +00:00
Michael Telatynski
6dbc9ee893
Merge pull request #3405 from matrix-org/t3chguy/react16_11 
Switch to createReactClass: *everything else*. React 16 :D
 2019-09-06 18:46:24 +01:00
Michael Telatynski
b243004a6c Switch to createReactClass: *everything else*. React 16 :D 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-06 18:38:11 +01:00
Michael Telatynski
d5db67be38 Switch to createReactClass: views/elements & views/groups. React 16 :D 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-06 18:35:52 +01:00
Weblate
2cb95a1d12 Merge branch 'origin/develop' into Weblate. 2019-09-06 17:18:35 +00:00
Michael Telatynski
13258132e7
Merge pull request #3400 from matrix-org/t3chguy/react16_9 
Switch to createReactClass: views/rooms and test/components. React 16 :D
 2019-09-06 18:18:32 +01:00
Bruno Windels
48247e66be use underscore for italics so it doesn't collide with bold when toggling 2019-09-06 17:52:37 +02:00
Weblate
49f3c9f6c5 Merge branch 'origin/develop' into Weblate. 2019-09-06 14:42:20 +00:00
Bruno Windels
fe482258ac
Merge pull request #3402 from matrix-org/bwindels/cider-toggle-inline-formatting 
New composer: support toggling inline formatting
 2019-09-06 14:42:16 +00:00
Weblate
5bce922259 Merge branch 'origin/develop' into Weblate. 2019-09-06 14:28:27 +00:00
Bruno Windels
14fff3be9a
Merge pull request #3399 from matrix-org/bwindels/fix-formatbar-edit-position 
Fix format bar not appearing in edit composer
 2019-09-06 14:28:23 +00:00
Bruno Windels
26bd694c6a support toggling inline formatting 2019-09-06 16:25:55 +02:00
Michael Telatynski
70ff2bc9cd Switch to createReactClass: views/rooms and test/components. React 16 :D 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-06 15:04:46 +01:00
Bruno Windels
4e98721ba9 take bounding box for positioning calculation 2019-09-06 15:56:46 +02:00
Weblate
870659d6da Merge branch 'origin/develop' into Weblate. 2019-09-06 13:54:55 +00:00
Walter
322cb15ab3 Translated using Weblate (Russian) 
Currently translated at 97.0% (1718 of 1772 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2019-09-06 13:54:54 +00:00
송태섭
1c3abeeb22 Translated using Weblate (Korean) 
Currently translated at 100.0% (1772 of 1772 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
 2019-09-06 13:54:54 +00:00
Szimszon
2ec94a4913 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1772 of 1772 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-09-06 13:54:54 +00:00
Michael Telatynski
7759a9f20e
Merge pull request #3397 from matrix-org/t3chguy/react16_8 
Correct case of propTypes property in ES6 React Components. React 16
 2019-09-06 14:54:50 +01:00
Michael Telatynski
4db8ef4d89 Correct case of propTypes property in ES6 React Components. React 16 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-06 14:27:33 +01:00
Weblate
31027ba864 Merge branch 'origin/develop' into Weblate. 2019-09-06 10:05:24 +00:00
Kévin C
4201515863 Translated using Weblate (French) 
Currently translated at 100.0% (1772 of 1772 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-09-06 10:05:24 +00:00
Besnik Bleta
79d488b52a Translated using Weblate (Albanian) 
Currently translated at 99.8% (1768 of 1772 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2019-09-06 10:05:23 +00:00
Bruno Windels
4876f4c469
Merge pull request #3396 from matrix-org/bwindels/fix-formatbar-merge-error 
Fix error on load in composer
 2019-09-06 10:05:19 +00:00
Bruno Windels
dd1c01068f fix rename that didn't make it through rebasing 2019-09-06 11:58:27 +02:00
Weblate
48f844fb92 Merge branch 'origin/develop' into Weblate. 2019-09-06 09:28:22 +00:00
Bruno Windels
5014b606db
Merge pull request #3391 from matrix-org/bwindels/cider-format-history 
New composer: ensure undo history is persisted before applying formatting
 2019-09-06 09:28:18 +00:00
Weblate
5916b48f41 Merge branch 'origin/develop' into Weblate. 2019-09-06 09:22:41 +00:00
Bruno Windels
df4762871a
Merge pull request #3392 from matrix-org/bwindels/cider-paste-plain 
New composer: fix pasting from word processors
 2019-09-06 09:22:37 +00:00
Weblate
69d6ff26fa Merge branch 'origin/develop' into Weblate. 2019-09-06 09:22:14 +00:00
Bruno Windels
6b104f6344
Merge pull request #3393 from matrix-org/bwindels/cider-fix-lastcaret 
New composer: fix needing to push arrow-up twice after sending first message after switching to a room
 2019-09-06 09:22:10 +00:00
Bruno Windels
9dac91a70d ensure step before formatting is persisted in undo history 2019-09-06 11:20:24 +02:00
Weblate
79d120b9d2 Merge branch 'origin/develop' into Weblate. 2019-09-06 09:12:46 +00:00
Bruno Windels
8820546f49
Merge pull request #3390 from matrix-org/bwindels/selection-color 
Remove accent color as selection color
 2019-09-06 09:12:42 +00:00
Bruno Windels
0252c7ae37 force pasting as plain text in new composer 2019-09-06 11:10:41 +02:00
Weblate
8cfe178913 Merge branch 'origin/develop' into Weblate. 2019-09-06 09:09:50 +00:00
Bruno Windels
556ccf45dc
Merge pull request #3389 from matrix-org/bwindels/cider-format-shortcuts 
New composer: formatting keyboard shortcuts
 2019-09-06 09:09:47 +00:00
Bruno Windels
2596281a7c update last caret from update callback instead of input event 
many editor updates are not caused by an input event, so
the last caret wasn't always up to date.

Updating the caret from the update callback ensures that every
time the editor contents is changed, the last caret is updated.
 2019-09-06 11:09:01 +02:00
Bruno Windels
f4938f9d11 dont format empty ranges 2019-09-06 10:59:41 +02:00
Bruno Windels
06143ba7a1 show keyboard shortcuts in format button tooltip 2019-09-06 10:59:41 +02:00
Bruno Windels
bdcea6f21e add shortcuts for formatting 2019-09-06 10:59:41 +02:00
Weblate
db288f9c95 Merge branch 'origin/develop' into Weblate. 2019-09-06 08:52:05 +00:00
Bruno Windels
de787c798c
Merge pull request #3387 from matrix-org/bwindels/cider-formatbar-tooltips 
New composer: format bar tooltips
 2019-09-06 08:52:00 +00:00
Bruno Windels
042822c90a copyright is solely assigned to matrix foundation now, copy paste error 2019-09-06 10:39:19 +02:00
Bruno Windels
d6a493a2b1 fixup: language strings moved 2019-09-06 10:39:19 +02:00
Bruno Windels
b4b9c7d072 Add tooltip for format buttons 2019-09-06 10:39:19 +02:00