Commit Graph

5032 Commits

Author SHA1 Message Date
Matthew Hodgson
ca1c0e42b0 oops, merge correctly 2017-06-07 18:42:34 +01:00
Matthew Hodgson
5cf44454d2 fix more punctuation fails 2017-06-07 18:41:18 +01:00
Pitchaya Boonsarngsuk
8d7f40ed07 Translated using Weblate (Thai)
Currently translated at 40.8% (347 of 850 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
2017-06-07 17:34:16 +00:00
Bamstam
ca5215a288 Translated using Weblate (German)
Currently translated at 100.0% (850 of 850 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-07 17:34:15 +00:00
Amandine
0170a12ad6 Translated using Weblate (French)
Currently translated at 97.0% (825 of 850 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-06-07 17:34:14 +00:00
David Baker
f7ab6a574c Remove unused string 2017-06-07 18:32:52 +01:00
Matthew Hodgson
8228db88d2 oops, fix more i18n var name typos 2017-06-07 18:28:49 +01:00
Matthew Hodgson
ef2fedc3a9 fix missing translations and typos in i18n 2017-06-07 18:24:35 +01:00
Matthew Hodgson
fe487232ad sync fullstops everywhere 2017-06-07 18:15:56 +01:00
Matthew Hodgson
74d680a952 sync fullstops everywhere 2017-06-07 18:15:56 +01:00
David Baker
0370b7c5e8 Merge pull request #1050 from matrix-org/luke/feature-user-directory-invite
Use user_directory endpoint to populate ChatInviteDialog
2017-06-07 18:06:35 +01:00
Luke Barnard
29da25529c Make it backwards compatible
Hit the user_directory API and if M_UNRECOGNIZED, do a local search and continue to search locally therein.
2017-06-07 17:53:58 +01:00
RiotTranslate
0028ead955 Merge remote-tracking branch 'origin/develop' into develop 2017-06-07 16:47:53 +00:00
Pitchaya Boonsarngsuk
c11fd8c3b1 Translated using Weblate (Thai)
Currently translated at 39.0% (332 of 850 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
2017-06-07 16:47:53 +00:00
Amandine
b2a17fea08 Translated using Weblate (French)
Currently translated at 96.5% (821 of 850 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-06-07 16:47:51 +00:00
Krombel
3db286f8f0 Translated using Weblate (German)
Currently translated at 100.0% (850 of 850 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-07 16:47:49 +00:00
Luke Barnard
68ddf35db4 Use then, catch, done and display any errors that occur during search 2017-06-07 17:33:15 +01:00
David Baker
bfa095184d Merge pull request #1046 from matrix-org/t3chguy/piwik_fixes_1
Various Analytics changes/fixes/improvements
2017-06-07 17:17:47 +01:00
RiotTranslate
305d510c6e Merge remote-tracking branch 'origin/develop' into develop 2017-06-07 15:58:04 +00:00
Luke Barnard
e9a66625b2 Merge pull request #1051 from matrix-org/luke/fix-room-list-undefined-this
Use an arrow function to allow `this`
2017-06-07 16:26:30 +01:00
RiotTranslate
6f296aca75 [WEBLATE] merge Develop 2017-06-07 15:17:18 +00:00
Luke Barnard
49b22fb6c6 Use an arrow function to allow this
This was causing `TypeError: Cannot read property '_getEmptyContent' of undefined` for those with custom tags.
2017-06-07 16:13:40 +01:00
Luke Barnard
3b6599dcdc Use user_directory endpoint to populate ChatInviteDialog
Also attempt to slightly improve the feedback given when searching. There is still room for improvement - it's not totally obvious whether to display a spinner because it's quite jarring were it to replace the dd. This does mean that "No results" will flash awkardly between two queries, neither of which return any results.
2017-06-07 16:05:36 +01:00
Stanislav N
7fc41957d7 Translated using Weblate (Russian)
Currently translated at 100.0% (828 of 828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
2017-06-07 14:57:14 +00:00
Bamstam
f7783cac2a Translated using Weblate (German)
Currently translated at 100.0% (828 of 828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-07 14:57:13 +00:00
Luke Barnard
d4041777f9 Merge pull request #937 from matrix-org/new-guest-access
New guest access
2017-06-07 13:39:57 +01:00
Luke Barnard
53ea41e8a5 Merge branch 'develop' into new-guest-access 2017-06-07 12:08:37 +01:00
David Baker
d59b0e1595 Merge pull request #1048 from matrix-org/kegan/translation-gibbon
Translate src/components/structures
2017-06-07 12:01:52 +01:00
David Baker
ccaa55d2c8 Merge pull request #1049 from matrix-org/dbkr/ilag_cancel_join_on_login
Cancel 'join room' action if 'log in' is clicked
2017-06-07 11:59:45 +01:00
David Baker
1dbdbc163b Cancel 'join room' action if 'log in' is clicked
or 'choose different server'

We canceled the deferred action in the MatrixChat SetMxId dialog
but not the one in roomview.

Fixes https://github.com/vector-im/riot-web/issues/4217
2017-06-07 11:55:24 +01:00
Stanislav N
558f67cb14 Translated using Weblate (Russian)
Currently translated at 100.0% (828 of 828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
2017-06-07 10:51:18 +00:00
Kegan Dougal
4127e7121c Translate src/components/structures
Includes some pluralisation! Tested them manually to make sure they work.
2017-06-07 11:40:46 +01:00
Michael Telatynski
0a2a782d63
track the action of opt-out
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-07 11:26:52 +01:00
Michael Telatynski
bd948ef915
for riot.im instances, track location.pathname
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-07 11:25:27 +01:00
Michael Telatynski
56df54f946
hardcode logged url to riot.im/app so piwik has a base to work with, it gets confused when a CustomURL isn't actually a URL (like it wasn't after the latest redaction fixes.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-07 11:17:57 +01:00
Pitchaya Boonsarngsuk
fd8709e434 Translated using Weblate (Thai)
Currently translated at 39.7% (329 of 828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
2017-06-07 08:58:53 +00:00
Stanislav N
ccb058f4cf Translated using Weblate (Russian)
Currently translated at 77.4% (641 of 828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
2017-06-07 08:58:52 +00:00
Szimszon
f1fd4e5d26 Translated using Weblate (Hungarian)
Currently translated at 3.1% (26 of 828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/hu/
2017-06-07 08:58:52 +00:00
Krombel
096edabd45 Translated using Weblate (German)
Currently translated at 99.8% (828 of 828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-06 20:01:02 +00:00
Pitchaya Boonsarngsuk
bc4c9ec4fd Translated using Weblate (Thai)
Currently translated at 39.7% (329 of 828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
2017-06-06 19:48:18 +00:00
Bamstam
0f452062b1 Translated using Weblate (German)
Currently translated at 99.8% (827 of 828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-06 19:48:15 +00:00
Matthew Hodgson
184c2d5e58 Merge pull request #1015 from matrix-org/t3chguy/random_fix_1
fix copy and paste derp and rip out unused imports
2017-06-06 18:02:35 +01:00
David Baker
9f15e8e152 Merge branch 'master' into develop 2017-06-06 17:41:05 +01:00
David Baker
31f1e421f2 v0.9.2 2017-06-06 17:40:30 +01:00
David Baker
5191f93432 Prepare changelog for v0.9.2 2017-06-06 17:40:30 +01:00
David Baker
00ccf4bb51 Revert "Call MatrixClient.clearStores on logout"
This reverts commit c3d37c1ff9.

This commit was introducing a bug where no rooms would be shown if
you want straight to /#/login and logged in (because this causes
a guest session to be created but the indexeddb store not to be
cleared, so the new login picks up the stale indexedb sync data.
2017-06-06 17:33:50 +01:00
David Baker
df6940c5f3 Merge pull request #1044 from matrix-org/luke/fix-password-recovery-landing
Hotfix: Allow password reset when logged in
2017-06-06 17:27:09 +01:00
Luke Barnard
205fd1fad4 Allow password reset when logged in 2017-06-06 17:22:49 +01:00
RiotTranslate
71c12b0615 Update from Weblate. (#1042)
* Added translation using Weblate (Thai)

* Translated using Weblate (Thai)

Currently translated at 2.6% (22 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/

* Translated using Weblate (Thai)

Currently translated at 8.9% (74 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/

* Translated using Weblate (German)

Currently translated at 99.8% (826 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/

* Translated using Weblate (Swedish)

Currently translated at 35.4% (293 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/sv/

* Translated using Weblate (Thai)

Currently translated at 9.7% (81 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/

* Translated using Weblate (German)

Currently translated at 100.0% (827 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/

* Translated using Weblate (Russian)

Currently translated at 76.9% (636 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/

* Translated using Weblate (Hungarian)

Currently translated at 0.1% (1 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/hu/

* Translated using Weblate (Thai)

Currently translated at 39.2% (325 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/

* Translated using Weblate (German)

Currently translated at 99.8% (827 of 828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-06 16:44:28 +01:00
Kegsay
5c1866c1c6 Add get_membership_count scalar API (#1043) 2017-06-06 16:41:08 +01:00