3afbaf61e7
Refactor i18n stuff a bit
2017-11-13 20:19:33 +01:00
c5c346f0b7
Merge branch 'develop' into travis/granular-settings
2017-11-13 12:18:41 -07:00
0659ac1ccb
Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show
2017-11-13 17:45:57 +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
809dd0856f
add more fixmes
2017-11-13 16:35:39 +00:00
0a80774066
unstatusify redirects
2017-11-13 16:26:26 +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
5abee4fddc
replace some of the status.im theme with general config options
2017-11-11 23:47:03 +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
bce4815851
Initialise unread messages value correctly
2017-11-11 15:57:20 +00:00
a0cdaf29f9
Merge remote-tracking branch 'origin/develop' into matthew/status
2017-11-10 15:29:42 -08:00
47d9e7f2a1
Merge remote-tracking branch 'origin/develop' into matthew/status
2017-11-10 15:29:37 -08:00
d7ceddfe61
Revert unintended merge commit.
2017-11-10 21:43:34 +00:00
42bb54b202
Set widget menu bar background colour.
2017-11-10 21:41:35 +00:00
7a42e844d1
Remove unused styling.
2017-11-10 20:16:32 +00:00
43fb359d8f
Vertically align menu bar items.
2017-11-10 20:12:30 +00:00
31e0cde900
Improve hover border.
2017-11-10 20:12:12 +00:00
53143cb033
Center icons in menu bar.
2017-11-10 17:26:57 +00:00
7eeb7babc4
White edit icon (to avoid having to use css filters to invert).
2017-11-10 17:26:33 +00:00
883ec159e2
Add yellow warning triangle image.
2017-11-10 17:25:56 +00:00
ef9f2f7ce6
v0.13.0-rc.2
2017-11-10 16:53:03 +00:00
d9bb6c52b4
Prepare changelog for v0.13.0-rc.2
2017-11-10 16:53:03 +00:00
ea0cfa92b4
v0.13.0-rc.2
2017-11-10 16:52:24 +00:00
150fa43735
Bump react-sdk dep
2017-11-10 16:51:05 +00:00
718f48ba04
Merge branch 'develop' into release-v0.13.0
2017-11-10 16:50:11 +00:00
21ead6e48e
v0.11.0-rc.2
2017-11-10 16:45:30 +00:00
34fec5bd57
Prepare changelog for v0.11.0-rc.2
2017-11-10 16:45:30 +00:00
477133a3fb
Merge branch 'develop' into release-v0.11.0
2017-11-10 16:38:24 +00:00
1b21b8cce2
Merge remote-tracking branch 'origin/develop' into develop
2017-11-10 16:24:25 +00:00
73e7581fc6
Merge pull request #5566 from vector-im/luke/groups-enable
...
Make groups a fully-fleged baked-in feature
2017-11-10 16:24:19 +00:00
83373bcf6e
Merge branch 'develop' of https://github.com/vector-im/riot-web into rxl881/visualCue
2017-11-10 16:22:33 +00: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
29abb5eed0
Center mixed content warnings in panel.
2017-11-10 16:15:31 +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
853d33a93a
Make groups a fully-fleged baked-in feature
2017-11-10 15:42:11 +00:00
277a6dee10
Make groups a fully-fleged baked-in feature
2017-11-10 15:38:50 +00:00
25bff3f4b1
Merge remote-tracking branch 'origin/develop' into develop
2017-11-10 15:21:04 +00:00
ed6d1f5a2e
Merge remote-tracking branch 'origin/develop' into develop
2017-11-10 15:08:53 +00:00
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
71d0ecf37d
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 100.0% (217 of 217 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/
2017-11-10 14:14:56 +00:00
Stefan Parviainen
Travis Ralston
David Baker
Luke Barnard
Matthew Hodgson
Krombel
Matthew Hodgson
Weblate
David Baker
Richard Lewis
Luke Barnard
Tong Hui