Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-17 14:05:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,777 Commits 206 Branches 552 Tags 519 MiB
648be26fb7
Commit Graph

7777 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bamstam
20beb7990f Translated using Weblate (German) 
Currently translated at 99.4% (928 of 933 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-11-14 14:27:33 +00:00
Matthew Hodgson
b58514f427 Stop FF quantum exploding on CSS edits 2017-11-14 14:27:27 +00:00
Kévin C
64958d05b9 Translated using Weblate (French) 
Currently translated at 100.0% (933 of 933 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2017-11-14 14:18:25 +00:00
Luke Barnard
07f4d0c304 v0.11.0-rc.3 2017-11-14 14:17:22 +00:00
Luke Barnard
a0b810a70c Prepare changelog for v0.11.0-rc.3 2017-11-14 14:17:22 +00:00
David Baker
55260becc9 Revert "Lowercase all usernames" 2017-11-14 14:13:22 +00:00
Weblate
c1d70f28d7 Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 14:05:54 +00:00
Peter Vágner
3d677d84fe Translated using Weblate (Slovak) 
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/sk/
 2017-11-14 14:05:54 +00:00
Luke Barnard
c644e7d673
Merge pull request #1607 from matrix-org/luke/fix-restrict-power-level-options 
Attempt to improve textual power levels
 2017-11-14 14:05:50 +00:00
Peter Vágner
9d19496011 Translated using Weblate (Slovak) 
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/sk/
 2017-11-14 13:23:15 +00:00
Luke Barnard
12d9f05883 Merge branch 'develop' into luke/fix-restrict-power-level-options 2017-11-14 13:08:31 +00:00
Luke Barnard
3fa1bece0a Simplify further 
Also fix not-i18n-friendly "of" to be "=".
 2017-11-14 13:06:54 +00:00
Weblate
61ee39b3b2 Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 12:43:00 +00:00
Andrey
85f002b21c Translated using Weblate (Russian) 
Currently translated at 98.4% (918 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-11-14 12:43:00 +00:00
David Baker
e7c99a71b6
Merge pull request #1606 from matrix-org/luke/fix-member-info-power-level-display 
Determine whether power level is custom once Roles have been determined
 2017-11-14 12:42:55 +00:00
Luke Barnard
c3492634bd Merge branch 'luke/fix-member-info-power-level-display' into luke/fix-restrict-power-level-options 2017-11-14 12:41:36 +00:00
Luke Barnard
d2ef6bffa8 Remove reverseRoles 
This variable seemed redundant in hindsight, it seemed better to remove it than to worry about where it went in the component.
 2017-11-14 12:02:37 +00:00
Kévin C
acd2be4b68 Translated using Weblate (French) 
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/fr/
 2017-11-14 10:53:57 +00:00
Szimszon
6c8283b3a8 Translated using Weblate (Hungarian) 
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/hu/
 2017-11-14 06:41:28 +00:00
Travis Ralston
d92cba25ef Use the SettingsStore to get the theme 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-13 13:14:00 -07:00
Travis Ralston
63bebe9dfd Split out avatar and display name hiding 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-13 12:58:10 -07:00
Travis Ralston
ffecb82bca Groups were released 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-13 12:34:30 -07:00
Travis Ralston
0648b3eae7 Merge branch 'develop' into travis/granular-settings 2017-11-13 12:29:36 -07:00
Weblate
a44d717783 Merge remote-tracking branch 'origin/develop' into develop 2017-11-13 19:22:39 +00:00
Bamstam
beebe6b92b Translated using Weblate (German) 
Currently translated at 100.0% (928 of 928 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-11-13 19:22:38 +00:00
Matthew Hodgson
ddd230d798
Merge pull request #1605 from matrix-org/matthew/status 
Status.im theme
 2017-11-13 19:22:34 +00:00
Travis Ralston
c5c346f0b7 Merge branch 'develop' into travis/granular-settings 2017-11-13 12:18:41 -07:00
Luke Barnard
52af7a7659 Attempt to clarify the affect that the users_default has on power levels 
This modifies displayed power levels such that:
 - If users_default is !== 0:
   - the power level 0 is displayed as "Restricted (0)"
   - the power level users_default is displayed as "Default ({users_default})"
 - Otherwise:
   - the power level 0 is displayed as "Default (0)"

When changing users_default, to say, 10, when the textual powers are rendered
again, they will take users_default into account. So those previously at 10
and which would have previously have been rendered "Custom of 10" will now
read "Default (10)". Conversely, those that were "Default (0)" will now read
"Restricted (0)".
 2017-11-13 17:03:48 +00:00
Krombel
a97f530999 Translated using Weblate (German) 
Currently translated at 100.0% (928 of 928 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-11-13 14:05:02 +00:00
Luke Barnard
88010fa26c Determine whether power level is custom once Roles have been determined 
Instead of potentially inspecting an empty {} before mounting.

This fixes an issue where "Custom of N" would appear on the first mount of MemberInfo - part of https://github.com/vector-im/riot-web/issues/5107#issuecomment-331882294
 2017-11-13 11:57:34 +00:00
Matthew Hodgson
ca531f83d2 remove needless case-squash on login, castrating https://github.com/matrix-org/matrix-react-sdk/pull/1550 2017-11-13 10:34:38 +00:00
Matthew Hodgson
6942e94394 unbreak tests 2017-11-12 00:00:46 +00:00
Matthew Hodgson
46387e135e
Merge branch 'develop' into matthew/status 2017-11-11 23:50:48 +00:00
Matthew Hodgson
2827bc0718 replace some of the status.im theme with general config options 2017-11-11 23:46:43 +00:00
Weblate
25a1dccffc Merge remote-tracking branch 'origin/develop' into develop 2017-11-11 16:08:33 +00:00
David Baker
4b206a0117
Merge pull request #1604 from matrix-org/revert-1547-dbkr/username_to_lower 
Revert "Lowercase all usernames"
 2017-11-11 16:08:27 +00:00
David Baker
39763d668c
Revert "Lowercase all usernames" 2017-11-11 15:59:43 +00:00
Matthew Hodgson
a0cdaf29f9 Merge remote-tracking branch 'origin/develop' into matthew/status 2017-11-10 15:29:42 -08:00
Luke Barnard
21ead6e48e v0.11.0-rc.2 2017-11-10 16:45:30 +00:00
Luke Barnard
34fec5bd57 Prepare changelog for v0.11.0-rc.2 2017-11-10 16:45:30 +00:00
Luke Barnard
477133a3fb Merge branch 'develop' into release-v0.11.0 2017-11-10 16:38:24 +00:00
Weblate
7cada3b227 Merge remote-tracking branch 'origin/develop' into develop 2017-11-10 16:19:40 +00:00
Luke Barnard
b3ddec4131
Merge pull request #1603 from matrix-org/luke/groups-enable 
Make groups a fully-fleged baked-in feature
 2017-11-10 16:19:35 +00:00
Luke Barnard
a96bfee9f2 Remove unused UserSettingsStore import 2017-11-10 16:12:27 +00:00
Luke Barnard
1c82df216e Ignore unused React when using JSX 2017-11-10 16:11:59 +00:00
Luke Barnard
ceda5939f9 Remember to import React 2017-11-10 15:55:55 +00:00
Luke Barnard
853d33a93a Make groups a fully-fleged baked-in feature 2017-11-10 15:42:11 +00:00
Weblate
ed6d1f5a2e Merge remote-tracking branch 'origin/develop' into develop 2017-11-10 15:08:53 +00:00
Tong Hui
0f8df97a47 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 70.4% (654 of 928 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
 2017-11-10 15:08:52 +00:00
Luke Barnard
07b6c55982 v0.11.0-rc.1 2017-11-10 13:40:17 +00:00