Commit Graph

63257 Commits

Author SHA1 Message Date
David Baker
090a7c5761 Remove '/' from homepage URL
As we are not always at the root of the web server.
2017-06-07 11:20:41 +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
David Baker
fb358d8fd6 Merge remote-tracking branch 'origin/develop' into experimental 2017-06-07 10:59:01 +01:00
Richard Lewis
c552f7f336 App icon styling 2017-06-07 10:55:49 +01:00
Richard Lewis
9302c60b47 App icon styling 2017-06-07 10:55:35 +01:00
David Baker
5c51797420 Merge remote-tracking branch 'origin/new-guest-access' into experimental 2017-06-07 10:51:25 +01:00
David Baker
332a5b49a5 Merge remote-tracking branch 'origin/develop' into experimental 2017-06-07 10:51:18 +01:00
David Baker
9a6e0440f9 Merge pull request #4220 from vector-im/dbkr/right_branch_chop_origin
Chop off 'origin/'
2017-06-07 10:50:27 +01:00
David Baker
9c94f2ac14 Use bash magic instead of sed 2017-06-07 10:39:46 +01:00
David Baker
b0486e333d Chop off 'origin/'
when figuring out what branch we're on
2017-06-07 10:35:08 +01:00
Luke Barnard
784e52f249 Align message timestamp centrally about the avatar mid-point
Tested visually against any unintended changes to the alignment of e2e icons, with timestamps on 12h and 24h mode.
2017-06-07 10:19:58 +01:00
RiotTranslate
012c02ff7d Merge remote-tracking branch 'origin/develop' into develop 2017-06-07 09:01:10 +00:00
Stanislav N
fe4738996a Translated using Weblate (Russian)
Currently translated at 100.0% (162 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/ru/
2017-06-07 09:01:09 +00: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
Oliver Hunt
3d59d72aaa Fixed pagination infinite loop caused by long messages
Signed-off-by: Oliver Hunt <oliver@hunt.bz>
2017-06-07 04:49:41 +01:00
Richard Lewis
76880e0de7 App icon tile styling 2017-06-06 23:46:27 +01:00
Richard Lewis
f6f660fa9a Initial app icon tiles 2017-06-06 23:45:17 +01:00
RiotTranslate
d235e2276f Translated using Weblate (Hungarian) (#4214)
Currently translated at 100.0% (162 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/hu/
2017-06-06 23:23:29 +01:00
RiotTranslate
c117ceb0b6 Merge remote-tracking branch 'origin/develop' into develop 2017-06-06 20:37:25 +00:00
Szimszon
f815097ee9 Translated using Weblate (Hungarian)
Currently translated at 100.0% (162 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/hu/
2017-06-06 20:37:22 +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
Michael Telatynski
79d6ced201 change electron -> electron_app which was previously missed
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-06 18:39:54 +01:00
Matthew Hodgson
080cbea080 Merge pull request #4211 from uhoreg/compact
adjust alignment of message menu button in compact layout
2017-06-06 18:07:32 +01: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
968e21a67d Merge branch 'master' into develop 2017-06-06 17:48:32 +01:00
David Baker
26bb962a3c v0.10.2 v0.10.2 2017-06-06 17:45:07 +01:00
David Baker
88e159e462 Prepare changelog for v0.10.2 2017-06-06 17:45:06 +01:00
David Baker
951b63898b v0.10.2 2017-06-06 17:43:57 +01:00
David Baker
3d51156b7e Temporarily revert 2017-06-06 17:43:34 +01:00
David Baker
d648dc867e v0.10.2 2017-06-06 17:41:57 +01:00
David Baker
a62ed0eb03 reatc-sdk 0.9.2 2017-06-06 17:41:26 +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
Hubert Chathi
383f6b619b adjust alignment of message menu button 2017-06-06 12:11:02 -04:00
Matthew Hodgson
13c780c7c5 add traditional chinese, thai, greek 2017-06-06 16:51:00 +01:00
Matthew Hodgson
dbbb916be8 Merge pull request #4207 from RiotTranslate/weblate-riot-web-riot-web
Update from Weblate.
2017-06-06 16:45:09 +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
David Baker
1deadf5aad Merge branch 'new-guest-access' into experimental 2017-06-06 16:43:01 +01:00
Kegsay
5c1866c1c6 Add get_membership_count scalar API (#1043) 2017-06-06 16:41:08 +01:00
Luke Barnard
8fee4941c3 Merge pull request #4209 from vector-im/dbkr/ilag_fix_tests
Fix Tests in ILAG
2017-06-06 16:20:14 +01:00
David Baker
8e288e14bf Add more hacky q.delays
To work around the fact that we now do more trips around the
event loop to update view state (because of going vis the store).
Also add comment saying how horrible this is.
2017-06-06 15:59:24 +01:00
Richard Lewis
e8353edb06 Disable test postmessag 2017-06-06 15:57:40 +01:00