ehealthsolutions/healthchat-web
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/healthchat-web.git synced 2026-11-08 23:48:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
63,695 Commits 208 Branches 566 Tags
develop
Commit Graph

63695 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate 8b6ed9f993 Merge remote-tracking branch 'origin/develop' into develop 2017-07-04 15:38:45 +00:00
Richard van der Hoff 48889b51b0 Bump to matrix-mock-request 1.0.0 
- for consistency with js-sdk updates
 2017-07-04 16:38:19 +01:00
Weblate c6492b3d8a Merge remote-tracking branch 'origin/develop' into develop 2017-07-04 15:30:17 +00:00
Kelvin 92ff1f2671 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-04 15:30:16 +00:00
Richard van der Hoff 5312c9ad4c Merge pull request #4489 from vector-im/rav/use_external_mock_request 
Use external mock-request
 2017-07-04 16:30:11 +01:00
Luke Barnard 6a80875c01 Only match users by matchgin displayname or user ID prefixes 
Because tab completing "k" probably shouldn't give you "luke"

Fixes https://github.com/vector-im/riot-web/issues/4495
 2017-07-04 16:29:06 +01:00
Luke Barnard 77a52b02cb Take RTE out of labs 
Goes with https://github.com/matrix-org/matrix-react-sdk/pull/1176
 2017-07-04 16:26:19 +01:00
Richard van der Hoff bd1196716a Use external mock-request 
mock-request is now factored out to matrix-mock-request; use it
 2017-07-04 15:59:21 +01:00
Luke Barnard 77348e6201 Remove spurious, unused code 2017-07-04 15:20:00 +01:00
Luke Barnard e6ec5742be _t should be used on string literals 
For scripts to easily find translations
 2017-07-04 15:06:24 +01:00
Luke Barnard e3f2eb5232 Take RTE out of labs! 🎉 
This stops react-sdk from tracking any state previously stored for the purposes of enabling or disabling the lab feature that enabled the new MessageComposer. It is now enabled permanently.

This is being done with the hope that we can get more feedback for it so that when we release we can be confident that people will be OK with the changes it brings.
 2017-07-04 14:44:55 +01:00
Luke Barnard 2e95f5871c Merge pull request #1175 from matrix-org/luke/fix-rte-autocomplete-sorting 
Improve the sorting applied to the sorting of autocomplete results
 2017-07-04 14:20:42 +01:00
Luke Barnard e688eca823 Improve the sorting applied to the sorting of autocomplete results 
QueryMatcher: sort results based on the position of the query within the matching value. The closer to the beginning of the word, the higher the result apears.

UserProvider: perf improvement (slice early) and refactor onUserSpoke
 2017-07-04 13:53:06 +01:00
Richard van der Hoff fb86534ba3 Merge pull request #1171 from matrix-org/t3chguy/delintify 
De-Lint 23 files
 2017-07-04 10:40:49 +01:00
Luke Barnard 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
Luke Barnard 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
Luke Barnard 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
Nathan van Beelen 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
Michael Telatynski fc379e2a15 fix typos post-luke-review 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-03 19:24:18 +01:00
Pirate Praveen Arimbrathodiyil 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
Kelvin 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
Kelvin 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
Michael Telatynski 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
Michael Telatynski 827c38d4a5 fix variable clash 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-03 19:13:07 +01:00
Weblate b7cc469f7b Merge remote-tracking branch 'origin/develop' into develop 2017-07-03 18:04:36 +00:00
Kelvin 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
Luke Barnard 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
Pirate Praveen Arimbrathodiyil 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
Kelvin 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
Pirate Praveen Arimbrathodiyil 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
Michael Telatynski 39ff11fe82 preinstall phantomjs to try get rid of boom error 2017-07-03 18:13:56 +01:00
Kelvin 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
Pirate Praveen Arimbrathodiyil 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
Luke Barnard b8dacd3bb1 Merge pull request #1165 from turt2live/travis/pad-12h 
Don't pad 12h timestamps
 2017-07-03 16:43:23 +01:00
turt2live 45559f7cf0 AM/PM strings 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-07-03 09:25:03 -06:00
David Baker 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
David Baker 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
Luke Barnard 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
Luke Barnard 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
David Baker 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
Weblate 5475f8ffbd Merge remote-tracking branch 'origin/develop' into develop 2017-07-03 08:57:59 +00:00
Dreamwhite 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
Bamstam 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
Luke Barnard 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
Szimszon 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
Michael Telatynski 9ef83b8dc0 de-lint views/voip/* 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-01 14:58:46 +01:00
Michael Telatynski 661a0f3956 de-lint Resend, RoomListSorter, UserActivity 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-01 14:50:22 +01:00
Michael Telatynski 8bf13f8f48 de-lint email, extend 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-01 14:43:18 +01:00