David Baker
65e1d49f37
More sensible buttons in UnknownDeviceDialog
...
Just say 'Send' (or equiv) if you actually verify all the devices,
rather than 'Send Anyway'.
2017-11-16 17:59:42 +00:00
David Baker
3c8645871f
Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show
2017-11-16 16:47:15 +00:00
David Baker
196eafdc7f
Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show
2017-11-16 15:59:16 +00:00
David Baker
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
Luke Barnard
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
David Baker
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
Luke Barnard
b54e563cb6
Merge branch 'develop' into luke/linting-keyword-spacing
2017-11-16 13:23:42 +00:00
Luke Barnard
dad797d4a2
Run linting --fix
2017-11-16 13:19:36 +00:00
Matthew Hodgson
f62b04c3be
Merge branch 'develop' into travis/granular_bugs
2017-11-16 13:12:03 +00:00
Luke Barnard
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
Luke Barnard
a80935e181
JSX does not do comments in a way one might expect
2017-11-16 11:45:40 +00:00
Travis Ralston
d0a0a9ce7f
Fix URL preview string not being translated
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-15 22:33:23 -07:00
Stefan Parviainen
2c1618bc10
Fix conflict and update strings
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-15 20:40:51 +01:00
David Baker
b0027525f3
Wire up Unknown Devices popup for outbound calls
2017-11-15 17:21:04 +00:00
Michael Telatynski
c0002e7778
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/state_events
2017-11-15 16:03:07 +00:00
Michael Telatynski
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
Richard Lewis
750e64deee
Pass required props to TintableSvg.
2017-11-15 15:17:21 +00:00
David Baker
93800be742
Factor out showing UnknownDeviceDialog
...
So we can re-use it for calls that fail due to unknwon devices
2017-11-15 15:15:21 +00:00
Richard Lewis
7bab7813bb
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/invertOutlineColour
2017-11-15 13:26:29 +00:00
Richard Lewis
59d405d4fa
Use TintableSvgButtons for widget menubar icons.
2017-11-15 13:24:38 +00:00
Richard Lewis
6c2e9096cd
Tintable SVGs that behave like normal image buttons / links.
2017-11-15 13:08:24 +00:00
David Baker
f8fc6dc83e
Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show
2017-11-15 12:11:33 +00:00
Matthew Hodgson
96a3eff5d3
lint hell
2017-11-15 11:25:56 +00:00
Travis Ralston
f58e8826c0
Use the correct settings store for presence
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-14 19:18:04 -07:00
Travis Ralston
bd4102eb3d
Merge branch 'develop' into travis/granular-settings
2017-11-14 19:12:48 -07:00
Matthew Hodgson
f05958e334
Merge pull request #1482 from turt2live/travis/presence
...
Implement user-controlled presence
2017-11-14 23:53:16 +00:00
Richard Lewis
58966c5c3d
Make edit icon green by default
2017-11-14 19:53:59 +00:00
Richard Lewis
e87940f63c
Make app tile title stronger
2017-11-14 19:53:32 +00:00
Stefan Parviainen
f8660de52d
Add note about alternative to opacity
2017-11-14 20:13:00 +01:00
Stefan Parviainen
df6d5cc2b4
Pass plain components, rather than functions returning them
2017-11-14 20:09:52 +01:00
Stefan Parviainen
788be67c75
Clarifications
2017-11-14 20:08:27 +01: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
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
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
Stefan Parviainen
2acd42e7c5
Make eslint happy
2017-11-13 21:10:08 +01:00
Travis Ralston
0648b3eae7
Merge branch 'develop' into travis/granular-settings
2017-11-13 12:29:36 -07:00
Stefan Parviainen
3afbaf61e7
Refactor i18n stuff a bit
2017-11-13 20:19:33 +01:00
Travis Ralston
c5c346f0b7
Merge branch 'develop' into travis/granular-settings
2017-11-13 12:18:41 -07:00
David Baker
0659ac1ccb
Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show
2017-11-13 17:45:57 +00: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
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
2827bc0718
replace some of the status.im theme with general config options
2017-11-11 23:46: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
a96bfee9f2
Remove unused UserSettingsStore import
2017-11-10 16:12:27 +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
Luke Barnard
6e1cf6ce17
Merge pull request #1548 from matrix-org/rxl881/widgetrendering
...
Improve widget rendering on prop updates
2017-11-10 12:41:20 +00:00
