J. Ryan Stinnett
f0d67e0454
Revert "Merge pull request #3019 from matrix-org/travis/sr/fix-timeline"
...
This reverts commit 9a1a9825b0
, reversing
changes made to 62dc83310a
.
2019-05-28 12:22:22 +01:00
Weblate
71d5a138bb
Merge branch 'origin/develop' into Weblate.
2019-05-28 09:17:33 +00:00
Tirifto
a25879d585
Translated using Weblate (Esperanto)
...
Currently translated at 81.5% (1331 of 1634 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2019-05-28 09:17:33 +00:00
Bruno Windels
e1d1c8f99c
Merge pull request #2968 from npny/npny/autocomplete-prevent-send-on-enter
...
Hide autocomplete on Enter key press instead of sending message
2019-05-28 09:17:28 +00:00
Weblate
7e5d05aa46
Merge branch 'origin/develop' into Weblate.
2019-05-27 15:12:44 +00:00
Bruno Windels
afd656ae2c
Merge pull request #3025 from matrix-org/bwindels/edit-keyboard-nav
...
Message editing: arrow key (up/down) navigation between editable events
2019-05-27 15:12:40 +00:00
Weblate
dc9ed1854b
Merge branch 'origin/develop' into Weblate.
2019-05-27 15:12:22 +00:00
Tirifto
8d9be3c72f
Translated using Weblate (Esperanto)
...
Currently translated at 80.0% (1307 of 1634 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2019-05-27 15:12:22 +00:00
Bruno Windels
080a6301b1
Merge pull request #3032 from matrix-org/bwindels/filterreply
...
Message editing: fix reply text appearing in edit
2019-05-27 15:12:18 +00:00
Bruno Windels
f5da8162c1
filter out reply text when editing
2019-05-27 17:04:26 +02:00
Bruno Windels
dee24ac27a
extract constant
2019-05-27 16:45:26 +02:00
Bruno Windels
651cb8b9a7
lint
2019-05-27 16:43:12 +02:00
Bruno Windels
918de849c7
make sure in the future arrow up/down only goes through own events
2019-05-27 16:41:03 +02:00
Weblate
a9f6d694c2
Merge branch 'origin/develop' into Weblate.
2019-05-27 14:37:29 +00:00
Walter
4bf7e8b941
Translated using Weblate (Russian)
...
Currently translated at 84.6% (1382 of 1634 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2019-05-27 14:37:29 +00:00
csybr
c5309e8c2b
Translated using Weblate (Norwegian Nynorsk)
...
Currently translated at 62.1% (1014 of 1634 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
2019-05-27 14:37:27 +00:00
Travis Ralston
6174cd2998
Merge pull request #3031 from spantaleev/fix-non-integer-thumb-sizes
...
Do not try to request thumbnails with non-integer widths
2019-05-27 08:37:22 -06:00
Bruno Windels
25e2c747ed
focus main composer after cancel or saving edit
2019-05-27 16:26:21 +02:00
Bruno Windels
e193522db1
PR feedback: put findPrev/NextEditableEvent in one function with flag
2019-05-27 16:22:55 +02:00
Tirifto
1a0ea08cd1
Translated using Weblate (Esperanto)
...
Currently translated at 79.4% (1298 of 1634 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2019-05-27 12:19:29 +00:00
Mani Farone
d733788ab1
Translated using Weblate (Bulgarian)
...
Currently translated at 97.6% (1595 of 1634 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2019-05-27 12:19:28 +00:00
Besnik Bleta
9758e9aa10
Translated using Weblate (Albanian)
...
Currently translated at 96.7% (1580 of 1634 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2019-05-27 12:19:27 +00:00
Slavi Pantaleev
3f60b4336f
Do not try to request thumbnails with non-integer widths
...
Issue described in https://github.com/vector-im/riot-web/issues/9690 .
With certain `window.devicePixelRatio` values
(e.g. `1.5789473684210527`), the calculated thumb width/height
would be a non-integer value.
Passing such values to `client.mxcUrlToHttp()` causes it to
generate URLs to the thumbnail API with non-integer values.
As per the spec, non-integer values are forbidden for that API and a
400 HTTP response is returned (`Query parameter b'width' must be an
integer`).
Fixing matrix-js-sdk's `mxcUrlToHttp()` to sanitize such values
would also be a good idea and likely fix more than just matrix-react-sdk
and riot-web. Still, it feels like matrix-react-sdk should play nice
as well, and not request thumbnails for weird widths/heights.
Signed-off-by: Slavi Pantaleev <slavi@devture.com>
2019-05-27 11:06:10 +03:00
Weblate
bb1dabe06c
Merge branch 'origin/develop' into Weblate.
2019-05-24 19:05:17 +00:00
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
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