nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
62,959 Commits 258 Branches 582 Tags
f52d7a8e207301ac62497ca7cd25bf64b6834d81
Commit Graph

62959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Pitchaya Boonsarngsuk
8e161748ef Translated using Weblate (Thai) 
Currently translated at 100.0% (197 of 197 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/th/
 2017-06-07 16:57:26 +00: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
Pitchaya Boonsarngsuk
c44d4a57ac Translated using Weblate (Thai) 
Currently translated at 97.9% (193 of 197 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/th/
 2017-06-07 16:50:46 +00:00
Stanislav N
4518776561 Translated using Weblate (Russian) 
Currently translated at 84.7% (167 of 197 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/ru/
 2017-06-07 16:50:45 +00:00
Krombel
e6889716aa Translated using Weblate (German) 
Currently translated at 100.0% (197 of 197 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
 2017-06-07 16:50:44 +00: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
Krombel
4a60dc5a20 Translated using Weblate (German) 
Currently translated at 100.0% (197 of 197 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
 2017-06-07 16:30:54 +00: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
Bamstam
a2081f7d2a Translated using Weblate (German) 
Currently translated at 83.7% (165 of 197 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
 2017-06-07 16:14:48 +00:00
Bamstam
a7c0c805d4 Translated using Weblate (German) 
Currently translated at 83.7% (165 of 197 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
 2017-06-07 16:14:37 +00:00
Luke Barnard
87996b3a8a Update CSS for ChatInviteDialog 
for https://github.com/matrix-org/matrix-react-sdk/pull/1050

 - Remove address selector header
 - Adjust dialog content so that the error message ("No results" or otherwise) doesn't cause a change in height
 2017-06-07 17:14:36 +01:00
Bamstam
a2400baf59 Translated using Weblate (German) 
Currently translated at 83.7% (165 of 197 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
 2017-06-07 16:13:44 +00:00
Bamstam
41df1e676d Translated using Weblate (German) 
Currently translated at 83.2% (164 of 197 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
 2017-06-07 16:13:22 +00:00
Bamstam
0e6c25122b Translated using Weblate (German) 
Currently translated at 82.7% (163 of 197 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
 2017-06-07 16:13:10 +00: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
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