OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
15,574 Commits
229 Branches
566 Tags
473 MiB
Commit Graph

15574 Commits (d0deffac3dad3feef48bdbb6f42dce3a376d1cb0)

Author SHA1 Message Date
Andrew Morgan d0deffac3d Move checkmark to the front of key backup message 2019-05-22 15:19:42 +01:00
David Baker 03d092c574
Merge pull request #3010 from matrix-org/dbkr/uiauth_send_email 
js-sdk interactive auth now sends email token
 2019-05-22 14:24:14 +01:00
Bruno Windels e44f3b65e6
Merge pull request #3011 from matrix-org/bwindels/removesbix 
remove SBIX font and fallback to native emoji
 2019-05-22 11:50:06 +00:00
David Baker 983f39cb5f
Merge pull request #3012 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2019-05-22 12:47:48 +01:00
Bruno Windels 7a20dbe657 make sure we don't load the twemoji font multiple times on firefox 2019-05-22 13:07:54 +02:00
Bruno Windels ee86471691 remove SBIX font and fallback to native emoji 2019-05-22 13:06:04 +02:00
David Baker 90eb3ce9ec js-sdk interactive auth now sends email token 
We previously sent it in componentWillMount of the email token
auth component which definitely gets us on react's naughtly list.
We now pass the js-sdk a callback it can call at the appropriate
time to send the token (https://github.com/matrix-org/matrix-js-sdk/pull/926).

We should make password reset and adding email addresses work the
same way, but currently they don't even use the interactive-auth
helpers(!) so they're unaffected.

https://github.com/vector-im/riot-web/issues/9586
 2019-05-22 11:51:26 +01:00
Weblate e7c1bd45b3 Merge branch 'origin/develop' into Weblate. 2019-05-22 09:36:21 +00:00
Bruno Windels 038cc45ee1
Merge pull request #3008 from matrix-org/matthew/fontmanager 
load twemoji dynamically as colr or sbix; fix monospace
 2019-05-22 09:36:15 +00:00
Bruno Windels 3d9e631d18
no space in !important 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-05-22 09:35:09 +00:00
Bruno Windels 1bdcb0c35a remove obsolete comments 2019-05-22 11:19:35 +02:00
Bruno Windels 10b5a9376e fix lint 2019-05-22 11:17:38 +02:00
Bruno Windels 1345db5f98 remove fira font 2019-05-22 11:16:29 +02:00
Bruno Windels 85b448deb6 enable cache busting for twemoji font 2019-05-22 11:13:44 +02:00
Weblate d610ffb6aa Merge branch 'origin/develop' into Weblate. 2019-05-22 09:13:41 +00:00
J. Ryan Stinnett a79dd43f2d
Merge pull request #3009 from matrix-org/jryans/decrypt-null-room 
Guard against null rooms in `onEventDecrypted`
 2019-05-22 10:13:37 +01:00
J. Ryan Stinnett 2648dbd221 Guard against null rooms in `onEventDecrypted` 
Timeline sets may have a null room, such as with the notification timeline set.
Here we check that case when events are decrypted to avoid throw an error.

Fixes https://github.com/vector-im/riot-web/issues/9798
 2019-05-22 10:08:16 +01:00
Bruno Windels 9f4eb7782c exclude FF from COLR font check 2019-05-22 11:08:11 +02:00
Weblate d2c9cc8785 Merge branch 'origin/develop' into Weblate. 2019-05-22 08:15:12 +00:00
Szimszon 294f1f84f8 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1634 of 1634 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-05-22 08:15:12 +00:00
Kévin C 012ce3896d Translated using Weblate (French) 
Currently translated at 99.9% (1632 of 1634 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-05-22 08:15:12 +00:00
Tuomas Hietala a15003d70a Translated using Weblate (Finnish) 
Currently translated at 99.0% (1618 of 1634 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-05-22 08:15:12 +00:00
Fendo fc0e7a8e14 Translated using Weblate (Esperanto) 
Currently translated at 77.1% (1259 of 1634 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2019-05-22 08:15:11 +00:00
J. Ryan Stinnett 4b4d09266e
Merge pull request #3005 from matrix-org/jryans/notif-error 
Only show reactions in main message timeline
 2019-05-22 09:15:04 +01:00
Matthew Hodgson 0024a88daf Inconsolata 2019-05-22 03:05:57 +01:00
Matthew Hodgson 30912dec17 fix lint 2019-05-22 02:41:07 +01:00
Matthew Hodgson 4ae652e5c3 load twemoji dynamically as colr or sbix; fix monospace 2019-05-22 02:31:24 +01:00
Weblate e2cbfa6ce7 Merge branch 'origin/develop' into Weblate. 2019-05-21 18:43:43 +00:00
Kévin C 7d5beb1895 Translated using Weblate (French) 
Currently translated at 99.9% (1631 of 1633 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-05-21 18:43:43 +00:00
Fendo ab2856b381 Translated using Weblate (Esperanto) 
Currently translated at 76.4% (1247 of 1633 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2019-05-21 18:43:43 +00:00
Travis Ralston 8b9017891b
Merge pull request #3006 from matrix-org/travis/sr/newrooms 
Add voice labels for quick add room buttons
 2019-05-21 12:43:37 -06:00
Travis Ralston c2c55e06e6 Add voice labels for quick add room buttons 
See https://github.com/vector-im/riot-web/issues/9747
 2019-05-21 12:16:34 -06:00
J. Ryan Stinnett 238e967470 Only show reactions in main message timeline 
This fixes an error that crashed that notifications panel because it was trying
to read reactions, even though we currently don't aggregate them there. This
change is more explicit about exactly which views should try to show reactions.

Fixes https://github.com/vector-im/riot-web/issues/9713
 2019-05-21 18:27:10 +01:00
Weblate aa30e9cee3 Merge branch 'origin/develop' into Weblate. 2019-05-21 15:52:30 +00:00
Travis Ralston 907c7ed119
Merge pull request #2994 from matrix-org/travis/screenreader/topleftmenu 
Update TopLeftMenu for accessibility: Keyboard shortcut, reduced screen reader noise
 2019-05-21 09:52:26 -06:00
Weblate 5469a92b66 Merge branch 'origin/develop' into Weblate. 2019-05-21 15:39:14 +00:00
J. Ryan Stinnett b4ca586431 Fix lint errors in NotificationPanel 2019-05-21 16:38:48 +01:00
Travis Ralston bf28993509 appease the js-doc linter 
hopefully
 2019-05-21 09:33:52 -06:00
Weblate f0056e54b7 Merge branch 'origin/develop' into Weblate. 2019-05-21 14:41:55 +00:00
J. Ryan Stinnett 2e052c925c
Merge pull request #3003 from matrix-org/jryans/hide-fallback-emoji 
Remove reacted with text when shortcode missing
 2019-05-21 15:41:50 +01:00
Weblate 5a30ac4af2 Merge branch 'origin/develop' into Weblate. 2019-05-21 14:33:44 +00:00
Bruno Windels ef4fe52d6b
Merge pull request #3002 from matrix-org/bwindels/pill-avatar-fixup 
Fixup: also change editor margin when last event and buttons are not overlaying
 2019-05-21 14:33:39 +00:00
J. Ryan Stinnett 18d444d2e7 Remove reacted with text when shortcode missing 
If we don't have the shortcode for some emoji, don't show any "reacted with X"
text in the reaction tooltip.

Fixes https://github.com/vector-im/riot-web/issues/9786
 2019-05-21 15:08:11 +01:00
Bruno Windels 30d374dff4 also changing margin when last event and buttons are not overlaying 2019-05-21 16:06:14 +02:00
Weblate 571e8da651 Merge branch 'origin/develop' into Weblate. 2019-05-21 12:11:11 +00:00
Bruno Windels 2d4d608ed6
Merge pull request #2997 from matrix-org/bwindels/pill-avatars 
Message editing: render avatars for pills in the editor
 2019-05-21 12:11:06 +00:00
Bruno Windels e48e72c162 pr feedback 2019-05-21 13:50:27 +02:00
Bruno Windels fb03b5b168 fix lint 2019-05-21 13:49:43 +02:00
Weblate f2399887e5 Merge branch 'origin/develop' into Weblate. 2019-05-21 10:32:59 +00:00
Matthew Hodgson 30a485bddd
Merge pull request #2995 from matrix-org/matthew/twemoji 
Replace emojione with twemoji + emojibase
 2019-05-21 11:32:53 +01:00