Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-18 06:35:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,820 Commits 206 Branches 552 Tags 519 MiB
0c1846630c
Commit Graph

8239 Commits

Author SHA1 Message Date
Krombel
60be988025 Translated using Weblate (German) 
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2018-04-30 14:54:05 +00:00
David Baker
e28a927da9 lint 2018-04-30 14:34:14 +01:00
David Baker
c3420c37fd Indentation 2018-04-30 14:25:42 +01:00
David Baker
54cccab0c7 Factor out clearStorageButton 2018-04-30 14:22:18 +01:00
David Baker
5d46efc3e8 Get docs right on hasCancel 2018-04-30 14:17:21 +01:00
David Baker
dcaacfd204 Merge remote-tracking branch 'origin/develop' into dbkr/fix_session_restore_fail_dialog_ux 2018-04-30 14:06:32 +01:00
David Baker
a9b6db3f2e Lint 2018-04-30 13:41:04 +01:00
David Baker
37cb8abf13 Fix UX issues with bug report dialog 
* Make it use BaseDialog / DialogButtons (also gives it has a top-right 'x' &
   escape to cancel works)
 * Stop misusing the 'danger' CSS class on the buttons. There is nothing dangerous
   about submitting logs.
 * Continued campaign against 'Click here' links.

Fixes https://github.com/vector-im/riot-web/issues/6622
 2018-04-30 13:39:46 +01:00
David Baker
fc136607f1 UI fixes in SessionRestoreErrorDialog 
* Make the 'delete my data' button not the default
 * Make it red
 * Give it a confirmation dialog
 * Remove the 'cancel' button: what does it mean to cancel an error?
   In this case, it tried again and almost certainly got the same error.
 * Remove the top-right 'x' and don't cancel on esc for the same reason.
 * Move 'send bug report' to a button rather than a 'click here' link
 * Add a 'refresh' button which, even if it's no more likely to work,
   will at least look like it's doing something (it's mostly so if you
   don't have a bug report endpoint, there's still a button other
   than the one that deletes all your data).
 2018-04-30 13:39:46 +01:00
