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
bd4102eb3d
Merge branch 'develop' into travis/granular-settings
2017-11-14 19:12:48 -07: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
3fa1bece0a
Simplify further
...
Also fix not-i18n-friendly "of" to be "=".
2017-11-14 13:06:54 +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
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
a96bfee9f2
Remove unused UserSettingsStore import
2017-11-10 16:12:27 +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
6e1cf6ce17
Merge pull request #1548 from matrix-org/rxl881/widgetrendering
...
Improve widget rendering on prop updates
2017-11-10 12:41:20 +00:00
ba8a9f2a43
Comment length
2017-11-10 11:50:14 +00:00
6deeaf94d6
group name not required
2017-11-10 11:43:05 +00:00
d2070a08d8
Replace 'qs' dep. with 'querystring'
2017-11-10 11:42:56 +00:00
bd6b5c4498
Improve function name.
2017-11-10 10:17:55 +00:00
98ac3dd19b
Explicitly set initialisation state.
2017-11-10 09:44:58 +00:00
da8b1ff1cd
Ensure that loading state is reset when showing app panel.
2017-11-09 14:28:24 +00:00
f796bc79c3
Fix addition of scalar token to widget URL.
...
Add error logging.
2017-11-09 14:07:29 +00:00
9027780215
Show group name in flair tooltip if one is set
...
e.g. "Group Name (+group_id:homeserver)" or "+group_id:homeserver"
Fixes https://github.com/vector-im/riot-web/issues/5341
2017-11-09 12:38:43 +00:00
8016fb82d7
Fix broken commit.
2017-11-08 20:38:54 +00:00
56581ef408
Fix various loadingElement related issues.
2017-11-08 20:38:31 +00:00
b2b07d9370
Formatting
2017-11-08 20:17:28 +00:00
be0a76dbd6
Update variable name and JSdoc for improved clarity.
2017-11-08 17:44:54 +00:00
289b0c2b6a
Merge branch 'develop' into travis/granular-settings
2017-11-07 14:55:12 -07:00
646cabf324
Add missing whitespace
2017-11-07 15:15:10 +00:00
ddc1ff2f23
Name things in a sane way
2017-11-07 15:13:26 +00:00
62305a1ccd
Implement tooltip for group rooms
2017-11-07 14:07:31 +00:00
96de72ab44
Switch to using existing dep "qs" and record in package.json
2017-11-07 12:45:12 +00:00
d3784b4925
Fix URL parameter encoding.
2017-11-07 12:33:38 +00:00
eb8c15075a
Fix url params parsing.
2017-11-07 11:58:38 +00:00
70c4100350
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/widgetrendering
2017-11-07 11:04:05 +00:00
781b94c8f4
Appease the linter
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-05 15:37:06 -07:00
45140cab69
Don't assume false means "use state"
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-04 19:52:42 -07:00
cb17c0a379
Migrate blacklistUnverifiedDevicesPerRoom
...
This currently causes a split-brain scenario for the application due to the priority of each level. Granular settings assumes a simple override, however the crypto setting wants per room to be overriden with the global setting, regardless of the room setting. Some additional comments are needed on the intended behaviour.
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-04 19:15:55 -07:00
c7eee36990
Fix lanugage detection
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-04 16:38:26 -06:00
4f1ad974fc
Delay URL preview saving until the save button is pressed
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-04 16:32:13 -06:00
3fd5937687
Merge pull request #1571 from matrix-org/t3chguy/class-warning-thing
...
Fixes React warning
2017-11-04 15:41:57 +00:00
893c39bfbe
Merge branch 'develop' into travis/granular-settings
2017-11-03 22:00:07 -06:00
b2cd65e182
Fixes React warning
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-11-03 12:30:58 +00:00
853ada027d
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/widgetrendering
2017-11-02 18:34:46 +00:00
0e854ee356
Fix loading and initialisation spinners.
2017-11-02 18:33:11 +00:00
a52bb9d603
Pass URL to check.
2017-11-02 17:27:59 +00:00
8895ab7e5b
Merge pull request #1564 from matrix-org/dbkr/pillify_at_room
...
Pillify room notifs in the timeline
2017-11-02 14:22:58 +00:00
Richard Lewis