ehealthsolutions/healthchat-web
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/healthchat-web.git synced 2026-11-10 09:15:16 +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
David Baker f5956c87f6 Bind onImageError in constructor 
Tt uses `this` but wasn't bound anywhere so the error handler was
just throwing an exception.
 2018-04-23 18:14:59 +01:00
Weblate e165c42377 Merge remote-tracking branch 'origin/develop' into develop 2018-04-23 17:12:39 +00:00
Matthew Hodgson 845bb3fa09 Merge pull request #6588 from vector-im/dbkr/fix_media_2 
Copy media from react-sdk
 2018-04-23 18:12:34 +01:00
David Baker 0abaff5aed Copy media from react-sdk 
Looks like this just got missed

Fixes https://github.com/vector-im/riot-web/issues/6586
 2018-04-23 17:27:35 +01:00
Weblate ef3e471766 Merge remote-tracking branch 'origin/develop' into develop 2018-04-23 12:20:13 +00:00
Luke Barnard 0d223bd5e4 Merge pull request #1841 from matrix-org/dbkr/set_display_name_text 
Use mxid as sender name on set display name
 2018-04-23 13:20:06 +01:00
Weblate e4837af72e Merge remote-tracking branch 'origin/develop' into develop 2018-04-23 10:50:43 +00:00
David Baker 82f51fb476 Merge pull request #6580 from vector-im/dbkr/fix_favicon_2 
Fix favicon
 2018-04-23 11:50:38 +01:00
David Baker f012dd5f31 Fix favicon 
In removing 'media' here, it changed the meaning of the copy so
the contents of vector-icons (rather than the dir itself) got
copied to webapp/
 2018-04-23 11:28:01 +01:00
Michael Telatynski 0f11bc62cc undo code style change 2018-04-23 10:58:39 +01:00
Michael Telatynski 5f920f729b Reset accidental merge changes 2.0 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-23 10:35:02 +01:00
Michael Telatynski 057815ac9f Reset accidental merge changes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-23 10:30:14 +01:00
Weblate 414b9e39cb Merge remote-tracking branch 'origin/develop' into develop 2018-04-23 09:15:45 +00:00
Luke Barnard fa318ef381 Merge pull request #1840 from matrix-org/dbkr/fix_rageshake 
Fix rageshake
 2018-04-23 10:15:39 +01:00
