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
Weblate 502cba0be5 Merge remote-tracking branch 'origin/develop' into develop 2018-03-12 17:54:05 +00:00
Luke Barnard dfb0eb5233 Merge pull request #6303 from vector-im/luke/fix-group-invite-flow 
Fix bug where cannot send group invite on GroupMemberInfo phase
 2018-03-12 17:54:04 +00:00
Luke Barnard 99b3922998 Merge pull request #1796 from matrix-org/luke/fix-group-invite-flow 
Show GroupMemberList after inviting a group member
 2018-03-12 17:53:59 +00:00
Weblate 2f0d3f1313 Merge remote-tracking branch 'origin/develop' into develop 2018-03-12 17:53:10 +00:00
Luke Barnard 5eae913803 Merge pull request #6301 from vector-im/luke/fix-firefox-wrong-theme 
Fix themeing bug with Firefox where "disabled" ignored
 2018-03-12 17:53:03 +00:00
Luke Barnard 0a480b05aa Show GroupMemberList after inviting a group member 
because we might be looking at a member when inviting a new
member.

See https://github.com/vector-im/riot-web/pull/6303
 2018-03-12 17:23:31 +00:00
Luke Barnard afb9fdf4ec Fix bug where cannot send group invite on GroupMemberInfo phase 
by not reusing the same function and invoking separate conditions
to decide what the function does but instead using different
functions.

Also, show the GroupMemberList after inviting a member, otherwise
we might end up looking at the member we were already looking at
instead of the updated list of members.
 2018-03-12 17:18:30 +00:00
Luke Barnard 647c7d7629 Fix themeing bug with Firefox where "disabled" ignored 
A bug in firefox means "disabled" isn't honoured when set in the
HTML. Doing `a.disabled = false` does work however, and Chrome
also appears to honour this.
 2018-03-12 16:15:17 +00:00
