4c4220e9dd
Merge remote-tracking branch 'origin/develop' into develop
2017-11-14 16:07:56 +00:00
7c98558b6a
fix neglible race when loading CSS
2017-11-14 16:07:48 +00:00
869a2d158f
Merge remote-tracking branch 'origin/develop' into develop
2017-11-14 16:04:19 +00:00
1fd7ac30e4
turns out i made up the .complete property on link elements
2017-11-14 16:04:11 +00:00
299a32fa98
Merge remote-tracking branch 'origin/develop' into develop
2017-11-14 15:37:12 +00:00
8d6e3dd27d
fix lint
2017-11-14 15:37:03 +00:00
54b430c465
Merge remote-tracking branch 'origin/develop' into develop
2017-11-14 15:28:42 +00:00
dcfbe93409
fix race when loading CSS
...
fixes https://github.com/vector-im/riot-web/issues/5590
2017-11-14 15:28:34 +00:00
805796e4e0
force the tinter to refresh when we change theme
2017-11-14 15:27:28 +00:00
72754cf49c
Merge remote-tracking branch 'origin/develop' into develop
2017-11-14 15:17:59 +00:00
07addbe1e0
Translated using Weblate (Slovak)
...
Currently translated at 99.7% (931 of 933 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2017-11-14 15:17:58 +00:00
eb2d5d0ac5
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 15:17:58 +00:00
8c218557df
fix disable_custom_urls
2017-11-14 15:17:50 +00:00
d6de8b8d58
Merge remote-tracking branch 'origin/develop' into develop
2017-11-14 14:27:34 +00:00
1038e44672
Translated using Weblate (Slovak)
...
Currently translated at 99.7% (931 of 933 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2017-11-14 14:27:34 +00:00
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
b58514f427
Stop FF quantum exploding on CSS edits
2017-11-14 14:27:27 +00:00
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
c1d70f28d7
Merge remote-tracking branch 'origin/develop' into develop
2017-11-14 14:05:54 +00:00
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
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
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
12d9f05883
Merge branch 'develop' into luke/fix-restrict-power-level-options
2017-11-14 13:08:31 +00:00
3fa1bece0a
Simplify further
...
Also fix not-i18n-friendly "of" to be "=".
2017-11-14 13:06:54 +00:00
61ee39b3b2
Merge remote-tracking branch 'origin/develop' into develop
2017-11-14 12:43:00 +00:00
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
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
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
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
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
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
a44d717783
Merge remote-tracking branch 'origin/develop' into develop
2017-11-13 19:22:39 +00:00
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
ddd230d798
Merge pull request #1605 from matrix-org/matthew/status
...
Status.im theme
2017-11-13 19:22:34 +00:00
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
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
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
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
6942e94394
unbreak tests
2017-11-12 00:00:46 +00:00
46387e135e
Merge branch 'develop' into matthew/status
2017-11-11 23:50:48 +00:00
2827bc0718
replace some of the status.im theme with general config options
2017-11-11 23:46:43 +00:00
25a1dccffc
Merge remote-tracking branch 'origin/develop' into develop
2017-11-11 16:08:33 +00:00
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
39763d668c
Revert "Lowercase all usernames"
2017-11-11 15:59:43 +00:00
a0cdaf29f9
Merge remote-tracking branch 'origin/develop' into matthew/status
2017-11-10 15:29:42 -08:00
7cada3b227
Merge remote-tracking branch 'origin/develop' into develop
2017-11-10 16:19:40 +00:00
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
a96bfee9f2
Remove unused UserSettingsStore import
2017-11-10 16:12:27 +00:00
1c82df216e
Ignore unused React when using JSX
2017-11-10 16:11:59 +00:00
ceda5939f9
Remember to import React
2017-11-10 15:55:55 +00:00
Weblate