RiotTranslate
|
b2d011f0cb
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-06-07 14:59:43 +00:00 |
|
Stanislav N
|
fc7e20ab62
|
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 14:57:16 +00:00 |
|
Bamstam
|
5a94cecc62
|
Translated using Weblate (German)
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/de/
|
2017-06-07 14:57:15 +00: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 |
|
Richard van der Hoff
|
27e5098e00
|
Merge remote-tracking branch 'origin/develop' into rav/handle_received_room_key_requests
|
2017-06-07 15:44:33 +01:00 |
|
Richard Lewis
|
a09001933a
|
git status
|
2017-06-07 15:39:27 +01:00 |
|
Richard van der Hoff
|
c1151fd31c
|
Merge branch 'develop' into rav/handle_received_room_key_requests
|
2017-06-07 15:37:38 +01:00 |
|
Richard Lewis
|
272d36995b
|
Fix active styling
|
2017-06-07 15:28:58 +01:00 |
|
David Baker
|
53bc78429d
|
Merge pull request #4212 from vector-im/t3chguy/package_json_fix
change electron -> electron_app which was previously missed
|
2017-06-07 14:46:54 +01:00 |
|
Luke Barnard
|
a158549a4c
|
Merge pull request #4039 from vector-im/new-guest-access
New guest access
|
2017-06-07 13:40:00 +01: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 |
|
David Baker
|
bd76251fb5
|
Merge remote-tracking branch 'origin/develop' into experimental
|
2017-06-07 13:28:30 +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 |
|
David Baker
|
80d912bb2c
|
Merge pull request #4219 from vector-im/luke/css-fix-timestamp-align
Align message timestamp centrally about the avatar mid-point
|
2017-06-07 11:37:26 +01:00 |
|
David Baker
|
65185a5fd0
|
Merge remote-tracking branch 'origin/new-guest-access' into experimental
|
2017-06-07 11:28:03 +01:00 |
|
Luke Barnard
|
37625faeb7
|
Merge pull request #4221 from vector-im/dbkr/ilag_home_url
Remove '/' from homepage URL
|
2017-06-07 11:27:39 +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 |
|
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 |
|