mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-14 11:51:59 +03:00
Code Issues Projects Releases Packages Wiki Activity
8003 commits 219 branches 562 tags 474 MiB
Commit graph

8003 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Hodgson
1bf3ef6de4 fix password reset 2017-10-27 01:23:50 +01:00
Matthew Hodgson
0952befdea target blank for tg 2017-10-27 01:09:37 +01:00
Matthew Hodgson
015aed0597 hide optionality of email for status 2017-10-27 01:03:04 +01:00
Andrey
de2bad2af4 Translated using Weblate (Russian) 
Currently translated at 100.0% (912 of 912 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-10-26 19:15:43 +00:00
Andrew (anoa)
b4868a6846
showWidget->hideWidgetDrawer and remove logs 
Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>
 2017-10-26 11:27:58 -07:00
Weblate
ea89c9b9a6 Merge remote-tracking branch 'origin/develop' into develop 2017-10-26 17:38:34 +00:00
Jan Kudrik
6bac1ad755 Translated using Weblate (Czech) 
Currently translated at 62.8% (573 of 911 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2017-10-26 17:38:33 +00:00
David Baker
1715206f62 Merge pull request #1532 from matrix-org/t3chguy/mention_user 
Add Mention button to MemberInfo
 2017-10-26 18:38:28 +01:00
Michael Telatynski
1d5b4a9d50 Merge branch 'develop' into t3chguy/mention_user 2017-10-26 18:10:10 +01:00
Matthew Hodgson
655d0c615a remove spurious Sign In button and legacy Return to App buttons 2017-10-26 17:57:49 +01:00
Matthew Hodgson
14d9743e30 unbreak reg 2017-10-26 17:22:32 +01:00
Andrey
a0509d8b5d Translated using Weblate (Russian) 
Currently translated at 100.0% (911 of 911 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-10-26 14:06:02 +00:00
Weblate
bd8097e44c Merge remote-tracking branch 'origin/develop' into develop 2017-10-26 13:52:20 +00:00
David Baker
c8a489ca77 Merge pull request #1541 from matrix-org/luke/groups-only-show-settings-icon-to-members 
Only show group settings cog to members
 2017-10-26 14:52:16 +01:00
Luke Barnard
9643784f85 Only show group settings cog to members 
Non-members have no settings to change.
 2017-10-26 14:31:27 +01:00
Weblate
c5c74749b7 Merge remote-tracking branch 'origin/develop' into develop 2017-10-26 13:23:11 +00:00
Luke Barnard
1012d118fe Merge pull request #1540 from matrix-org/luke/fix-dark-theme-cancel-icon 
Use correct icon for group room deletion and make themeable
 2017-10-26 14:23:06 +01:00
Luke Barnard
eec6ed36cd Use correct icon for group room deletion and make themeable 
Also fix cancel icons to have class mx_filterFlipColor
 2017-10-26 14:05:58 +01:00
Andrey
8a9750bccb Translated using Weblate (Russian) 
Currently translated at 100.0% (910 of 910 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-10-26 10:44:03 +00:00
Weblate
d3af886093 Merge remote-tracking branch 'origin/develop' into develop 2017-10-26 10:35:49 +00:00
David Baker
5871a74228 Merge pull request #1534 from matrix-org/t3chguy/invite_in_memberinfo 
Add invite button to MemberInfo if user has left or wasn't in room
 2017-10-26 11:35:45 +01:00
Andrey
3a8b036687 Translated using Weblate (Russian) 
Currently translated at 100.0% (909 of 909 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-10-26 10:17:25 +00:00
Weblate
8fdc0432b0 Merge remote-tracking branch 'origin/develop' into develop 2017-10-26 09:36:11 +00:00
Andrey
93008272dd Translated using Weblate (Russian) 
Currently translated at 100.0% (908 of 908 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-10-26 09:36:11 +00:00
Andreas Marek
d0ba79996f Translated using Weblate (German) 
Currently translated at 99.8% (907 of 908 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-10-26 09:36:10 +00:00
David Baker
bf4289632b Merge pull request #1539 from matrix-org/luke/feature-optionally-mirror-local-video 
Add option to mirror local video feed
 2017-10-26 10:36:03 +01:00
Luke Barnard
591a7f4b86 Default to false 2017-10-26 10:06:04 +01:00
Luke Barnard
97b9cf6402 Actually use the synced setting 2017-10-26 09:58:46 +01:00
David Baker
e6c3483c8b Add correct telegram link 2017-10-26 09:58:05 +01:00
Matthew Hodgson
5c32b5b11a fix i18n 2017-10-26 02:10:03 +01:00
Matthew Hodgson
deb0f902e3 linting 2017-10-26 01:59:18 +01:00
Matthew Hodgson
1237de3ef0 Merge branch 'develop' into matthew/status 2017-10-26 01:47:22 +01:00
Matthew Hodgson
5a9dae5ff1 use generic 'text button' for delete buttons in UserSettings 2017-10-26 01:44:05 +01:00
Matthew Hodgson
ac7a94afb2 apply theme tint at launch 2017-10-26 01:43:42 +01:00
Matthew Hodgson
b3a8593468 make tinter coarsely theme aware 2017-10-25 22:48:27 +01:00
Andrey
935e6baf88 Translated using Weblate (Russian) 
Currently translated at 100.0% (908 of 908 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-10-25 17:52:03 +00:00
Travis Ralston
24000ee456 Re-add i18n for labs 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-25 11:23:04 -06:00
Travis Ralston
e773585a02 Merge remote-tracking branch 'matrix-org/develop' into travis/presence 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-25 11:21:39 -06:00
Travis Ralston
5c9970950b Undo i18n change to make merge easier 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-25 11:21:12 -06:00
Luke Barnard
3ae97348f8 Add option to mirror local video feed 2017-10-25 18:17:33 +01:00
Weblate
a382834e56 Merge remote-tracking branch 'origin/develop' into develop 2017-10-25 16:47:29 +00:00
Bamstam
841e274b07 Translated using Weblate (German) 
Currently translated at 99.8% (906 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-10-25 16:47:28 +00:00
Jan Kudrik
9b93804afa Translated using Weblate (Czech) 
Currently translated at 60.1% (546 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2017-10-25 16:47:28 +00:00
Luke Barnard
4cfbd66729 Merge pull request #1538 from matrix-org/luke/fix-redaction-sender-tooltip 
Use the correct userId when displaying who redacted a message
 2017-10-25 17:47:22 +01:00
Luke Barnard
cedc0b27a9 Handle redaction with no sender 2017-10-25 17:37:20 +01:00
Luke Barnard
5990e41bd7 Use the correct userId when displaying who redacted a message 2017-10-25 17:24:45 +01:00
Stefan Parviainen
53e983f9c7 Fix merge conflict 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-10-25 18:19:27 +02:00
Andrey
45632b4191 Translated using Weblate (Russian) 
Currently translated at 100.0% (907 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-10-25 15:48:44 +00:00
Michael Telatynski
fd7e057ec0 Merge branch 'develop' into t3chguy/invite_in_memberinfo 2017-10-25 16:33:50 +01:00
Weblate
f8229b7d59 Merge remote-tracking branch 'origin/develop' into develop 2017-10-25 14:52:56 +00:00