Michael Telatynski d680d805ce Merge branch 'develop' into t3chguy/m.relates_to 2018-04-23 10:14:48 +01:00
Osoitz c32fc677b2 Translated using Weblate (Basque) 
Currently translated at 100.0% (1161 of 1161 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-04-23 04:18:33 +00:00
Osoitz c94d5c1a9a Translated using Weblate (Basque) 
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eu/
 2018-04-23 04:14:14 +00:00
Eric Newport d42fa9d17a Hide inline encryption icons except when hovering over a message 
Closes https://github.com/vector-im/riot-web/issues/2882

This is a redo of https://github.com/matrix-org/matrix-react-sdk/pull/1707 (see associated discussion there and here: https://github.com/vector-im/riot-web/pull/5988)

I tried several times to resolve the conflicts correctly, but could not. Thus, fresh PR.
 2018-04-22 22:30:37 -04:00
Matthew Hodgson 75a2be1a8d WIP (doesn't build yet) replacing draft with slate 2018-04-23 01:13:18 +01:00
Weblate 3ef5b8eb0e Merge remote-tracking branch 'origin/develop' into develop 2018-04-21 19:35:18 +00:00
Matthew Hodgson 44d92bb32e Merge pull request #1843 from aidalgol/room-avatar-lightbox 
Add UI for displaying room avatars full size
 2018-04-21 20:35:13 +01:00
Megumin 9eb449484e Translated using Weblate (Icelandic) 
Currently translated at 67.5% (25 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/is/
 2018-04-21 19:28:44 +00:00
RainSlide 5aed7a375d Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/
 2018-04-21 19:28:44 +00:00
Szimszon 3d58474295 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1161 of 1161 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-04-21 19:28:43 +00:00
RainSlide 301798a7f5 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 97.5% (1132 of 1161 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
 2018-04-21 19:28:42 +00:00
Val 03b46e766b Translated using Weblate (French) 
Currently translated at 99.9% (1161 of 1161 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-04-21 13:09:39 +00:00
Kévin C 9d27cb0751 Translated using Weblate (French) 
Currently translated at 99.9% (1160 of 1161 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-04-21 13:09:38 +00:00
Kévin C aa82513c7e Translated using Weblate (French) 
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
 2018-04-21 13:08:51 +00:00
Slavi Pantaleev 269190266a Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (1161 of 1161 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-04-21 11:39:55 +00:00
Ralitsa Bozhkova 4107c64ac2 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/
 2018-04-21 11:38:25 +00:00
Aidan Gauland a8e578f5b8 Move and reword note about out-of-date dev setup 
Replace an inline, parenthetical note about possible failures of the `npm run`
scripts with additional items in the Requirements section.
 2018-04-21 21:52:56 +12:00
Aidan Gauland 6d74d5f8b7 Correct instructions to use the i18n scripts 
As per code review feedback, we should use the npm run scripts i18n and
i18n-prune instead of editing the i18n JSON files directly.
 2018-04-21 21:46:37 +12:00
Sveinn í Felli ff214c48f5 Translated using Weblate (Icelandic) 
Currently translated at 59.4% (22 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/is/
 2018-04-21 08:08:10 +00:00
Sveinn í Felli a012522e88 Translated using Weblate (Icelandic) 
Currently translated at 37.8% (14 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/is/
 2018-04-21 07:08:20 +00:00
Gergely Bakos 9036f14e84 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
 2018-04-21 06:33:13 +00:00
Szimszon 8ed2dadc3b Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1161 of 1161 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-04-21 06:32:06 +00:00
Aidan Gauland 6a918861bb Add UI for displaying room avatars full size 
Change the onClick action on the RoomAvatar inside RoomHeader so that it brings
up a lightbox with the full-size avatar.
 2018-04-21 15:47:31 +12:00
Jeff Huang 99c4951074 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1161 of 1161 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-04-21 02:44:28 +00:00
Yao Wei e450f31588 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/
 2018-04-21 02:43:48 +00:00
Andrey 144ba30e6b Translated using Weblate (Russian) 
Currently translated at 100.0% (1161 of 1161 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-04-20 18:59:12 +00:00
Andrey 7c15c6847b Translated using Weblate (Russian) 
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
 2018-04-20 18:49:50 +00:00
RainSlide 9cb26c8748 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/
 2018-04-20 16:14:07 +00:00
Krombel ffba7e0d32 Translated using Weblate (German) 
Currently translated at 100.0% (1161 of 1161 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2018-04-20 14:57:44 +00:00
Bamstam 1396a26b6d Translated using Weblate (German) 
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2018-04-20 14:57:23 +00:00
David Baker 8d88e3be11 Run i18n and prune i18n 
Any translations added to components now in react-sdk should be
merged over to react-sdk in https://github.com/matrix-org/matrix-react-sdk/commit/196b855cd5287ae28bc7c0fa2cccf9ab85793b6d
 2018-04-20 15:53:35 +01:00
David Baker 196b855cd5 Merge translations from riot-web 
Translations that were added to the riot-web repo after the
containing files had been moved here.
 2018-04-20 15:50:23 +01:00
David Baker ce3d813c12 Prune i18n 2018-04-20 15:37:19 +01:00
David Baker 6154c13c95 Re-run npm run i18n 2018-04-20 15:35:31 +01:00
David Baker c98e977533 Merge pull request #6569 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2018-04-20 15:31:30 +01:00
Morten Juhl-Johansen Zölde-Fej 189e7e628b Translated using Weblate (Danish) 
Currently translated at 100.0% (221 of 221 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/da/
 2018-04-20 14:18:28 +00:00