ehealthsolutions/healthchat-web
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/healthchat-web.git synced 2026-11-08 15:38:23 +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
Krombel fbe5dfce4d Translated using Weblate (German) 
Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2017-06-13 18:01:27 +00:00
David Baker acd7cf4439 Merge pull request #1089 from matrix-org/luke/set-email-after-password 
i18n for setting password flow
 2017-06-13 18:38:39 +01:00
Weblate a24acaee54 Merge remote-tracking branch 'origin/develop' into develop 2017-06-13 17:38:24 +00:00
Bamstam 7e272f95ff Translated using Weblate (German) 
Currently translated at 100.0% (198 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2017-06-13 17:38:24 +00:00
Jean 5a9d8b0624 Translated using Weblate (French) 
Currently translated at 92.9% (184 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
 2017-06-13 17:38:24 +00:00
David Baker 7af2a6c3a6 Merge pull request #4299 from vector-im/luke/set-email-after-password 
i18n for setting email after password flow
 2017-06-13 18:38:21 +01:00
Luke Barnard 31b3b4687a Trailing comma 2017-06-13 18:34:33 +01:00
Luke Barnard c8416b0321 i18n for setting email after password flow 2017-06-13 18:31:35 +01:00
Luke Barnard aa0ef51932 i18n for setting password flow 2017-06-13 18:28:43 +01:00
Matthew Hodgson 9dad5d0132 Merge pull request #1088 from matrix-org/t3chguy/fix_purple_e2e_room_settings 
remove mx_filterFlipColor from verified e2e icon so its not purple :/
 2017-06-13 17:45:56 +01:00
Michael Telatynski f4aadafed9 remove mx_filterFlipColor from verified e2e icon so its not purple :/ 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-13 17:42:30 +01:00
David Baker 5fd45233fb DM guessing: prefer oldest joined member 
In the DM guessing code, prefer the oldest joined member if there's
anyone in the rom other than us. Otherwise, fall back to the old
behaviour.

Fixes https://github.com/vector-im/riot-web/issues/4288
 2017-06-13 17:35:09 +01:00
Robert Swain d67e7289e8 Merge branch 'develop' into rob/apps 2017-06-13 15:50:43 +02:00
Robert Swain 03ba3bd431 Merge branch 'rxl881/apps' into rob/apps 2017-06-13 15:41:52 +02:00
Robert Swain 91eabbba60 MessageComposer: Trigger Jitsi app from call buttons 2017-06-13 15:35:13 +02:00
Robert Swain 5d898dd098 AuxPanel: Add type checking for userId and showApps properties 2017-06-13 15:34:05 +02:00
Robert Swain b63edcb390 AppTile: Support deletion of apps from room state 2017-06-13 15:33:17 +02:00
Robert Swain bcb2f8408b AppTile: Fix typo in property name 2017-06-13 15:32:40 +02:00
Robert Swain 2aa0aa61e3 AddAppDialog: Support adding apps to room state 2017-06-13 15:31:37 +02:00
Robert Swain a72cb794f2 AppsDrawer: Populate apps from room state 2017-06-13 15:28:37 +02:00
Robert Swain e2759774fc RoomView: Correctly pass userId from matrix client 
It isn't set in the state anywhere.
 2017-06-13 15:19:38 +02:00
Robert Swain 99b1de7f0e RoomView: Display AppsDrawer if apps in room state 2017-06-13 15:19:06 +02:00
Michael Telatynski 918efe5912 width and height must be int otherwise synapse cries 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-13 13:23:25 +01:00
David Baker bd00c1d4b1 Merge pull request #1083 from matrix-org/t3chguy/width_height_int 
width and height must be int otherwise synapse cries
 2017-06-13 13:23:12 +01:00
Richard van der Hoff 392cd7861d Merge pull request #1084 from matrix-org/rav/remove_roomstore_listener 
remove RoomViewStore listener from MatrixChat on unmount
 2017-06-13 13:10:49 +01:00
David Baker 27b8568fc0 Merge pull request #4290 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2017-06-13 13:07:00 +01:00
David Baker dfd9f7c27b New icons for riot-ios & riot-translations 2017-06-13 13:06:38 +01:00
David Baker 431b482d18 Don't put in spurious newline 2017-06-13 13:03:20 +01:00
David Baker aab87233c3 Add script to copy translations between files 
So we can fill in missing translations from different dialects

Use it to fill in missing strings in pt from pt_BR
 2017-06-13 13:03:13 +01:00
David Baker 24f1bd1460 Merge new translations 
Merge remote-tracking branch 'weblate/develop' into develop
 2017-06-13 13:02:25 +01:00
Luke Barnard 33f5d81d18 Only process user_directory response if it's for the current query 2017-06-13 13:01:33 +01:00
Luke Barnard 35620311b3 Fix regressions with starting a 1-1. 2017-06-13 13:01:21 +01:00
Richard van der Hoff aa07266f12 Test that we handle stored mx_last_room_id correctly 
* Do we show the last room correctly on resume?
 * Do we show the home page if we have no last room?
 * If we follow a login link, and re-log-in, do we correctly vape the
   mx_last_room_id (#4283)
 2017-06-13 12:52:35 +01:00
Richard van der Hoff 68e1a7be74 Clear persistent storage on login and logout 
Make sure that we don't end up with sensitive data sitting around in the stores
from a previous session.
 2017-06-13 12:51:47 +01:00
David Baker 2e07a0fa12 Merge pull request #1082 from matrix-org/dbkr/copy_translations 
Add script to copy translations between files
 2017-06-13 12:49:47 +01:00
Richard van der Hoff 939f6d0798 Factor createMatrixClient out from MatrixClientPeg 
... so that it can be used elsewhere.
 2017-06-13 12:46:49 +01:00
Richard van der Hoff 1ea9ed5d8c remove RoomViewStore listener from MatrixChat on unmount 
... to avoid spurious warnings from the tests.
 2017-06-13 12:39:26 +01:00
Michael Telatynski ad7c835471 width and height must be int otherwise synapse cries 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-13 12:19:20 +01:00
Krombel 70fd9b0283 Translated using Weblate (German) 
Currently translated at 100.0% (904 of 904 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-06-13 11:02:25 +00:00
David Baker 4eb7419335 Don't put in spurious newline 2017-06-13 11:54:28 +01:00
Tom Tryfonidis e2f2d34698 Translated using Weblate (Greek) 
Currently translated at 100.0% (198 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/el/
 2017-06-13 10:45:15 +00:00
Tom Tryfonidis a6cdab8107 Translated using Weblate (Greek) 
Currently translated at 96.0% (868 of 904 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/
 2017-06-13 10:44:25 +00:00
Richard Lewis 876899948f Merge in upstream changes 2017-06-13 11:44:23 +01:00
Richard Lewis 152e3c6258 Merge branch 'master' of https://github.com/vector-im/riot-web into rxl881/apps 2017-06-13 11:40:23 +01:00
David Baker 89c7477bd6 Add script to copy translations between files 
So we can fill in missing translations from different dialects

Use it to fill in missing strings in pt from pt_BR
 2017-06-13 11:39:37 +01:00
Luke Barnard 29371120ff Merge pull request #1081 from matrix-org/luke/fix-chat-invite-dialog-clobbered-request 
Only process user_directory response if it's for the current query
 2017-06-13 11:14:34 +01:00
Luke Barnard 10ba5f8c3c Only process user_directory response if it's for the current query 2017-06-13 11:03:22 +01:00
David Baker 13231620f1 Merge pull request #4290 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2017-06-13 10:52:06 +01:00
David Baker 701242a36b Merge pull request #1080 from matrix-org/luke/fix-start-1-1-regression 
Fix regressions with starting a 1-1.
 2017-06-13 10:42:55 +01:00
David Baker 27bc6dd16b Merge new translations 
Merge remote-tracking branch 'weblate/develop' into develop
 2017-06-13 10:37:45 +01:00