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
Elia f2fa326c0c Translated using Weblate (Turkish) 
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/tr/
 2017-06-18 02:07:10 +00:00
David Pérez-Suárez e0e18d25ea Translated using Weblate (Spanish) 
Currently translated at 67.6% (613 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2017-06-18 00:58:28 +00:00
David Pérez-Suárez d9b63a482c Translated using Weblate (Spanish) 
Currently translated at 60.5% (121 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
 2017-06-17 23:56:40 +00:00
Elia c585d80e3e Added translation using Weblate (Turkish) 2017-06-17 23:49:43 +00:00
Christopher Armstrong 9c8be72574 Translated using Weblate (English (United States)) 
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/en_US/
 2017-06-17 23:42:12 +00:00
Enrique 18971458df Translated using Weblate (Spanish) 
Currently translated at 67.5% (612 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2017-06-17 23:37:54 +00:00
Enrique e6551e4590 Translated using Weblate (Spanish) 
Currently translated at 58.5% (117 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
 2017-06-17 23:31:31 +00:00
Walter 7cdb73d74b Translated using Weblate (Russian) 
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/ru/
 2017-06-16 20:22:12 +00:00
Szimszon 3d0da059dc Translated using Weblate (Hungarian) 
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/hu/
 2017-06-16 17:49:58 +00:00
Luke Barnard ba95d7a16c Merge pull request #1113 from matrix-org/luke/fix-no-peek-on-create 
Don't peek when creating a room
 2017-06-16 18:35:20 +01:00
Luke Barnard be58e1095e Don't peek when creating a room 
This causes a race between receiving the room when starting to peek and receiving the room from joining it - https://github.com/vector-im/riot-web/issues/4330, https://github.com/matrix-org/riot-web-rageshakes/issues/196
 2017-06-16 18:24:07 +01:00
David Baker e1b9337bbc Merge pull request #1111 from matrix-org/dbkr/remove_collapse_rhs 
Remove unused collapse_rhs
 2017-06-16 16:51:48 +01:00
Michael Telatynski 7b4cd31124 make forward_message be friendly with the RVS stuffs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-16 16:12:52 +01:00
Michael Telatynski 274536bf13 change dispatcher forward_event signature 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-16 16:11:33 +01:00
David Baker 8e8af5eb5c Merge branch 'dbkr/remove_collapse_rhs' into erikj/group_server 2017-06-16 15:59:18 +01:00
David Baker aa7ddfe86e Remove unused collapse_rhs 
Remove all the places we pass collapse_rhs through to places it's
never used. Remove the commented RHS collapse button from
SimpleRoomHeader.
 2017-06-16 15:47:40 +01:00
Richard van der Hoff db3d9c0573 Make Lifecycle.loadSession return an explicit result 
- rather than inferring it from the fact it didn't call logging_in.
 2017-06-16 15:23:09 +01:00
Richard van der Hoff 5f689b7929 Merge branch 'rav/fix_token_redirect' into rav/refactor_matrixclient_states_tmp 2017-06-16 15:20:47 +01:00
Richard van der Hoff eb1fc9ae2d Avoid transitioning to loggedIn state during token login 
Fixes riot-web#4334

When we do a token login, don't carry on with the normal app startup
(transitioning to the loggedIn state etc) - instead tell the app about the
successful login and wait for it to redirect.

Replace onLoadCompleted with onTokenLoginCompleted so that the app can see what
it's supposed to be doing.
 2017-06-16 15:05:53 +01:00
Richard van der Hoff 6df1574b8b onLoadCompleted is now onTokenLoginCompleted 2017-06-16 15:05:14 +01:00
Michael Telatynski 8c333dc3f7 remove debug and add comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-16 14:39:31 +01:00
David Baker 236cf1efb2 Merge remote-tracking branch 'origin/develop' into erikj/group_server 2017-06-16 14:19:54 +01:00
David Baker 8cf6712426 v0.11.2-rc.2 v0.11.2-rc.2 2017-06-16 13:32:57 +01:00
David Baker 37a219006d Prepare changelog for v0.11.2-rc.2 2017-06-16 13:32:57 +01:00
David Baker 97611cfd27 v0.11.2-rc.2 2017-06-16 13:30:49 +01:00
David Baker 1a12528634 react-sdk rc.2 2017-06-16 13:30:27 +01:00
David Baker f4f7c605a5 Merge remote-tracking branch 'origin/develop' into release-v0.11.2 2017-06-16 13:30:13 +01:00
David Baker 12ad9a2c58 v0.9.5-rc.2 2017-06-16 13:28:49 +01:00
David Baker 5f42eb73c1 Prepare changelog for v0.9.5-rc.2 2017-06-16 13:28:48 +01:00
David Baker f2bcf4d5f2 Merge remote-tracking branch 'origin/develop' into release-v0.9.5 2017-06-16 13:27:30 +01:00
David Baker 6a2c2d64fa Merge pull request #1109 from matrix-org/rav/fix_cas_login 
Avoid getting stuck in a loop in CAS login
 2017-06-16 13:21:52 +01:00
Weblate 490a696567 Merge remote-tracking branch 'origin/develop' into develop 2017-06-16 12:06:44 +00:00
Richard van der Hoff 1f719b3f7d Avoid getting stuck in a loop in CAS login 
498ea53 made it so that the #/login URL fragment was prioritised over the token
params in the query string; unfortunately that also means that CAS login gets
stuck in a loop where you always get redirected back to the login view.

Prioritising the URL fragment over the token params may or may not be the
correct thing to, but I also think it's incorrect that we ask the CAS server to
redirect us back to #/login. Accordingly, the easiest fix here is just to clear
the URL fragment before redirecting to CAS.
 2017-06-16 13:06:28 +01:00
David Baker 491d83b17f Enable Korean Translations 
As it's now at 64% on react-sdk and looking good
 2017-06-16 13:05:56 +01:00
David Baker 131e3ae68f Merge pull request #1101 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2017-06-16 12:57:56 +01:00
Weblate 55fad1910a Merge remote-tracking branch 'origin/develop' into develop 2017-06-16 11:56:45 +00:00
David Baker 00c2235381 Merge pull request #4323 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2017-06-16 12:56:41 +01:00
Weblate d2d47bd8a2 Merge remote-tracking branch 'origin/develop' into develop 2017-06-16 11:51:35 +00:00
IMIN af7a82cdae Translated using Weblate (Korean) 
Currently translated at 64.2% (582 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
 2017-06-16 11:51:31 +00:00
Richard van der Hoff 3884c5ccf0 Log an error on unknown state instead of throwing 2017-06-16 11:51:12 +01:00
Richard van der Hoff 5e5639b730 Fix half-written comment 2017-06-16 11:50:53 +01:00
Weblate aff2a50cdd Merge remote-tracking branch 'origin/develop' into develop 2017-06-16 10:48:34 +00:00
IMIN 5bc676a042 Translated using Weblate (Korean) 
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/ko/
 2017-06-16 10:48:34 +00:00
David Baker 05c667b34b Merge pull request #4332 from vector-im/dbkr/fix_wierd_h2 
Fix h2 in markdown being weird
 2017-06-16 11:48:31 +01:00
David Baker 2c186aafae Fix h2 in markdown being weird 
Date separator style was just define don any h2 in the message
list, so got picked up by any h2s in markdown too. Give date
separators their own class.

Fixes https://github.com/vector-im/riot-web/issues/4328
 2017-06-16 11:36:24 +01:00
David Baker 739a120cf0 Merge pull request #1108 from matrix-org/luke/fix-not-showing-next-room-on-reject 
Correctly inspect state when rejecting invite
 2017-06-16 11:34:10 +01:00
Luke Barnard 82b2da7833 Correctly inspect state when rejecting invite 
So that we view_next_room if we're looking at the room we're rejecting
 2017-06-16 11:27:47 +01:00
David Baker 64b555dfe3 Merge pull request #1107 from matrix-org/luke/fix-use-room-alias-in-preview 
Make sure to pass the roomAlias to the preview header if we have it
 2017-06-16 11:21:03 +01:00
Luke Barnard 807f01b57e Make sure to pass the roomAlias to the preview header if we have it 2017-06-16 11:10:55 +01:00
Enrique 319cdd56e3 Translated using Weblate (Spanish) 
Currently translated at 58.0% (116 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
 2017-06-16 09:42:41 +00:00