Weblate
e936862868 Merge remote-tracking branch 'origin/develop' into develop 2018-04-30 12:37:30 +00:00
Andrey
19d9c62404 Translated using Weblate (Russian) 
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-04-30 12:37:30 +00:00
Goudarz Jafari
603826b662 Translated using Weblate (Persian) 
Currently translated at 12.7% (148 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fa/
 2018-04-30 12:37:30 +00:00
Michael Telatynski
41af9f7a96
fix changed method name 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-29 08:23:35 +01:00
Matthew Hodgson
db5fc53853 final comment 2018-04-29 04:53:32 +01:00
Matthew Hodgson
8538cc1666 fix regressions introduced by 00b7cc512b 2018-04-29 04:41:30 +01:00
Matthew Hodgson
be523b3edc lint 2018-04-29 04:31:30 +01:00
Matthew Hodgson
551d3ebda0 correctly fix up thumbnail height onload. 
fixes https://github.com/vector-im/riot-web/issues/6492, although popping is inevitable in
the current implementation as it only fixes up the thumbnail size once the image has loaded.
 2018-04-29 04:28:15 +01:00
Matthew Hodgson
731f1fa7d3 clarify another scrolljump bug 2018-04-29 04:00:02 +01:00
Matthew Hodgson
c254d043c5 fix ugly img errors and correctly render SVG thumbnails 
Fixes https://github.com/vector-im/riot-web/issues/6271
Fixes https://github.com/vector-im/riot-web/issues/1341
 2018-04-29 03:58:17 +01:00
Matthew Hodgson
9c5407c21f revokeObjectURLs 2018-04-29 03:17:55 +01:00
Matthew Hodgson
bffd5bb891 fix constness 2018-04-29 03:09:17 +01:00
Matthew Hodgson
9701fd32b7 switch back to blob urls for rendering e2e attachments 
Based on @walle303's work at https://github.com/matrix-org/matrix-react-sdk/pull/1820
Deliberately reverts 8f778f54fd
Mitigates XSS by whitelisting the mime-types of the attachments so that malicious ones
should not be recognised and executed by the browser.
 2018-04-29 03:07:31 +01:00
Michael Telatynski
4021fc049c
re-arrange method order to group statics before instance methods 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-29 00:54:54 +01:00
Michael Telatynski
c00c52e537
added another comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-29 00:53:35 +01:00
Michael Telatynski
407be88c92
add comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-29 00:51:39 +01:00
Michael Telatynski
5bb15b1002
simplify logic 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-29 00:48:44 +01:00
Michael Telatynski
bbf4d3e39f
add comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-29 00:34:27 +01:00
Peter Vágner
7f74bfde98 Translated using Weblate (Slovak) 
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2018-04-28 21:35:42 +00:00
Walter
daf4a57a9c Translated using Weblate (Russian) 
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-04-28 17:05:14 +00:00
Eric Newport
55566b35a2 convert attribute to class 2018-04-28 12:39:25 -04:00
Andrey
df30471df0 Translated using Weblate (Russian) 
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-04-28 11:40:18 +00:00
Ivan Shapovalov
819059e7a5 Translated using Weblate (Russian) 
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-04-28 06:31:00 +00:00
David Baker
873993a7ca Clarify, hopefully 2018-04-27 17:56:33 +01:00
David Baker
d3c368e19f typo 2018-04-27 17:53:11 +01:00
David Baker
0c309c88ad Bluebird has no need for your .done() 2018-04-27 17:52:25 +01:00
David Baker
fed74646b0 Rewrite to use async / await 2018-04-27 17:49:53 +01:00
David Baker
27b18c457e Lint 2018-04-27 15:56:28 +01:00
Ivan Shapovalov
51e5b73ed0 Translated using Weblate (Russian) 
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-04-27 14:55:19 +00:00
David Baker
dc06c52985 Merge remote-tracking branch 'origin/dbkr/fix_session_restore_error_handling' into dbkr/fix_session_restore_fail_dialog_ux 2018-04-27 15:12:22 +01:00
David Baker
2cc50d35c6 Lint 2018-04-27 15:06:36 +01:00
David Baker
2987e2c681 Merge remote-tracking branch 'origin/dbkr/fix_session_restore_error_handling' into dbkr/fix_session_restore_fail_dialog_ux 2018-04-27 14:21:28 +01:00
David Baker
75ab618c05 Fix variable scopes 2018-04-27 14:20:09 +01:00
RainSlide
8efac6117e Translated using Weblate (Chinese (Simplified)) 
Currently translated at 97.2% (1133 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
 2018-04-27 12:39:28 +00:00
David Baker
6d9e07580b UI fixes in SessionRestoreErrorDialog 
* Make the 'delete my data' button not the default
 * Make it red
 * Give it a confirmation dialog
 * Remove the 'cancel' button: what does it mean to cancel an error?
   In this case, it tried again and almost certainly got the same error.
 * Remove the top-right 'x' and don't cancel on esc for the same reason.
 * Move 'send bug report' to a button rather than a 'click here' link
 * Add a 'refresh' button which, even if it's no more likely to work,
   will at least look like it's doing something (it's mostly so if you
   don't have a bug report endpoint, there's still a button other
   than the one that deletes all your data).
 2018-04-27 12:38:49 +01:00
Michael Telatynski
2e29a0857b
improve stripPlainReply comment and fix leading NewLine 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-27 12:12:01 +01:00
Michael Telatynski
68dd57f56e
rename two methods 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-27 11:47:18 +01:00
Michael Telatynski
3050553fc2
rename and change getInReplyTo 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-27 11:44:14 +01:00
Michael Telatynski
ca766df598
call onWidgetLoad on componentDidUpdate 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-27 11:32:04 +01:00
Michael Telatynski
fdf63fd440
replace concat on comment from review 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-27 11:31:04 +01:00
Michael Telatynski
3ba9f560d4
get MatrixClient from context 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-27 11:30:47 +01:00
Michael Telatynski
88f48914b4
improve comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-27 11:28:17 +01:00
Michael Telatynski
97fecaedc2
improve wording 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-27 11:26:42 +01:00
David Baker
0323f8ed0c Wrap exception handling around all of loadSession 
The user might (probably does) have a session even if we haven't actually tried
to load it yet, so wrap the whole loadSession code in the error handler we were
using for restoring sessions so we gracefully handle exceptions that happen
before trying to restore sessions too.

Remove the catch in MatrixChat that sent you to the login screen.  This is
never the right way to handle an error condition: we should only display the
login screen if we successfully determined that the user has no session, or
they explicitly chose to blow their sessions away.
 2018-04-27 11:25:13 +01:00
Michael Telatynski
4a0a5c6bef
Merge remote-tracking branch 'origin/t3chguy/m.relates_to' into t3chguy/m.relates_to 2018-04-27 11:23:12 +01:00
David Baker
db1401f484 Pass false to onFinished from BaseDialog 
Everywhere else, onFinished takes a boolean indicating whether the
dialog was confirmed on cancelled, and had function that were
expecting this variable and getting undefined.
 2018-04-27 11:19:14 +01:00
Michael Telatynski
82d117974f
Remove unused import 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-27 11:16:29 +01:00
Michael Telatynski
3de679b084
Add comment to HtmlUtils.js 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-27 11:14:50 +01:00
Марко М. Костић
fad20af51f Translated using Weblate (Serbian) 
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
 2018-04-26 17:07:00 +00:00
Szimszon
64a682ef47 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-04-26 16:19:27 +00:00
Kévin C
18e6d4aea7 Translated using Weblate (French) 
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-04-26 16:17:37 +00:00
David Baker
f70096b8fa Fix error handling on session restore 
Fix a number of failures that meant the excellent error handling
we had for failing to restore a session didn't work.

1. .catch on the promise rather than try/catch: it's async
2. Explicit cancel method in SessionRestoreErrorDialog that invokes
   onFinished with `false` because even with the catch fixed, this
   was getting the event as its first arg which is truthy, so
   clicking cancel still deleted your data.
3. DialogButtons: Don't pass onCancel straight into the button event
   handler as this leaks the MouseEvent through as an argument.
   Nothing is using it and it exacerbates failures like this
   because there are surprise arguments.

Fixes https://github.com/vector-im/riot-web/issues/6616
 2018-04-26 17:07:58 +01:00
Weblate
ceb7bfc863 Merge remote-tracking branch 'origin/develop' into develop 2018-04-26 14:24:23 +00:00
Luke Barnard
5da62c6ad9 Fix bug that caused crash when analytics HS/IS whitelists not specified 2018-04-26 15:18:29 +01:00
Luke Barnard
665e052596 Allow debugging of unhandled login errors 2018-04-26 15:09:17 +01:00
Weblate
1845ce29df Merge remote-tracking branch 'origin/develop' into develop 2018-04-26 13:44:18 +00:00
Luke Barnard
b1af4ec9fd Fix Analytics to not import DEFAULTS, therefore avoiding NPE 2018-04-26 14:30:27 +01:00
Weblate
333d65c032 Merge remote-tracking branch 'origin/develop' into develop 2018-04-26 13:05:50 +00:00
Andrey
5c6b8d748a Translated using Weblate (Russian) 
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-04-26 12:46:45 +00:00
Luke Barnard
d734a9ba6e Null check piwik config before using it 
to avoid crashing at login
 2018-04-26 13:41:43 +01:00
Weblate
7212831722 Merge remote-tracking branch 'origin/develop' into develop 2018-04-26 12:14:54 +00:00
Luke Barnard
452bf0bd09
Merge pull request #1853 from matrix-org/luke/fix-piwik-page-url-reporting 
Track actual window location origin and hash
 2018-04-26 13:14:49 +01:00
Luke Barnard
053ef0bc0a PPI->PII 2018-04-26 13:05:59 +01:00
Luke Barnard
6b0af81f71 For paths with variables, insert <redacted> 
To preserve the analytics for these pages we did previously
 2018-04-26 12:22:56 +01:00
Weblate
f51211ac93 Merge remote-tracking branch 'origin/develop' into develop 2018-04-26 10:05:44 +00:00
Luke Barnard
ff4909e6ab Merge branch 'develop' into luke/fix-piwik-page-url-reporting 2018-04-26 11:03:55 +01:00
Luke Barnard
0614ef6abe i18n 
for new anayltics modal redesign
 2018-04-26 11:00:50 +01:00
Luke Barnard
e16c50d4be Explain that full URL is sent to Piwik 
Also, redesign analytics modal to be one big table, instead of table +
paragraph.
 2018-04-26 10:59:43 +01:00
David Baker
53528f338a Replace document.origin with window.location.origin 
document.origin is not a thing on firefox
 2018-04-26 10:43:52 +01:00
Weblate
fb9dc8db7d Merge remote-tracking branch 'origin/develop' into develop 2018-04-26 09:13:21 +00:00
David Baker
e26c3f3dc9 Get variable name right in commented usercontent code 2018-04-26 10:12:50 +01:00
Szimszon
c6c58ebc52 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1162 of 1162 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-04-25 19:17:10 +00:00
Luke Barnard
1ff11ca493 Make analytics opt-in 
If a Riot is upgraded to include this commit, it will stop reporting
analytics unless specified in config.json. The sample config already
contains the configuration required to continue reporting.
 2018-04-25 17:19:57 +01:00
Andrey
841fa8b122 Translated using Weblate (Russian) 
Currently translated at 100.0% (1162 of 1162 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-04-25 15:40:02 +00:00
Weblate
4cad39bb36 Merge remote-tracking branch 'origin/develop' into develop 2018-04-25 15:32:14 +00:00
Richard Lewis
b2d6dd8f6e Optionally hide widget popout button. 2018-04-25 16:28:27 +01:00
Luke Barnard
53016fa16e Report pathname 2018-04-25 16:21:30 +01:00
Val
2a1f9de323 Translated using Weblate (French) 
Currently translated at 100.0% (1162 of 1162 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-04-25 15:07:33 +00:00
David Baker
81488b27e2
Merge pull request #1851 from matrix-org/rxl881/popoutWidget 
Add a button to 'pop out' widgets in to their own tab.
 2018-04-25 15:36:07 +01:00
Luke Barnard
3957222da3 Alter hashRegex to expect all handled URLs 2018-04-25 15:06:45 +01:00
Luke Barnard
0f480571e8 Track true origin, do not track unexpected hashes 2018-04-25 15:06:04 +01:00
Richard Lewis
0f0e89d394 Add a button to 'pop out' widgets in to their own tab. 2018-04-25 12:49:30 +01:00
Weblate
18d7be5080 Merge remote-tracking branch 'origin/develop' into develop 2018-04-25 10:35:34 +00:00
Andrey
181b109b8a 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:35:34 +00:00
David Baker
54040659ec Fix cross-origin renderer code in comment 2018-04-25 11:35:08 +01:00
Weblate
6cb4248d84 Merge remote-tracking branch 'origin/develop' into develop 2018-04-25 10:22:53 +00:00
Andrey
6ca0fc2846 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:22:53 +00:00
Scott Rothrock
84f3faaea0 Translated using Weblate (Japanese) 
Currently translated at 21.1% (246 of 1161 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2018-04-25 10:22:53 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Weblate
54561b655a Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop 
Conflicts:
	src/i18n/strings/bg.json
	src/i18n/strings/da.json
	src/i18n/strings/de_DE.json
	src/i18n/strings/eo.json
	src/i18n/strings/eu.json
	src/i18n/strings/gl.json
	src/i18n/strings/it.json
	src/i18n/strings/ja.json
	src/i18n/strings/nl.json
	src/i18n/strings/pl.json
	src/i18n/strings/ru.json
	src/i18n/strings/sk.json
	src/i18n/strings/zh_Hans.json
 2018-04-20 13:57:45 +00:00
adrian-007
105a0d6891 Translated using Weblate (Polish) 
Currently translated at 76.9% (778 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2018-04-20 13:43:36 +00:00