Michael Telatynski
2bcb381aa7
maybe window focus should be ignored so focus is left as what it was
...
but with this at least clicking on a text input will not make you
be thrown into composer instead
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-27 14:19:34 +01:00
Matthew Hodgson
b8b6a87423
fixing missing EN translation
2017-05-27 13:58:20 +01:00
Matthew Hodgson
5ed1bc5873
Merge pull request #940 from matrix-org/matthew/always-show-ts
...
actually wire up alwaysShowTimestamps
2017-05-27 13:03:39 +01:00
Matthew Hodgson
1b8360bff6
Merge pull request #943 from RiotTranslate/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2017-05-27 12:31:21 +01:00
RiotTranslate
ec418891b1
Merge remote-tracking branch 'origin/develop' into develop
2017-05-27 11:30:00 +00:00
nouts
ad2c84375d
Translated using Weblate (French)
...
Currently translated at 57.3% (378 of 659 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-27 11:30:00 +00:00
Matthew Hodgson
5a6baafc91
Merge pull request #942 from RiotTranslate/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2017-05-27 11:22:30 +01:00
RiotTranslate
a56e3c3897
Merge remote-tracking branch 'origin/develop' into develop
2017-05-27 07:08:41 +00:00
Amandine
9fc20cbd34
Translated using Weblate (French)
...
Currently translated at 55.8% (368 of 659 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-27 07:08:41 +00:00
Matthew Hodgson
98dc0daf33
Merge pull request #941 from RiotTranslate/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2017-05-27 01:07:41 +01:00
RiotTranslate
59cb7ad0e6
Merge remote-tracking branch 'origin/develop' into develop
2017-05-26 23:20:37 +00:00
dambador
5d08393eb5
Translated using Weblate (Russian)
...
Currently translated at 92.8% (612 of 659 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
2017-05-26 23:20:37 +00:00
Krombel
88f760a53f
Translated using Weblate (German)
...
Currently translated at 100.0% (659 of 659 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-26 23:20:36 +00:00
Amandine
b6cd3fcdd2
Translated using Weblate (French)
...
Currently translated at 51.5% (340 of 659 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-26 23:20:36 +00:00
Matthew Hodgson
03194e66b3
actually wire up alwaysShowTimestamps
2017-05-27 00:14:16 +01:00
Matthew Hodgson
81704a5b5e
s/username/User name/
2017-05-27 00:13:16 +01:00
David Baker
1c841f27d7
Merge pull request #938 from RiotTranslate/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2017-05-26 23:01:13 +01:00
David Baker
477396f820
Use first language preference, not last
2017-05-26 22:29:03 +01:00
Stanislav N
594247dfa9
Translated using Weblate (Russian)
...
Currently translated at 66.3% (437 of 659 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
2017-05-26 20:33:25 +00:00
Stanislav N
53cb6d1d76
Translated using Weblate (Russian)
...
Currently translated at 65.8% (434 of 659 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
2017-05-26 20:11:46 +00:00
RiotTranslate
765034dc19
Merge remote-tracking branch 'origin/develop' into develop
2017-05-26 20:10:47 +00:00
Stanislav N
5f2012102c
Translated using Weblate (Russian)
...
Currently translated at 65.8% (434 of 659 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
2017-05-26 20:10:47 +00:00
Krombel
08529ba5a8
Translated using Weblate (German)
...
Currently translated at 100.0% (659 of 659 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-26 20:10:47 +00:00
Michael Telatynski
db3d455a1d
Merge pull request #939 from turt2live/patch-1
...
Fix PM being AM
2017-05-26 21:05:46 +01:00
Travis Ralston
65dd2d4db1
Fix PM being AM
...
Fixes https://github.com/vector-im/riot-web/issues/4043
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-05-26 13:43:01 -06:00
RiotTranslate
b5912d3c92
Merge branch 'develop' of git://github.com/matrix-org/matrix-react-sdk into develop
2017-05-26 18:52:03 +00:00
RiotTranslate
e46b63dc5a
[WEBLATE] fix merging issues
2017-05-26 18:51:55 +00:00
Matthew Hodgson
32207bd058
use develop js-sdk
2017-05-26 19:51:47 +01:00
Krombel
c138e4d92e
Translated using Weblate (German)
...
Currently translated at 100.0% (659 of 659 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-26 18:40:57 +00:00
Amandine
9fcee811cb
Translated using Weblate (French)
...
Currently translated at 25.7% (170 of 659 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-26 18:40:56 +00:00
Amandine
a77663d18b
Translated using Weblate (French)
...
Currently translated at 25.6% (169 of 659 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-26 18:18:16 +00:00
Krombel
1edad35c98
Translated using Weblate (German)
...
Currently translated at 100.0% (659 of 659 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-26 18:18:14 +00:00
Matthew Hodgson
e5ef9f3e3a
Merge pull request #918 from matrix-org/t3chguy/electron_call_sleep
...
pass call state through dispatcher, for poor electron
2017-05-26 19:09:10 +01:00
David Baker
cddfe7e6ef
Fix inconsistent quoting in topic messages
2017-05-26 19:00:44 +01:00
David Baker
563b85ceb8
Merge https://github.com/MTRNord/matrix-react-sdk/pull/115
2017-05-26 18:53:23 +01:00
Luke Barnard
fd27d6dab1
Merge pull request #936 from matrix-org/luke/new-guest-access-need-to-set-mx-id-beore-user-settings
...
Block user settings with view_set_mxid
2017-05-26 18:48:55 +01:00
David Baker
f4184bc695
Merge pull request #934 from matrix-org/dbkr/translations
...
Translations!
2017-05-26 18:38:04 +01:00
David Baker
647c1b6169
Once more, with braces
2017-05-26 18:19:32 +01:00
David Baker
97aeb57a8b
Merge remote-tracking branch 'origin/develop' into dbkr/translations
2017-05-26 18:15:32 +01:00
Luke Barnard
276d3cad9c
Merge pull request #906 from matrix-org/luke/revert-login-username-prefix-suffix
...
Remove suffix and prefix from login input username
2017-05-26 18:07:10 +01:00
David Baker
62ffe929e4
Translate Add Threepid labels
2017-05-26 18:03:24 +01:00
David Baker
cf0073a631
Missing translations in User Interface section
2017-05-26 17:59:19 +01:00
David Baker
23fbce66a2
Translate 'email' threepid label
2017-05-26 17:56:51 +01:00
David Baker
40680d55e0
Fix merge fail
2017-05-26 17:55:48 +01:00
Matthew Hodgson
ed79a3adef
Merge pull request #935 from matrix-org/luke/new-guest-access-no-barf-on-username-check-err
...
Show "Something went wrong!" when errcode undefined
2017-05-26 17:47:52 +01:00
Matthew Hodgson
44f479c38b
Merge pull request #930 from matrix-org/luke/new-guest-access-reset-stores-on-logged-out
...
Reset store state when logging out
2017-05-26 17:45:32 +01:00
David Baker
c22978d033
Merge remote-tracking branch 'origin/develop' into dbkr/translations
2017-05-26 17:30:02 +01:00
Luke Barnard
ac44151e2a
Put the reset method in the right scope...
2017-05-26 17:27:31 +01:00
Luke Barnard
9311b9012a
Use the same .reset as RoomViewStore
2017-05-26 17:23:02 +01:00
Matthew Hodgson
3d688a6ada
Merge pull request #933 from matrix-org/luke/new-guest-access-set-display-name-to-useridlocalpart
...
Set the displayname to the mxid once PWLU
2017-05-26 17:17:23 +01:00
