ehealthsolutions/healthchat-web
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/healthchat-web.git synced 2026-11-09 07:58:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,531 Commits 208 Branches 566 Tags
t3chguy/react18/createRoot
Commit Graph

62531 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baker 7720585cea Merge pull request #1849 from matrix-org/dbkr/cross_origin_renderer_origin_lock 
Support origin lock in cross-origin renderer
 2018-04-25 11:22:48 +01:00
Weblate ff93ace4cc Merge remote-tracking branch 'origin/develop' into develop 2018-04-25 10:22:00 +00:00
Ivan Shapovalov ae3158ff00 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-25 10:21:59 +00:00
David Baker 3bec9c5eb4 Merge pull request #6600 from vector-im/dbkr/readme_cross_origin_rendeer 
Add readme bit on cross-origin renderer
 2018-04-25 11:21:54 +01:00
Ivan Shapovalov 2421617d3f 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-25 10:12:25 +00:00
David Baker 964a3bc35b Add readme bit on cross-origin renderer 2018-04-25 11:10:46 +01:00
Luke Barnard 88624c8548 Upgrade to mocha 5.05 
primarily for use of `describe.only`
 2018-04-25 09:45:14 +01:00
Weblate eb07a0db79 Merge remote-tracking branch 'origin/develop' into develop 2018-04-24 16:59:35 +00:00
Ivan Shapovalov 81d4265ab6 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-24 16:59:35 +00:00
David Baker 4ced12d407 Merge pull request #1850 from matrix-org/dbkr/contian 
s/contian/contain/g
 2018-04-24 17:59:30 +01:00
David Baker 80837a9199 s/contian/contain/g 
Fixes https://github.com/vector-im/riot-web/issues/6565
 2018-04-24 17:53:23 +01:00
David Baker 79c3335765 Support origin lock in cross-origin renderer 
This adds a URL parameter to the cross-origin renderer that makes
it only accept messages from a given domain. This adds an extra
layer of security to the cross-origin iframe and is backwards
compatible in both directions.
 2018-04-24 16:05:14 +01:00
Weblate efbbd5ec0e Merge remote-tracking branch 'origin/develop' into develop 2018-04-24 14:08:43 +00:00
Ivan Shapovalov 8c008c244b 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-24 14:08:43 +00:00
RainSlide c4a1fa531a 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-24 14:08:42 +00:00
David Baker f41d897b9b Merge pull request #1848 from matrix-org/luke/fix-autocomplete-user-provider-at-query 
Don't autocomplete users for single "@"
 2018-04-24 15:08:37 +01:00
Ivan Shapovalov d67125d40f 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-24 13:56:04 +00:00
Ivan Shapovalov f53b1e9a3d 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-24 13:43:15 +00:00
Ivan Shapovalov 04d06d42ce 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-24 13:06:26 +00:00
Ivan Shapovalov 9123ad0659 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-24 13:05:43 +00:00
Ivan Shapovalov ae15db8208 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-24 13:00:21 +00:00
Luke Barnard a3c407992b Don't autocomplete users for single "@" 2018-04-24 13:59:18 +01:00
Ivan Shapovalov e3ad75cca6 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-24 12:52:07 +00:00
Ivan Shapovalov c097a8239d 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-24 12:36:01 +00:00
Ivan Shapovalov 4ec1973888 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-24 12:35:35 +00:00
Ivan Shapovalov 20454b92ab 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-24 10:11:18 +00:00
Ivan Shapovalov 5732b3ac0e 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/

по аналогии с "the platform you're on" — там нет местоимения
 2018-04-24 10:09:28 +00:00
Ivan Shapovalov 166474d869 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-24 10:01:21 +00:00
Ivan Shapovalov ed51a8794d 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-24 09:44:13 +00:00
Weblate 95b3f74790 Merge remote-tracking branch 'origin/develop' into develop 2018-04-24 08:44:11 +00:00
Matthew Hodgson 44bc60105a Merge pull request #1844 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2018-04-24 09:44:04 +01:00
Weblate b8556671c5 Merge remote-tracking branch 'origin/develop' into develop 2018-04-24 08:43:10 +00:00
Matthew Hodgson 6b2c8539a3 Merge pull request #6573 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2018-04-24 09:43:03 +01:00
Weblate 97a0af2870 Merge remote-tracking branch 'origin/develop' into develop 2018-04-23 18:18:07 +00:00
Szimszon b6157499a8 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-23 18:18:07 +00:00
Luke Barnard 459454f559 Merge pull request #1846 from matrix-org/dbkr/bind_onimageerror 
Bind onImageError in constructor
 2018-04-23 19:17:59 +01:00
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