c84d707124
Merge pull request #1169 from matrix-org/t3chguy/add-missing-autocomplete-commands
...
add missing commands to the Autocomplete CommandProvider
2017-07-04 10:32:29 +01:00
d130411f6b
Merge pull request #1174 from matrix-org/luke/fix-rte-edge-detection
...
Only move through history if caret at start or end of line
2017-07-04 10:32:04 +01:00
664f3acc3c
Only move through history if caret at start or end of line
...
As suggested by @dbkr (because this is what we do for the old composer), only move through history when the caret is that the beginning of the first line (block) or end of the last.
This has the nice property of being able to move the caret up to a really long message: fixes https://github.com/vector-im/riot-web/issues/4471
2017-07-04 10:12:06 +01:00
185a5b51ff
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (206 of 206 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
2017-07-03 20:28:27 +00:00
16c33c0c53
Translated using Weblate (Malayalam)
...
Currently translated at 3.6% (33 of 915 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ml/
2017-07-03 18:28:33 +00:00
fc379e2a15
fix typos post-luke-review
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-03 19:24:18 +01:00
d5e1bfab48
Translated using Weblate (Malayalam)
...
Currently translated at 100.0% (206 of 206 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
2017-07-03 18:24:09 +00:00
8178f12ae8
Translated using Weblate (Malayalam)
...
Currently translated at 100.0% (206 of 206 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
2017-07-03 18:21:50 +00:00
97c4cd49b0
Translated using Weblate (Malayalam)
...
Currently translated at 100.0% (206 of 206 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
2017-07-03 18:19:39 +00:00
34c9bbfd86
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/delintify
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
# Conflicts:
# src/components/views/rooms/RoomHeader.js
2017-07-03 19:15:38 +01:00
827c38d4a5
fix variable clash
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-03 19:13:07 +01:00
b7cc469f7b
Merge remote-tracking branch 'origin/develop' into develop
2017-07-03 18:04:36 +00:00
c565d31e53
Translated using Weblate (Malayalam)
...
Currently translated at 99.0% (204 of 206 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
2017-07-03 18:04:35 +00:00
cb17cb0535
Merge pull request #4443 from vector-im/t3chguy/patch-3
...
fix Quote not closing contextual menu
2017-07-03 19:04:31 +01:00
e0b9b4320a
Translated using Weblate (Malayalam)
...
Currently translated at 98.0% (202 of 206 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
2017-07-03 17:47:09 +00:00
5e5096c69d
Translated using Weblate (Malayalam)
...
Currently translated at 98.0% (202 of 206 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
2017-07-03 17:38:35 +00:00
c45f976d34
Translated using Weblate (Malayalam)
...
Currently translated at 97.0% (200 of 206 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
2017-07-03 17:19:08 +00:00
39ff11fe82
preinstall phantomjs to try get rid of boom error
2017-07-03 18:13:56 +01:00
3a055634f2
Translated using Weblate (Malayalam)
...
Currently translated at 97.0% (200 of 206 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
2017-07-03 17:10:11 +00:00
802e2e6bba
Translated using Weblate (Malayalam)
...
Currently translated at 96.1% (198 of 206 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
2017-07-03 17:06:05 +00:00
ca1b5ed611
Translated using Weblate (Malayalam)
...
Currently translated at 96.1% (198 of 206 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
2017-07-03 16:22:14 +00:00
b8dacd3bb1
Merge pull request #1165 from turt2live/travis/pad-12h
...
Don't pad 12h timestamps
2017-07-03 16:43:23 +01:00
45559f7cf0
AM/PM strings
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-07-03 09:25:03 -06:00
72eed70a84
Merge pull request #1173 from matrix-org/luke/fix-rte-forgets-me
...
Strip out "/me" after committing to RTE history
2017-07-03 15:59:07 +01:00
a7bb546b1f
Merge pull request #1172 from matrix-org/luke/fix-rte-md-format-without-selection
...
When formatting with MD enabled, move selection inside ** or equivalent
2017-07-03 15:58:02 +01:00
775f5a0e5b
Strip out "/me" after committing to RTE history
...
So that history can include emotes
Fixes https://github.com/vector-im/riot-web/issues/4472
2017-07-03 15:47:03 +01:00
86889b8e8c
When formatting with MD enabled, move selection inside ** or equivalent
...
Fixes https://github.com/vector-im/riot-web/issues/3225
Also insert `\n` after code-block and blockquote to fix https://github.com/vector-im/riot-web/issues/2746
2017-07-03 15:23:24 +01:00
a89ea39dba
Merge pull request #1170 from matrix-org/t3chguy/emojione-room-topic
...
make RoomHeader Topic use EmojiText to be emojione-friendly
2017-07-03 10:27:47 +01:00
5475f8ffbd
Merge remote-tracking branch 'origin/develop' into develop
2017-07-03 08:57:59 +00:00
657e195455
Translated using Weblate (Italian)
...
Currently translated at 54.8% (113 of 206 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
Is the same text
2017-07-03 08:57:59 +00:00
7894ac6651
Translated using Weblate (German)
...
Currently translated at 100.0% (206 of 206 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2017-07-03 08:57:59 +00:00
5d4b98d4f6
Merge pull request #4470 from vector-im/luke/css-emotes-pre-wrap
...
Apply white-space: pre-wrap to mx_MEmoteBody
2017-07-03 09:57:56 +01:00
2ef97e1689
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (916 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-07-01 18:55:22 +00:00
9ef83b8dc0
de-lint views/voip/*
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-01 14:58:46 +01:00
661a0f3956
de-lint Resend, RoomListSorter, UserActivity
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-01 14:50:22 +01:00
8bf13f8f48
de-lint email, extend
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-01 14:43:18 +01:00
f514f1ff74
de-lint DateUtils
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-01 14:42:12 +01:00
b937957609
de-lint createRoom
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-01 14:40:46 +01:00
7da14d7078
de-lint ObjectUtils
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-01 14:38:32 +01:00
68fb11d2bf
de-lint LifecycleStore
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-01 14:35:40 +01:00
a270c85295
de-lint Entities
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-01 14:34:20 +01:00
fdd8df87b0
de-lint PasswordReset
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-01 14:31:59 +01:00
b98c105dcc
de-lint Skinner, RoomNotifs
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-01 14:28:12 +01:00
b8ad0957b2
de-lint AddThreepid
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-01 14:21:28 +01:00
09ae6bba07
de-lint BasePlatform
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-01 14:15:26 +01:00
e56203f2a1
de-lint RoomHeader, Avatar, SdkConfig, SlashCommands
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-01 14:13:32 +01:00
fde7d5eaf4
make RoomHeader Topic use EmojiText to be emojione-friendly
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-01 13:36:28 +01:00
fb61a5d68b
post-merge fix
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-01 13:08:23 +01:00
09f017fdd2
Merge branches 'develop' and 't3chguy/add-missing-autocomplete-commands' of github.com:matrix-org/matrix-react-sdk into t3chguy/add-missing-autocomplete-commands
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
# Conflicts:
# src/autocomplete/CommandProvider.js
# src/i18n/strings/en_EN.json
2017-07-01 13:07:18 +01:00
9dba628f10
add missing commands to the Autocomplete CommandProvider
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-01 12:55:43 +01:00
Luke Barnard
Luke Barnard
Nathan van Beelen
നിദര്ശ്
Michael Telatynski
Pirate Praveen Arimbrathodiyil
Kelvin
Weblate
Michael Telatynski
turt2live
David Baker
Dreamwhite
Bamstam
Szimszon