mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-28 12:28:50 +03:00
Code Issues Projects Releases Packages Wiki Activity
7934 commits 214 branches 561 tags 415 MiB
Commit graph

7934 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
950c4c7433 Merge remote-tracking branch 'origin/develop' into develop 2017-11-28 11:02:50 +00:00
David Baker
bbaa46f773
Merge pull request #1634 from matrix-org/luke/move-group-flair-toggle-to-user-settings 
Move group publication toggles to UserSettings
 2017-11-28 11:02:45 +00:00
Luke Barnard
d4f5e7e6d7 Deal with errors, lack of groups, loading 2017-11-28 10:46:20 +00:00
Weblate
a8ede7f241 Merge remote-tracking branch 'origin/develop' into develop 2017-11-28 10:29:55 +00:00
Richard van der Hoff
8be3862e68 Merge branch 'master' into develop 2017-11-28 10:29:40 +00:00
Richard van der Hoff
a088e559d1 v0.11.2 2017-11-28 10:25:04 +00:00
Richard van der Hoff
36e663131b Prepare changelog for v0.11.2 2017-11-28 10:25:04 +00:00
Luke Barnard
0d5f7ef246 Avoid NPE 2017-11-28 10:12:46 +00:00
Luke Barnard
3342754a72 Catch and log errors from getting group profile 2017-11-28 10:11:25 +00:00
Weblate
293f17a710 Merge remote-tracking branch 'origin/develop' into develop 2017-11-27 18:07:14 +00:00
Mateo Castro
88917c77bc Translated using Weblate (Spanish) 
Currently translated at 60.2% (564 of 936 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2017-11-27 18:07:14 +00:00
Krombel
246b33bd7e Translated using Weblate (German) 
Currently translated at 100.0% (936 of 936 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-11-27 18:07:13 +00:00
David Baker
81ae081f15
Merge pull request #1617 from turt2live/travis/granular-theme 
Pull the theme through the default process
 2017-11-27 18:07:09 +00:00
Richard van der Hoff
4a20185d64
Merge pull request #1633 from matrix-org/rav/handle_login_flows_better 
Ignore unrecognised login flows
 2017-11-27 18:05:04 +00:00
lukebarnard
9ed9422af8 Move group publication toggles to UserSettings 2017-11-27 17:24:42 +00:00
Richard van der Hoff
80b8cbb473 Ignore unrecognised login flows 
Update the Login component so that if it sees an unrecognised login flow, it
just ignores it and uses another one, so that riot can still be used with
homeservers supporting custom login types.
 2017-11-27 16:47:49 +00:00
Krombel
2b57747e2e Translated using Weblate (German) 
Currently translated at 100.0% (936 of 936 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-11-27 16:23:07 +00:00
Weblate
1df9226840 Merge remote-tracking branch 'origin/develop' into develop 2017-11-27 14:55:10 +00:00
David Baker
7826d0c61a
Merge pull request #1630 from aidalgol/redact-dialog-fix 
Rebase ConfirmRedactDialog on QuestionDialog
 2017-11-27 14:55:04 +00:00
Weblate
95af415e98 Merge remote-tracking branch 'origin/develop' into develop 2017-11-27 14:52:48 +00:00
David Baker
9c9e223191
Merge pull request #1629 from pafcu/fix-logging 
Fix logging of missing substitution variables
 2017-11-27 14:52:44 +00:00
Weblate
3131608e7f Merge remote-tracking branch 'origin/develop' into develop 2017-11-27 14:34:09 +00:00
Марко М. Костић
71590477b0 Translated using Weblate (Serbian) 
Currently translated at 9.5% (89 of 936 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
 2017-11-27 14:34:08 +00:00
Andrey
d824be602c Translated using Weblate (Russian) 
Currently translated at 100.0% (936 of 936 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-11-27 14:34:08 +00:00
xmeta
ce4c470c82 Translated using Weblate (Japanese) 
Currently translated at 6.1% (58 of 936 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2017-11-27 14:34:08 +00:00
Tirifto
3d9e7322b4 Translated using Weblate (Esperanto) 
Currently translated at 6.3% (59 of 936 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2017-11-27 14:34:07 +00:00
David Baker
e07c7e404e
Merge pull request #1632 from matrix-org/luke/rename-related-communities 
Rename Related Groups to improve readability
 2017-11-27 14:34:02 +00:00
lukebarnard
3635997090 Rename Related Groups to improve readability 2017-11-27 14:13:44 +00:00
Vlad
3a94b57e4a Translated using Weblate (Russian) 
Currently translated at 100.0% (936 of 936 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-11-26 14:29:53 +00:00
Andrey
56437768c3 Translated using Weblate (Russian) 
Currently translated at 99.4% (931 of 936 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-11-26 14:20:29 +00:00
Aidan Gauland
3358fdc906 Address eslint errors 
* Remove space before curly brace.
* Remove unused import.
 2017-11-26 16:04:24 +13:00
Aidan Gauland
aaf8106e9e Rebase ConfirmRedactDialog on QuestionDialog 
Rewrite the ConfirmRedactDialog component to derive from the QuestionDialog component.
 2017-11-26 15:46:24 +13:00
Марко М. Костић
f91812491d Added translation using Weblate (Serbian) 2017-11-24 18:53:04 +00:00
Stefan Parviainen
df8a8f61e2 Fix logging of missing substitution variables 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-11-23 20:19:38 +01:00
Szimszon
1083df274d Translated using Weblate (Hungarian) 
Currently translated at 100.0% (936 of 936 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2017-11-22 19:20:29 +00:00
Kévin C
c3afa907a3 Translated using Weblate (French) 
Currently translated at 100.0% (936 of 936 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2017-11-22 17:49:22 +00:00
Weblate
d2061d7fa1 Merge remote-tracking branch 'origin/develop' into develop 2017-11-22 17:17:56 +00:00
David Baker
c002d3ff99
Merge pull request #1616 from pafcu/fix-presence-i18n 
Make PresenceLabel more easily translatable
 2017-11-22 17:17:52 +00:00
David Baker
a784abd57f
Comment typo 2017-11-22 17:13:18 +00:00
Weblate
13c80bab80 Merge remote-tracking branch 'origin/develop' into develop 2017-11-22 17:12:19 +00:00
David Baker
c648b471ed
Merge pull request #1618 from pafcu/fix-substitution 
Perform substitution on all parts, not just the last one
 2017-11-22 17:12:14 +00:00
Weblate
da76d1eb5d Merge remote-tracking branch 'origin/develop' into develop 2017-11-22 16:44:43 +00:00
Bamstam
d81d2f17a9 Translated using Weblate (German) 
Currently translated at 100.0% (932 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-11-22 16:44:42 +00:00
Richard van der Hoff
dff76f7db1
Merge pull request #1552 from matrix-org/t3chguy/header_access_token 
Send Access Token in Headers to help prevent it being spit out in errors
 2017-11-22 16:44:36 +00:00
Weblate
7c27e74d81 Merge remote-tracking branch 'origin/develop' into develop 2017-11-21 18:46:12 +00:00
Matthew Hodgson
d4feca5dfb
Merge pull request #1628 from pafcu/label-actionbuttons 
Add aria-labels to ActionButtons
 2017-11-21 18:46:07 +00:00
Weblate
7054f237a5 Merge remote-tracking branch 'origin/develop' into develop 2017-11-21 17:42:18 +00:00
Richard van der Hoff
b2e80a8ee2
Merge pull request #1620 from matrix-org/rav/fix_memberpresence_avatar 
MemberPresenceAvatar: fix null references
 2017-11-21 17:42:13 +00:00
Richard van der Hoff
91dbe956c6
Merge pull request #1623 from turt2live/travis/presence-break 
Disable presence controls if there's no presence
 2017-11-21 17:40:31 +00:00
Travis Ralston
5f3fda2950
Update MemberPresenceAvatar.js 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-21 09:01:56 -07:00