Travis Ralston
c30908c380
Merge pull request #3030 from aaronraimist/preserve-strikethrough
...
Message editing: preserve strikethrough as well
2019-05-24 13:05:14 -06:00
Aaron Raimist
fec5abadd6
Message editing: preserve strikethrough as well
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-05-24 13:57:09 -05:00
Weblate
b39759e5cb
Merge branch 'origin/develop' into Weblate.
2019-05-24 17:01:13 +00:00
Tuomas Hietala
1bc95252ea
Translated using Weblate (Finnish)
...
Currently translated at 99.4% (1625 of 1634 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2019-05-24 17:01:13 +00:00
Travis Ralston
04c20b6e68
Merge pull request #3027 from matrix-org/travis/colr-logging
...
Add some logging for COLR checks
2019-05-24 11:01:07 -06:00
Bruno Windels
b2592583c4
maintain caret at current line when position is on newline part
2019-05-24 18:54:29 +02:00
Travis Ralston
093de71ff8
Minus one log
2019-05-24 10:53:24 -06:00
Travis Ralston
ef9ef0e654
Add some logging for COLR checks
2019-05-24 10:36:07 -06:00
Weblate
deaf81e07b
Merge branch 'origin/develop' into Weblate.
2019-05-24 14:24:30 +00:00
Tuomas Hietala
3f4c0d76fa
Translated using Weblate (Finnish)
...
Currently translated at 98.8% (1615 of 1634 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2019-05-24 14:24:30 +00:00
Bruno Windels
cf932e0eab
Merge pull request #3026 from matrix-org/bwindels/tabcompletionfixup
...
Fixup for tab completion: take part length into account as well
2019-05-24 14:24:25 +00:00
Bruno Windels
8c0b8ff618
take part length into account as well
2019-05-24 15:43:55 +02:00
Bruno Windels
4626581dbe
scroll event into view when starting to edit
2019-05-24 15:38:51 +02:00
Weblate
3a183c22fc
Merge branch 'origin/develop' into Weblate.
2019-05-24 13:29:14 +00:00
Tuomas Hietala
57d3349fde
Translated using Weblate (Finnish)
...
Currently translated at 98.6% (1611 of 1634 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2019-05-24 13:29:14 +00:00
Bruno Windels
9d6a818591
Merge pull request #3024 from matrix-org/bwindels/autocomplete-tab
...
Message editing: tab completion
2019-05-24 13:29:10 +00:00
Bruno Windels
fbb79e4686
don't navigate to next/prev message when editor has modifications
...
to prevent losing modifications by accident
2019-05-24 14:46:34 +02:00
Bruno Windels
bd3dbd1a89
remove edit history from main composer
2019-05-24 14:42:57 +02:00
Bruno Windels
3591eedcfa
move between editable events with arrow keys
2019-05-24 14:42:33 +02:00
Bruno Windels
8926fcb3a6
helper functions to find next & previous editable events in timeline
2019-05-24 14:41:24 +02:00
Bruno Windels
cf5e4d3d94
make consecutive :/@/# separate pill candidates
...
e.g. accept the first character always to start the autocompletion
but after that refer to the plainpart logic to split up in
new pill candidates. Also, don't allow merging adjacent parts.
This makes sure that "@nonmatchingfoo @someuser"
only matches "someuser" in the autocomplete.
2019-05-24 12:38:19 +02:00
Bruno Windels
a024fd8991
port tab completion from MessageComposerInput
2019-05-24 12:38:01 +02:00
Weblate
bc9d801a60
Merge branch 'origin/develop' into Weblate.
2019-05-24 10:11:49 +00:00
random
2c54a5f1fe
Translated using Weblate (Italian)
...
Currently translated at 99.9% (1632 of 1634 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-05-24 10:11:48 +00:00
Bruno Windels
3c778e80b0
Merge pull request #3021 from matrix-org/bwindels/typebeforefirstpill
...
Message editing: dont jump to next part when inserting at *start* of uneditable part
2019-05-24 10:11:44 +00:00
Bruno Windels
23465c696f
dont jump to next part when inserting at *start* of uneditable part
2019-05-24 10:08:47 +02:00
Weblate
4a4e2a6cd9
Merge branch 'origin/develop' into Weblate.
2019-05-24 07:34:11 +00:00
Mokeeh
f993656e0c
Translated using Weblate (Norwegian Bokmål)
...
Currently translated at 14.0% (228 of 1634 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nb_NO/
2019-05-24 07:34:11 +00:00
Szimszon
d4a1f592c1
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (1634 of 1634 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-05-24 07:34:11 +00:00
Kévin C
9a76f9f0d9
Translated using Weblate (French)
...
Currently translated at 99.8% (1631 of 1634 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-05-24 07:34:10 +00:00
Tirifto
c052ea9d24
Translated using Weblate (Esperanto)
...
Currently translated at 79.0% (1291 of 1634 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2019-05-24 07:34:10 +00:00
Slavi Pantaleev
ef444b1800
Translated using Weblate (Bulgarian)
...
Currently translated at 95.5% (1560 of 1634 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2019-05-24 07:34:10 +00:00
Bruno Windels
3468cef654
Merge pull request #3013 from matrix-org/bwindels/editor-formatting
...
Message editing: preserve and re-apply formatting
2019-05-24 07:34:05 +00:00
Weblate
1fc23d1c56
Merge branch 'origin/develop' into Weblate.
2019-05-23 16:56:13 +00:00
random
342b5433c9
Translated using Weblate (Italian)
...
Currently translated at 99.9% (1633 of 1635 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-05-23 16:56:13 +00:00
Travis Ralston
98067f3305
Merge pull request #3001 from matrix-org/travis/feature/wellknown2
...
Fix relationship between guests, .well-known, and auth
2019-05-23 10:56:04 -06:00
RiotRobot
6cab9dd1d5
v1.2.0-rc.1
2019-05-23 17:16:19 +01:00
RiotRobot
d05d3f8a13
Prepare changelog for v1.2.0-rc.1
2019-05-23 17:16:19 +01:00
RiotRobot
bba4029165
Upgrade JS SDK to 1.2.0-rc.1
2019-05-23 16:52:45 +01:00
J. Ryan Stinnett
5c5f997c8c
Merge pull request #3023 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate
2019-05-23 10:56:08 +01:00
Markel @wakutiteo
8f19aff7a0
Translated using Weblate (Spanish)
...
Currently translated at 79.5% (1300 of 1635 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2019-05-23 09:54:15 +00:00
random
115d22cd2a
Translated using Weblate (Italian)
...
Currently translated at 95.2% (1556 of 1635 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-05-23 09:54:15 +00:00
Weblate
85c6321885
Merge branch 'origin/develop' into Weblate.
2019-05-23 09:42:33 +00:00
Markel @wakutiteo
4ec8445350
Translated using Weblate (Spanish)
...
Currently translated at 79.5% (1300 of 1635 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2019-05-23 09:42:32 +00:00
random
e0a3584f6c
Translated using Weblate (Italian)
...
Currently translated at 94.4% (1543 of 1635 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-05-23 09:42:32 +00:00
Kévin C
549b6d4b78
Translated using Weblate (French)
...
Currently translated at 99.8% (1632 of 1635 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-05-23 09:42:32 +00:00
J. A. Durieux
02176586a5
Translated using Weblate (Dutch)
...
Currently translated at 95.3% (1558 of 1635 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2019-05-23 09:42:31 +00:00
Slavi Pantaleev
e9295116dc
Translated using Weblate (Bulgarian)
...
Currently translated at 95.5% (1562 of 1635 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2019-05-23 09:42:31 +00:00
J. Ryan Stinnett
2f7e31119f
Merge pull request #3022 from matrix-org/jryans/big-bold-emoji
...
Use the correct line-height for bold emoji
2019-05-23 10:42:26 +01:00
J. Ryan Stinnett
ab4dfd8d1b
Use the correct line-height for bold emoji
...
This avoids marking messages detected as big emoji with `markdown-body` so that
they get the correct line-height.
Fixes https://github.com/vector-im/riot-web/issues/9808
2019-05-23 10:25:45 +01:00