fb1f20b7d4
Treat the master push rule as authoritative
...
Previously the push rule was ignored, leading to all kinds of interesting issues regarding notifications. This fixes those issues by giving the master push rule the authority it deserves for reasonable defaults.
Part 2 of the fix for:
* https://github.com/vector-im/riot-web/issues/5603
* https://github.com/vector-im/riot-web/issues/5606
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-15 22:33:23 -07:00
5976fb2eed
Treat null/undefined notification settings as "not set"
...
Otherwise we end up lying and saying notifications are disabled, despite the push rules saying otherwise.
Part 1 of the fix for:
* https://github.com/vector-im/riot-web/issues/5603
* https://github.com/vector-im/riot-web/issues/5606
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-15 22:08:13 -07:00
10a1d9cb29
Language is a local setting
...
Fixes https://github.com/vector-im/riot-web/issues/5611
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-15 21:16:12 -07:00
f141ee1944
Use the correct level order when getting arbitrary settings
...
This shouldn't currently be causing problems, but will in teh future. The bug can be exposed by having a setting where the level order is completely reversed, therefore causing LEVEL_ORDER[0] to actually be the most generic, not the most specific. Instead, we'll pull in the setting's level order and fallback to LEVEL_ORDER, therefore requesting the most specific value.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-15 19:24:32 -07:00
cf8ff6aed3
Validate that URL previews are explicitly enabled/disabled
...
Otherwise `!null` ends up being "true", therefore forcing URL previews on for everyone.
Fixes https://github.com/vector-im/riot-web/issues/5607
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-15 19:22:30 -07:00
022e40a127
Use SettingsStore for default theme
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-15 19:04:49 -07:00
5104ebfd29
Merge pull request #1611 from matrix-org/rxl881/invertOutlineColour
...
Make TintableSvg links behave like normal image links
2017-11-15 18:34:51 +00:00
750e64deee
Pass required props to TintableSvg.
2017-11-15 15:17:21 +00:00
24b9269ff5
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/invertOutlineColour
2017-11-15 15:08:28 +00:00
f4ecc7fa5d
speculatively fix @lampholder's NPE
2017-11-15 14:47:20 +00:00
ec33806379
Merge pull request #1610 from matrix-org/rxl881/lintingErrors
...
Fix linting errors.
2017-11-15 14:30:36 +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
84591729a8
unbreak tests
2017-11-15 11:15:49 +00:00
a63c491220
Merge branch 'master' into develop
2017-11-15 11:02:02 +00:00
6fd09bc09a
v0.11.0
2017-11-15 11:01:29 +00:00
bb2bc6ac08
Prepare changelog for v0.11.0
2017-11-15 11:01:29 +00:00
9df169b500
Bump js-sdk to release 0.9.0
2017-11-15 10:59:06 +00:00
060a890275
Merge pull request #1516 from turt2live/travis/granular-settings
...
Granular settings
2017-11-15 10:55:55 +00:00
56a70f5530
Add tinting for lowlights.
2017-11-15 10:40:07 +00:00
06b319937f
Fix linting errors.
2017-11-15 10:14:16 +00:00
e91e94fd42
fix unstyled CSS bug https://github.com/vector-im/riot-web/issues/5601
2017-11-15 09:56:44 +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
443bff5832
Presence feature
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-14 19:14:56 -07:00
bd4102eb3d
Merge branch 'develop' into travis/granular-settings
2017-11-14 19:12:48 -07:00
546b062d82
automatically and correctly retint when changing theme
2017-11-15 01:45:51 +00:00
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
f05958e334
Merge pull request #1482 from turt2live/travis/presence
...
Implement user-controlled presence
2017-11-14 23:53:16 +00:00
bd8caebe41
Merge pull request #1609 from matrix-org/rxl881/editIcon
...
Edit widget icon styling
2017-11-14 20:20:32 +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
7c98558b6a
fix neglible race when loading CSS
2017-11-14 16:07:48 +00:00
1fd7ac30e4
turns out i made up the .complete property on link elements
2017-11-14 16:04:11 +00:00
8d6e3dd27d
fix lint
2017-11-14 15:37:03 +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
8c218557df
fix disable_custom_urls
2017-11-14 15:17:50 +00:00
b58514f427
Stop FF quantum exploding on CSS edits
2017-11-14 14:27:27 +00:00
07f4d0c304
v0.11.0-rc.3
2017-11-14 14:17:22 +00:00
a0b810a70c
Prepare changelog for v0.11.0-rc.3
2017-11-14 14:17:22 +00:00
55260becc9
Revert "Lowercase all usernames"
2017-11-14 14:13:22 +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
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
Travis Ralston