c002d3ff99
Merge pull request #1616 from pafcu/fix-presence-i18n
...
Make PresenceLabel more easily translatable
2017-11-22 17:17:52 +00:00
a784abd57f
Comment typo
2017-11-22 17:13:18 +00:00
d4feca5dfb
Merge pull request #1628 from pafcu/label-actionbuttons
...
Add aria-labels to ActionButtons
2017-11-21 18:46:07 +00:00
b2e80a8ee2
Merge pull request #1620 from matrix-org/rav/fix_memberpresence_avatar
...
MemberPresenceAvatar: fix null references
2017-11-21 17:42:13 +00:00
5f3fda2950
Update MemberPresenceAvatar.js
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-21 09:01:56 -07:00
7c5f74e18a
Fix GroupMemberList search for users without displayname
...
When there is a user in a group which has no displayname set
the search failed with "Cannot read property 'toLowerCase' of null"
2017-11-20 17:02:20 +01:00
28ff0a4ee7
Disable presence controls if there's no presence
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-17 22:25:15 -07:00
d010329f4a
Make the room-level URL preview notification explicit
...
Fixes https://github.com/vector-im/riot-web/issues/5638
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-17 22:03:06 -07:00
cdf5a6fb8a
Fix typo that prevented URL previews on a room-account level from being saved
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-17 22:02:33 -07:00
4e7fd55fb4
MemberPresenceAvatar: fix null references
...
avoid assuming that `member` has a `user`
2017-11-17 14:35:33 +00:00
8090aadb0e
Add aria-labels to ActionButtons
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi >
2017-11-17 14:33:39 +01:00
df921438f3
Make PresenceLabel more easily translatable
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi >
2017-11-16 18:36:54 +01:00
02629d13d9
Merge pull request #1615 from matrix-org/luke/fix-sender-profile-opacity
...
Do something more sensible for sender profile name/aux opacity
2017-11-16 15:35:16 +00:00
7ffb542cb5
Do something more sensible for sender profile name/aux opacity
...
- If no translation is needed, don't do it.
- For now, ignore the fact that this doens't allow us easily to put
Flair into "luke sent an image" but we don't kow where the flair
should go for this anyway.
2017-11-16 15:24:36 +00:00
6f8427a5af
Revert rest of https://github.com/matrix-org/matrix-react-sdk/pull/1584
...
Because apparently the revert did not revert this part
2017-11-16 15:11:47 +00:00
b54e563cb6
Merge branch 'develop' into luke/linting-keyword-spacing
2017-11-16 13:23:42 +00:00
dad797d4a2
Run linting --fix
2017-11-16 13:19:36 +00:00
f62b04c3be
Merge branch 'develop' into travis/granular_bugs
2017-11-16 13:12:03 +00:00
f99755378a
Merge pull request #1612 from matrix-org/t3chguy/state_events
...
differentiate between state events and message events
2017-11-16 13:06:36 +00:00
a80935e181
JSX does not do comments in a way one might expect
2017-11-16 11:45:40 +00:00
d0a0a9ce7f
Fix URL preview string not being translated
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-15 22:33:23 -07:00
2c1618bc10
Fix conflict and update strings
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi >
2017-11-15 20:40:51 +01:00
c0002e7778
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/state_events
2017-11-15 16:03:07 +00:00
5563b71c47
differentiate between state events and message events
...
so that people can't fake state event types and have them rendered.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-11-15 15:56:54 +00:00
750e64deee
Pass required props to TintableSvg.
2017-11-15 15:17:21 +00:00
7bab7813bb
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/invertOutlineColour
2017-11-15 13:26:29 +00:00
59d405d4fa
Use TintableSvgButtons for widget menubar icons.
2017-11-15 13:24:38 +00:00
6c2e9096cd
Tintable SVGs that behave like normal image buttons / links.
2017-11-15 13:08:24 +00:00
96a3eff5d3
lint hell
2017-11-15 11:25:56 +00:00
f58e8826c0
Use the correct settings store for presence
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-14 19:18:04 -07:00
bd4102eb3d
Merge branch 'develop' into travis/granular-settings
2017-11-14 19:12:48 -07:00
f05958e334
Merge pull request #1482 from turt2live/travis/presence
...
Implement user-controlled presence
2017-11-14 23:53:16 +00:00
58966c5c3d
Make edit icon green by default
2017-11-14 19:53:59 +00:00
e87940f63c
Make app tile title stronger
2017-11-14 19:53:32 +00:00
f8660de52d
Add note about alternative to opacity
2017-11-14 20:13:00 +01:00
df6d5cc2b4
Pass plain components, rather than functions returning them
2017-11-14 20:09:52 +01:00
788be67c75
Clarifications
2017-11-14 20:08:27 +01: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
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
d92cba25ef
Use the SettingsStore to get the theme
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-13 13:14:00 -07:00
2acd42e7c5
Make eslint happy
2017-11-13 21:10:08 +01:00
0648b3eae7
Merge branch 'develop' into travis/granular-settings
2017-11-13 12:29:36 -07:00
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
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
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
2827bc0718
replace some of the status.im theme with general config options
2017-11-11 23:46:43 +00:00
David Baker