Weblate 05cdd8098b Merge remote-tracking branch 'origin/develop' into develop 2018-03-12 15:33:08 +00:00
Slavi Pantaleev 791ef02715 Translated using Weblate (Russian) 
Currently translated at 99.7% (993 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-03-12 15:33:07 +00:00
Slavi Pantaleev 5885104c3a Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-03-12 15:33:06 +00:00
Luke Barnard 0341b299ae Merge pull request #1794 from matrix-org/dbkr/baseavatar_syntax 
Fix syntax fail
 2018-03-12 15:33:00 +00:00
David Baker d416b9d7d1 Copyright 2018-03-12 15:24:32 +00:00
David Baker ac85938186 Fix syntax fail 2018-03-12 15:23:22 +00:00
Richard Lewis b2d23b6999 Switch to 'm.sticker' message events. Allow whitelisting of wisget capabilities. 2018-03-12 13:56:02 +00:00
Andrey 5854c5f42c Translated using Weblate (Russian) 
Currently translated at 99.7% (993 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-03-12 12:09:57 +00:00
Ralitsa Bozhkova d1961ab111 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-03-12 12:02:44 +00:00
Марко М. Костић 46d1328af4 Translated using Weblate (Serbian) 
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
 2018-03-11 14:09:30 +00:00
Ralitsa Bozhkova bf41b7b91f Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-03-10 10:37:27 +00:00
Michael Telatynski 14f29e4740 fix the bugs Tulir found - THANKS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-03-09 23:37:42 +00:00
Michael Telatynski 023632e7e4 only strip reply fallbacks if the lab is enabled 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-03-09 23:12:13 +00:00
Richard Lewis 46f46ee294 Simplify request mapping. 2018-03-09 23:04:00 +00:00
Richard Lewis 7e062090de Cleanup timeout before unmount. 2018-03-09 21:12:56 +00:00
Szimszon b92e74bc60 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-03-09 19:15:05 +00:00
Nathan van Beelen 52ce709840 Translated using Weblate (Dutch) 
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/nl/
 2018-03-09 14:23:53 +00:00
Nathan van Beelen d4d8ed7797 Translated using Weblate (Dutch) 
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2018-03-09 14:23:08 +00:00
Richard Lewis a33859326e Use getUserWidgets where possible. 2018-03-09 09:15:16 +00:00
Weblate 1b9bd33692 Merge remote-tracking branch 'origin/develop' into develop 2018-03-09 02:00:35 +00:00
Matthew Hodgson aa54032500 force refresh when updating the app 2018-03-09 01:45:44 +00:00
Richard Lewis 351f9b32ea Remove broken transitions. 2018-03-08 23:54:44 +00:00
Richard Lewis e7c19fd83b Don't render placeholder when image is visible. 2018-03-08 23:12:12 +00:00
Luke Barnard abb8413c16 Fix gap between avatar and border 
With the caveat that this will give a solid background
to group avatars with transparency when they are selected.
 2018-03-08 18:01:05 +00:00
Richard Lewis e36ae3cede Fix context menu offset. 2018-03-08 17:33:07 +00:00
Weblate 9524d1c313 Merge remote-tracking branch 'origin/develop' into develop 2018-03-08 17:30:21 +00:00
David Baker e87f8ee7b8 Merge pull request #1793 from matrix-org/luke/fix-tag-panel-clear-filter-tinting 
Use TintableSvg for TagPanel clear filter button
 2018-03-08 17:30:17 +00:00
Richard Lewis fdec4b36c9 Hide padding if last control. 2018-03-08 17:25:28 +00:00
Richard Lewis 3ab8b1f866 Hide sticker picker delete button and show minimise button. 2018-03-08 17:20:42 +00:00
Luke Barnard 5ba55858e8 Use TintableSvg for TagPanel clear filter button 2018-03-08 17:06:48 +00:00
Luke Barnard 2bdaf5026d Correctly position mx_TagPanel_clearButton 2018-03-08 17:05:13 +00:00
Kévin C 99c15be766 Translated using Weblate (French) 
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-03-08 16:57:54 +00:00
Weblate 3d34596162 Merge remote-tracking branch 'origin/develop' into develop 2018-03-08 16:47:50 +00:00
Luke Barnard a03778388d Merge pull request #1792 from matrix-org/luke/fix-privileged-users-cosmetics 
Fix missing space between "...is a" and user ID
 2018-03-08 16:47:46 +00:00
Luke Barnard a1d0cf65d6 Fix missing space between "...is a" and user ID 2018-03-08 16:34:19 +00:00
Weblate 511a192d8b Merge remote-tracking branch 'origin/develop' into develop 2018-03-08 15:08:08 +00:00
Weblate b5c44e6b36 Merge remote-tracking branch 'origin/develop' into develop 2018-03-08 15:08:05 +00:00
Luke Barnard c3ebe1f591 Merge pull request #6288 from vector-im/luke/e2e-request-keys-button 
Changes for E2E "fudge-button"
 2018-03-08 15:08:02 +00:00
Luke Barnard 5148ca1a88 Merge pull request #1791 from matrix-org/luke/e2e-request-keys-button 
E2E "fudge-button"
 2018-03-08 15:07:58 +00:00
Luke Barnard 3a3cced905 E2E "fudge-button" 
Implement a UI to expose a JS-SDK API for cancelling and resending
a room key request for an event.

This is useful in scenarios where the user has dismissed the request
on their other devices and would like to send the restart the
verification dance manually.

Depends on JS-SDK PR https://github.com/matrix-org/matrix-js-sdk/pull/624
 2018-03-08 14:13:33 +00:00
Luke Barnard 1119098eec Alter style of TooltipButton_helpText 
- Aligned to the "start" of the text (left for LTR, right for RTL)
 - Increase width by 200px
 2018-03-08 14:11:36 +00:00
Luke Barnard 8d5717b812 Allow arbitrary React nodes in RoomTooltip 2018-03-08 14:11:06 +00:00