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
Matthew Hodgson
f4ecc7fa5d
speculatively fix @lampholder's NPE
2017-11-15 14:47:20 +00:00
Matthew Hodgson
ec33806379
Merge pull request #1610 from matrix-org/rxl881/lintingErrors
...
Fix linting errors.
2017-11-15 14:30:36 +00:00
Matthew Hodgson
96a3eff5d3
lint hell
2017-11-15 11:25:56 +00:00
Matthew Hodgson
84591729a8
unbreak tests
2017-11-15 11:15:49 +00:00
Luke Barnard
a63c491220
Merge branch 'master' into develop
2017-11-15 11:02:02 +00:00
Luke Barnard
6fd09bc09a
v0.11.0
2017-11-15 11:01:29 +00:00
Luke Barnard
bb2bc6ac08
Prepare changelog for v0.11.0
2017-11-15 11:01:29 +00:00
Luke Barnard
9df169b500
Bump js-sdk to release 0.9.0
2017-11-15 10:59:06 +00:00
Matthew Hodgson
060a890275
Merge pull request #1516 from turt2live/travis/granular-settings
...
Granular settings
2017-11-15 10:55:55 +00:00
Richard Lewis
06b319937f
Fix linting errors.
2017-11-15 10:14:16 +00:00
Matthew Hodgson
e91e94fd42
fix unstyled CSS bug https://github.com/vector-im/riot-web/issues/5601
2017-11-15 09:56:44 +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
443bff5832
Presence feature
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-14 19:14:56 -07:00
Travis Ralston
bd4102eb3d
Merge branch 'develop' into travis/granular-settings
2017-11-14 19:12:48 -07:00
Matthew Hodgson
546b062d82
automatically and correctly retint when changing theme
2017-11-15 01:45:51 +00:00
Matthew Hodgson
d6fc4ebe3c
fix new tinter problems
...
correctly handle skinned tertiaryColors (turns out they're used for the RoomSublist divider bars)
handle the fact that some room accountData apparently has ended up with rgb() colors in it...
2017-11-15 01:01:17 +00: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
bd8caebe41
Merge pull request #1609 from matrix-org/rxl881/editIcon
...
Edit widget icon styling
2017-11-14 20:20:32 +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
Matthew Hodgson
7c98558b6a
fix neglible race when loading CSS
2017-11-14 16:07:48 +00:00
Matthew Hodgson
1fd7ac30e4
turns out i made up the .complete property on link elements
2017-11-14 16:04:11 +00:00
Matthew Hodgson
8d6e3dd27d
fix lint
2017-11-14 15:37:03 +00:00
Matthew Hodgson
dcfbe93409
fix race when loading CSS
...
fixes https://github.com/vector-im/riot-web/issues/5590
2017-11-14 15:28:34 +00:00
Matthew Hodgson
805796e4e0
force the tinter to refresh when we change theme
2017-11-14 15:27:28 +00:00
Matthew Hodgson
8c218557df
fix disable_custom_urls
2017-11-14 15:17:50 +00:00
Matthew Hodgson
b58514f427
Stop FF quantum exploding on CSS edits
2017-11-14 14:27:27 +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
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
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
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
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
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
