Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-18 06:35:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,060 Commits 206 Branches 552 Tags 519 MiB
36951dd7b7
Commit Graph

4817 Commits

Author SHA1 Message Date
David Baker
1fe830d1c6 Remove noreferrer on widget pop-out 
Having the referrer allows widgets to do customisation based on what
riot instance is embedding it. It gets a referrer when we embed it
in the iframe so there's nothing gained by suppressing it here.
 2019-03-27 13:27:57 +00:00
Bruno Windels
adf263c4af Merge branch 'develop' into bwindels/bacat-scrolling-merged-develop 2019-03-27 11:46:28 +01:00
Travis Ralston
ddcb7a68bd
Merge pull request #2781 from matrix-org/travis/openid-widget 
Widget OpenID reauth implementation
 2019-03-27 03:42:39 -06:00
J. Ryan Stinnett
db834b315a
Merge pull request #2828 from jryans/notification-labels 
Clarify devices affected by notification settings
 2019-03-26 17:43:19 +00:00
J. Ryan Stinnett
f8dce875f2 Clarify devices affected by notification settings 
This clarifies that the notification settings only apply to the current device.
This also tries to apply the spirit of
https://github.com/matrix-org/matrix-react-sdk/pull/1995 (authored by @aidalgol)
which wanted to remove "web" from the label, since there's also a desktop
client.
 2019-03-26 17:39:07 +00:00
Travis Ralston
1703e3860b
Merge pull request #2822 from matrix-org/travis/minimize-widgets 
Minimize stickerpicker when the title is clicked
 2019-03-26 07:44:14 -06:00
J. Ryan Stinnett
dbc4735b06
Merge pull request #2825 from YaoiFangirl420/develop 
Add <code> blocks around homeserver and identity server urls
 2019-03-26 09:35:56 +00:00
Travis Ralston
69fcebf045 Use allow/deny instead of whitelist/blacklist for terminology 2019-03-25 21:14:21 -06:00
Travis Ralston
79ea873717
Merge pull request #2820 from matrix-org/travis/timeline-explosion-workaround 
Ask the user for debug logs when the timeline explodes
 2019-03-25 12:09:16 -06:00
J. Ryan Stinnett
1e5c0a8713
Apply suggestions from code review 
Co-Authored-By: turt2live <travpc@gmail.com>
 2019-03-25 11:56:49 -06:00
J. Ryan Stinnett
3e676454b6
Update src/components/views/dialogs/TimelineExplosionDialog.js 
Co-Authored-By: turt2live <travpc@gmail.com>
 2019-03-25 11:33:31 -06:00
Travis Ralston
1172488cce
Merge pull request #2823 from matrix-org/travis/fix-add-widget-button 
Fix typo preventing users from adding more widgets easily
 2019-03-25 09:59:43 -06:00
Travis Ralston
0d5c98634d
Merge pull request #2817 from matrix-org/travis/blacklist-unverified-devices 
Attach an onChange listener to the room's blacklist devices option
 2019-03-25 09:59:29 -06:00
YaoiFangirl420
f2b64a8e7f Add <code> blocks around homeserver and identity server urls 
To make the urls visually distinct from the surrounding non-url text

Signed-off-by: YaoiFangirl420 <48789208+YaoiFangirl420@users.noreply.github.com>
 2019-03-24 02:05:04 -07:00
Travis Ralston
1ba23d6833 Fix typo preventing users from adding more widgets easily 
Fixes https://github.com/vector-im/riot-web/issues/9266
 2019-03-23 23:53:21 -06:00
Travis Ralston
a8ae63bb06 Minimize stickerpicker when the title is clicked 
Fixes https://github.com/vector-im/riot-web/issues/6437

This also fixes a bug where if the room had apps open and you clicked the sticker picker's title, you'd end up closing the apps and not the picker.
 2019-03-23 23:50:06 -06:00
Travis Ralston
3654c895eb Appease the linter 2019-03-23 23:31:19 -06:00
Travis Ralston
2dcb40f1be Track OpenID automatic permissions by (widgetLocation, widgetUrl) 2019-03-23 23:25:31 -06:00
Travis Ralston
d3268801ed Merge branch 'develop' into travis/openid-widget 2019-03-23 22:48:12 -06:00
YaoiFangirl420
00335e2462 Fix bug with NetworkList dropdown 
The NetworkDropdown component was incorrectly guarding against a null
check when retrieving the list of networks

Signed-off-by: YaoiFangirl420 <48789208+YaoiFangirl420@users.noreply.github.com>
 2019-03-23 20:53:09 -07:00
Travis Ralston
e5f7563dec Ask the user for debug logs when the timeline explodes 
Fixes https://github.com/vector-im/riot-web/issues/9260
Workaround for https://github.com/vector-im/riot-web/issues/8593
Requires https://github.com/matrix-org/matrix-js-sdk/pull/869

We check if any dialogs are open before moving forward because we don't want to risk showing so many dialogs that the user is unable to click a button. We're also not overly concerned if the dialog being shown is irrelevant because whatever the user is doing will likely be unaffected, and we can scream in pain when they're finished.
 2019-03-22 20:23:35 -06:00
Travis Ralston
50614fa7fb Attach an onChange listener to the room's blacklist devices option 
Fixes https://github.com/vector-im/riot-web/issues/9235

The global option in user settings is unaffected by this bug. Users who have previously set the per-room flag without success can simply refresh the page and the change will be picked up. The bug here is that the current session would not update accordingly, however.

Introduced in https://github.com/matrix-org/matrix-react-sdk/pull/2523
 2019-03-22 14:22:20 -06:00
J. Ryan Stinnett
c17f7a2949 Trim the logging for URL previews 
It should be sufficient to have the error stack and general log message for URL
preview failure.
 2019-03-22 18:50:08 +00:00
Bruno Windels
494779393f Merge branch 'develop' into bwindels/bacat-scrolling 2019-03-21 13:50:32 +01:00
David Baker
324781005d
Merge pull request #2808 from matrix-org/dbkr/velocity-mainline 
Go back to using mainine velocity
 2019-03-20 19:01:20 +00:00
Bruno Windels
f164a78eaa reimplement typing notif timeline shrinking prevention 
instead of setting a min-height on the whole timeline,
track how much height we need to add to prevent shrinking
and set paddingBottom on the container element of the timeline.
 2019-03-20 17:10:30 +01:00
Travis Ralston
94e91e6f9a
Merge pull request #2796 from matrix-org/travis/upgrade-warning 
Warn that members won't be autojoined to upgraded rooms
 2019-03-20 08:34:33 -06:00
David Baker
1a8fe4dd43 Go back to using mainine velocity 
We moved off to our own fork of velocity many moons ago to fix
a memory leak bug when velocity was being barely maintained. They
have now merged the bugfix, so go back to mainline.
 2019-03-20 10:54:06 +00:00
Travis Ralston
9f6b550caa
Merge pull request #2801 from matrix-org/travis/renew-widget 
Discard old sticker picker when the URL changes
 2019-03-19 08:50:33 -06:00
Travis Ralston
d713c62774
Merge pull request #2799 from matrix-org/travis/widget-reload 
Reload widget messaging when widgets reload
 2019-03-19 08:49:24 -06:00
Travis Ralston
6a7e4ba52c
Merge pull request #2806 from matrix-org/t3chguy/explicit_room_name_settings 
Don't show calculated room name in room settings name input field
 2019-03-18 20:32:11 -06:00
Michael Telatynski
cadf36e1c9 Don't show calculated room name in room settings name input field 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-03-18 23:33:24 +00:00
Michael Telatynski
d6f31bef8e Disable big emoji for m.emote messages as it looks weird 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-03-18 23:25:11 +00:00
Travis Ralston
a397f333d7 Discard old sticker picker when the URL changes 
Fixes https://github.com/vector-im/riot-web/issues/7547
 2019-03-16 16:02:38 -06:00
Travis Ralston
b68960ad26 Reload widget messaging when widgets reload 
Fixes a bug for some widgets where they cannot do their startup routine (capabilities negotiation, etc) when someone maximizes the widget. By reloading the widget messaging, we ensure the widget is kept in the loop.
 2019-03-15 22:24:27 -06:00
Travis Ralston
b48842e070 Fix imports for linter 2019-03-15 21:51:19 -06:00
Travis Ralston
f045beafc3 Support whitelisting/blacklisting widgets for OpenID 2019-03-15 21:33:31 -06:00
Travis Ralston
27c9b24cab Appease more of the linter 2019-03-15 16:44:27 -06:00
Travis Ralston
f6e3437944 Update text in RoomUpgradeWarningBar to match suggestions 2019-03-15 16:08:35 -06:00
Travis Ralston
92b851b26c Update text for room version upgrades in settings 2019-03-15 15:49:18 -06:00
Travis Ralston
da61e5e9d9 Merge branch 'develop' into travis/upgrade-warning 2019-03-15 15:32:49 -06:00
Bruno Windels
bab2730d40 use ResizeNotifier as well to relayout room list 2019-03-15 10:16:21 +01:00
Bruno Windels
af0a51d3b2 use AutoHideScrollbar in member info panel 2019-03-15 10:16:21 +01:00
Bruno Windels
dad382a4b7 use AutoHideScrollbar in memberlist 2019-03-15 10:16:21 +01:00
Bruno Windels
f71a9f10dd remove onChildResize in RoomView as it's unused 2019-03-15 10:16:21 +01:00
Travis Ralston
788041a774 Warn that members won't be invited to the new room in room settings 2019-03-14 17:33:34 -06:00
Travis Ralston
5ded646db0 Warn that members won't be autojoined to upgraded rooms 
Fixes https://github.com/vector-im/riot-web/issues/8173

Wording is questionable though.
 2019-03-14 17:33:34 -06:00
J. Ryan Stinnett
ec51aee656 Remove refs from RegistrationForm 
This aligns the code in `RegistrationForm` with other users of the `Field`
component. (In https://github.com/matrix-org/matrix-react-sdk/pull/2780, I had
thought that this code would be okay to leave alone, but I had missed the usage
of the `Field` value getter.)

Fixes https://github.com/vector-im/riot-web/issues/9172
 2019-03-14 14:29:04 +00:00
J. Ryan Stinnett
c70925ab0d Restore Field value getter for RegistrationForm 
When working on the `Field` validation support, I thought `RegistrationForm`'s
refs would be okay to leave as is, but I missed that they also depended on the
value getter.

For the moment, it's quicker to temporarily revive the value getter to get
registration working.

Fixes https://github.com/vector-im/riot-web/issues/9171
 2019-03-14 12:29:00 +00:00
J. Ryan Stinnett
45063cad4a
Merge pull request #2780 from jryans/auth-validation 
Initial portions of support for Field validation
 2019-03-14 10:19:21 +00:00
J. Ryan Stinnett
77a06756e3 Remove padlock click handler to show unknown devices 
The unknown devices dialog is confusing at the moment due to the complex trust
model in Riot involving various possible device states.

The room header padlock allows you to access this dialog even if there are no
unknown devices, which leads users to be unsure what they can believe and
reduces confidence in Riot. For now, we'll remove the room header click handler
that shows this dialog.

Fixes https://github.com/vector-im/riot-web/issues/8815
 2019-03-13 12:58:23 +00:00
Jason Robinson
02ff1763a2 Ensure scalar_token is valid before opening integrations manager 
Since Scalar (and other integration managers) are loaded as apps into
an iframe, a valid `scalar_token` must exist when loading the app.

It is possible that a scalar_token becomes invalid between the time
when the integration manager button was rendered and the user clicking
the link. Here we make a call to integration manager `/account`
before trying to render the integration manager, which ensures we
have a valid token for the integration manager to work with.

Moving the scalar token revalidation to the cases where it is actually
needed could make it possible to decrease the amount of Scalar /account
calls we do when switching rooms, which is currently 3.

Signed-off-by: Jason Robinson <jasonr@matrix.org>
 2019-03-13 11:47:00 +02:00
J. Ryan Stinnett
e90d659e19 Remove validation demo code 
This is example code from @ara4n's work in
https://github.com/matrix-org/matrix-react-sdk/pull/2550. We're not ready to
actually apply validation yet, so removing this for now.
 2019-03-12 16:53:30 +00:00
J. Ryan Stinnett
69a066657b Remove bits of Field that supported uncontrolled 
Field is no longer used as an uncontrolled component, so we can remove some
supporting code that we no longer need.
 2019-03-12 16:51:19 +00:00
J. Ryan Stinnett
d4dbba3938 Convert uncontrolled Field usages to controlled 
As part of adding validation to Field, the logic is simpler to follow if we can
assume that all usages of Field use it as a controlled component, instead of
supporting both controlled and uncontrolled.

This converts the uncontrolled usages to controlled.
 2019-03-12 16:17:21 +00:00
J. Ryan Stinnett
cff3c94858 Fix indentation in PhoneNumbers.js 2019-03-12 15:39:30 +00:00
J. Ryan Stinnett
5a648ecfe4 Ensure we always set some value in Field 
Always set some value on the Field's input so that it doesn't flip flop between
controlled and uncontrolled.
 2019-03-12 14:02:54 +00:00
J. Ryan Stinnett
ea050683bd Use the right prop type for functions 2019-03-12 14:02:54 +00:00
J. Ryan Stinnett
57ce4d6e7d Call the parent component's onChange if it exists 2019-03-12 14:02:54 +00:00
J. Ryan Stinnett
7241418eba Appease the linter 
This checks `onValidate` in `render` to make the linter happy.
 2019-03-12 14:02:54 +00:00
J. Ryan Stinnett
edb7f39ec9 Validity class currently unused on tooltip 2019-03-12 14:02:54 +00:00
Matthew Hodgson
40f16fa310 adds validation for fields. 
* renames RoomTooltip to be a generic Tooltip (which it is)
 * hooks it into Field to show validation results
 * adds onValidate to Field to let Field instances call an arbitrary validation function

Rebased from @ara4n's https://github.com/matrix-org/matrix-react-sdk/pull/2550
by @jryans. Subsequent commits revise and adapt this work.
 2019-03-12 14:02:54 +00:00
J. Ryan Stinnett
0791f220fb
Merge pull request #2776 from matrix-org/erikj/fix_null_counter 
Fix simple header counters to correctly handle zero, take two
 2019-03-12 10:46:51 +00:00
Erik Johnston
1a35130869 Fix simple header counters to correctly handle zero, take two 2019-03-12 10:00:10 +00:00
Travis Ralston
7eea62a22b
Merge pull request #2764 from matrix-org/travis/fix-hover 
Fix sticky hover state by listening for hover on the document
 2019-03-11 16:35:25 -06:00
Travis Ralston
1165c51c77
Merge pull request #2772 from matrix-org/erikj/fix_null_counter 
Fix header counters to correctly handle zero
 2019-03-11 15:10:53 -06:00
J. Ryan Stinnett
c38a7e6756 Pass correct args when creating event permalink in context menu 
After the permalink API was changed in
https://github.com/matrix-org/matrix-react-sdk/pull/2671, it seems we forgot to
update this call site, so it was creating `<room>/<room>` links, instead of
`<room>/<event>`.

Fixes https://github.com/vector-im/riot-web/issues/9110
 2019-03-11 15:05:05 +00:00
Erik Johnston
03d60e6af2 Fix header counters to correctly handle zero 
Currently if you set the value to zero the counter is not displayed.
 2019-03-11 14:04:15 +00:00
Bruno Windels
99f82a3de9
Merge pull request #2766 from matrix-org/bwindels/scrolling 
Scroll investigation changes
 2019-03-11 09:57:13 +00:00
Travis Ralston
e1f9482107
Merge pull request #2757 from matrix-org/anoa/accept_all_invites 
Ability to bulk accept all invites (and fix rejecting all invites)
 2019-03-08 14:55:59 -07:00
Travis Ralston
47b6356e10
Merge pull request #2767 from matrix-org/travis/misc-status-message-fixes 
Misc fixes to StatusMessageContextMenu
 2019-03-08 08:20:28 -07:00
J. Ryan Stinnett
d93e97bcd2 Remove span to regain explicit whitespace for country options 
This change restores whitespace between the country name and prefix code in the
country dropdown.
 2019-03-08 10:03:51 +00:00
Travis Ralston
604f8f8b6b Misc fixes to StatusMessageContextMenu 
"waiting" is not a property, and unmount had a typo
 2019-03-07 14:57:30 -07:00
Travis Ralston
241309ab83 Use CSS for hovering the tile 2019-03-07 14:55:17 -07:00
Bruno Windels
96b1b723cd restore scroll position when encrypted download attachment iframe is shown 2019-03-07 17:22:43 +01:00
Bruno Windels
4e382b1dd9 rename onWidgetLoad to onHeightChanged 
as it's easy to confuse it with room widgets, but has nothing to do with it.
 2019-03-07 17:02:19 +01:00
Andrew Morgan
71261fc7a7 Add 2500 as default delay 2019-03-07 11:12:16 +00:00
Travis Ralston
5b49584d79 Fix sticky hover state by listening for hover on the document 2019-03-06 16:27:29 -07:00
Andrew Morgan
c5198418b0 Use retry_after_ms instead of hardcoded delay 2019-03-06 15:37:06 +00:00
Andrew Morgan
0f14d89257 Ability to bulk accept all invites 2019-03-06 14:06:53 +00:00
J. Ryan Stinnett
13957bb5e7 Move country dropdown inside field in Settings 
This updates the Settings phone input to match the new styling used on auth
flows.

Fixes https://github.com/vector-im/riot-web/issues/9049
 2019-03-06 11:26:05 +00:00
J. Ryan Stinnett
5120ff83be Enable show prefix for phone input in Settings 
This fixes an unrelated bug where the currently selected country's prefix number
wasn't being displayed. Since other country dropdown's show the prefix, and this
is also for phone numbers, it seems good to also show it here as well.
 2019-03-06 11:22:29 +00:00
J. Ryan Stinnett
8bf5e1d19f
Merge pull request #2749 from jryans/auth-field 
Use Field component in auth flows
 2019-03-06 11:18:24 +00:00
J. Ryan Stinnett
35ee9c9ac7 One line for prefix container 2019-03-06 10:58:54 +00:00
J. Ryan Stinnett
df9888614b Normalize whitespace in PasswordLogin 2019-03-06 10:57:38 +00:00
David Baker
c1056025ed
Merge pull request #2748 from matrix-org/dbkr/shameless_plugging 
Support linking to hosting providers
 2019-03-05 18:22:02 +00:00
J. Ryan Stinnett
bc54ea5623 Convert login type to Field component 
This converts the login type Dropdown on the login flow to also use the Field
component so that every presents a similar visual style.
 2019-03-05 17:58:42 +00:00
J. Ryan Stinnett
5a491ac053 Convert login inputs to Field component 
As with other auth flows, this converts inputs on the login page to use the
Field component for consistent styling. The login type dropdown is left as-is
for now.
 2019-03-05 17:58:42 +00:00
J. Ryan Stinnett
5b1d361577 Convert registration phone number to Field component 
Now that we have prefix support in the Field component, we can also convert the
phone number with country dropdown on registration.
 2019-03-05 17:58:42 +00:00
Travis Ralston
6eaaa8b687
Merge pull request #2728 from matrix-org/travis/encryption-warning 
Get confirmation before enabling encryption
 2019-03-05 10:15:32 -07:00
David Baker
0244990731 Add utm_campaign to the hosting links 
According to where in the app the link was clicked
 2019-03-05 16:42:22 +00:00
David Baker
b68a71b294 Lint 2019-03-05 16:20:18 +00:00
David Baker
57d8f6d8a2 Support linking to hosting providers 
From link in app config
 2019-03-05 16:12:02 +00:00
J. Ryan Stinnett
26b2aa174b Add prefix support to Fields 
This allows Fields to have an optional prefix component which is placed inside
the border of the Field and to the left of the input. Since this label animation
would be complex to get right for this case, it is instead fixed to the top left
if there is a prefix component.

This canonical example of this today would be a phone number field which
includes a country dropdown.
 2019-03-05 15:25:43 +00:00
J. Ryan Stinnett
bfe120fbf4 Convert registration to Field component 
This converts most fields in the registration form to use the Field component,
except for the phone number, which is a left as a separate task because of the
country dropdown menu.
 2019-03-05 15:25:42 +00:00
Bruno Windels
96196d8c3d
Merge pull request #2746 from matrix-org/bwindels/flairnolayout 
Prevent flair pushing timeline downwards
 2019-03-05 15:34:09 +01:00
Bruno Windels
624572daa9 show flair container when no profiles loaded to ensure same height 2019-03-05 14:50:39 +01:00
J. Ryan Stinnett
b6351f2607
Merge pull request #2740 from jryans/reorg-field-props 
Reorganise props handling in Field
 2019-03-05 11:30:06 +00:00
J. Ryan Stinnett
d4a148d56c Use oneOf to check the input element 2019-03-05 11:18:58 +00:00
Travis Ralston
879fa22416 Merge branch 'develop' into travis/encryption-warning 2019-03-04 23:14:30 -07:00
Travis Ralston
363964e423 Don't loop forever if you demote yourself via Enter on a PowerSelector 
The included comment explains what happens and why this is bad.

Fixes https://github.com/vector-im/riot-web/issues/9039
 2019-03-04 13:08:54 -07:00
J. Ryan Stinnett
7c672e608d Reorganise props handling in Field 
Several small tweaks to the props handling:

* Use destructuring instead of `delete`
* Emphasize the `element` as a primary prop
* Document `textarea` as supported
 2019-03-04 17:25:19 +00:00
David Baker
a6a3716576
Merge pull request #2739 from matrix-org/dbkr/devices_toggle_update 
Fix media device selectors not updating
 2019-03-04 14:49:50 +00:00
David Baker
c7b019830d Fix media device selectors not updating 
Missed a setState

Fixes https://github.com/vector-im/riot-web/issues/9036
 2019-03-04 14:35:41 +00:00
Michael Telatynski
080c67439b
Merge pull request #2708 from matrix-org/fix_room_dict 
Fix Room Directory custom homeserver entry not showing properly
 2019-03-04 11:44:11 +00:00
Michael Telatynski
6b0b5e4aa3
Merge pull request #2729 from matrix-org/t3chguy/missing_permalinkCreator 
Add missing permalinkCreator prop
 2019-03-04 11:15:53 +00:00
Travis Ralston
71630af201 Patch users not existing when opening settings 
Fixes https://github.com/vector-im/riot-web/issues/9022
 2019-03-02 10:59:53 -07:00
Travis Ralston
454251d17c Use a div instead of an image 
There's no source, so just make it a block element
 2019-03-01 17:21:37 -07:00
Travis Ralston
8a6ae6b48e Use a mask for the continuation icon 
Fixes https://github.com/vector-im/riot-web/issues/7990
 2019-03-01 15:59:19 -07:00
Travis Ralston
5a4676ac66
Merge pull request #2725 from matrix-org/travis/settings/pl-dropdowns 
Convert PowerSelector to use mxField instead
 2019-03-01 09:03:16 -07:00
Travis Ralston
f9d6d42781
Merge pull request #2726 from matrix-org/travis/settings/save-feedback 
Don't re-enable the save button after saving profiles
 2019-03-01 09:02:54 -07:00
Michael Telatynski
eb46e62a2e delint NetworkDropdown 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-03-01 09:39:39 +00:00
Michael Telatynski
6b07195b63 Add missing permalinkCreator prop 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-03-01 09:36:36 +00:00
Travis Ralston
7d207ca2c3 speeling 2019-02-28 20:45:31 -07:00
Travis Ralston
9402e81835 Get confirmation before enabling encryption 
Fixes https://github.com/vector-im/riot-web/issues/8843
 2019-02-28 20:39:07 -07:00
Travis Ralston
12d939b36f Support multiple email pushers and remove the legacy UserSettingsStore 
Fixes https://github.com/vector-im/riot-web/issues/5496
Fixes https://github.com/vector-im/riot-web/issues/8424
 2019-02-28 19:57:45 -07:00
Travis Ralston
b84b11d3bd Don't re-enable the save button after saving profiles 
Fixes https://github.com/vector-im/riot-web/issues/8569
 2019-02-28 19:13:28 -07:00
Travis Ralston
a41df7ab68 Convert PowerSelector to use mxField instead 2019-02-28 19:00:57 -07:00
Travis Ralston
b5ffd4a538 Stop listening to account data when the stickerpicker is unmounted 
Fixes https://github.com/vector-im/riot-web/issues/8994
 2019-02-28 14:15:01 -07:00
Jason Robinson
a74cb001b4 Remove unnecessary ref from Stickerpicker 
There is a ref=target in the call to render AccessibleButton for
the hide stickers button. This ref is not present in the show case.

When clicking the stickerpicker show button, React gives a warning:

> Warning: Stateless function components cannot be given refs
> (See ref "target" in AccessibleButton created by Stickerpicker).
> Attempts to access this ref will fail.

Removed the ref. Stickerpicker hide/show still works fine, no warning.

Signed-off-by: Jason Robinson <jasonr@matrix.org>
 2019-02-28 15:51:36 +02:00
Travis Ralston
93043c8cc0
Merge pull request #2709 from matrix-org/t3chguy/badge_51 
Show nearest lower badge, e.g show Mod for 51... etc
 2019-02-27 18:30:57 -07:00
Michael Telatynski
9dede7ab65
Merge pull request #2710 from matrix-org/t3chguy/composer_demote 
move canSendMessages into state so that it will re-render the composer
 2019-02-27 15:40:00 +00:00
J. Ryan Stinnett
209ac2c587
Merge pull request #2706 from jryans/move-non-feather-icons 
Move non-feather icons out of feather dir
 2019-02-27 13:08:23 +00:00
David Baker
6cdb318cd0
Merge pull request #2713 from matrix-org/dbkr/fix_logout_dialog_backup 
Fix backup button in logout dialog
 2019-02-27 12:45:52 +00:00
David Baker
98402e7eae Fix backup button in logout dialog 
We set the caption appropriately but forgot to actually do the
right thing depending on whether there was a key backup already.

Also fix the loadihng spinner which was never shown.

Fixes https://github.com/vector-im/riot-web/issues/8369
 2019-02-27 11:45:00 +00:00
J. Ryan Stinnett
4b340450b9 Rename Feather icon directory to feather-customised 
These icons are based on Feather as the original source, but they have various
tweaks applied, such as stroke width, color, etc. Hopefully the tweaked name
makes this more obvious in the future.
 2019-02-27 10:42:10 +00:00
Michael Telatynski
f16011394e Merge branches 'develop' and 't3chguy/composer_demote' of github.com:matrix-org/matrix-react-sdk into t3chguy/composer_demote 
# Conflicts:
#	src/components/views/rooms/MessageComposer.js
 2019-02-27 00:28:16 +00:00
Michael Telatynski
7dfbf3feb2 move canSendMessages into state so that it will re-render the composer 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-27 00:23:37 +00:00
Michael Telatynski
93323421de Show nearest lower badge, e.g show Mod for 51... etc 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-26 23:59:40 +00:00
Michael Telatynski
fbe4d52b48 Fix Room Directory custom homeserver entry not showing propely 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-26 23:25:31 +00:00
J. Ryan Stinnett
1a89a4e87d Move logos out of feather dir 
These clearly aren't from the Feather set.
 2019-02-26 20:41:33 +00:00
J. Ryan Stinnett
426bdafe22
Merge pull request #2672 from jryans/password-validation 
Report validity state of all registration fields on any change
 2019-02-26 18:20:38 +00:00
Bruno Windels
68ba14909b
Merge pull request #2671 from matrix-org/bwindels/permalinkperf 
Improve permalink performance
 2019-02-26 10:48:20 +01:00
Bruno Windels
4d95af705d fix lint 2019-02-26 10:26:33 +01:00
Travis Ralston
18b27a72d8
Merge pull request #2692 from matrix-org/t3chguy/room_context_menu_settings 
Settings button in Room Context Menu
 2019-02-25 20:28:38 -07:00
Michael Telatynski
7029695224 make it i18n friendly 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-25 23:26:24 +00:00
Michael Telatynski
8d149575ea Merge branches 'develop' and 't3chguy/room_context_menu_settings' of github.com:matrix-org/matrix-react-sdk into t3chguy/room_context_menu_settings 2019-02-25 23:12:06 +00:00
Michael Telatynski
d4b6ce6932 Apply PR feedback, don't change room to go to its settings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-25 23:08:51 +00:00
Michael Telatynski
dd9077f1e4 Merge branches 'develop' and 't3chguy/pretty_Devtools' of github.com:matrix-org/matrix-react-sdk into t3chguy/pretty_Devtools 2019-02-25 22:39:37 +00:00
Michael Telatynski
56d58f8600 make better use of space 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-25 22:38:33 +00:00
Michael Telatynski
5bdd61111d Fix textareas 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-25 22:12:06 +00:00
Travis Ralston
1aef157d2a Fix variable reference 2019-02-25 11:52:45 -07:00
Travis Ralston
24099de2a4 Merge branch 'develop' into travis/settings-cleanup-1 2019-02-25 10:56:43 -07:00
Travis Ralston
e0a5eeca75
Merge pull request #2686 from matrix-org/travis/old-room-sorting 
Support the old room sorting algorithm and SettingsStore watchers
 2019-02-25 10:51:10 -07:00
Bruno Windels
77f979ed6d also pass permalinkCreator here 2019-02-25 18:43:08 +01:00
Bruno Windels
b8c6bed906 adjust permalink code for tombstone message 2019-02-25 18:43:08 +01:00
Bruno Windels
fb672ffb28 change handling of event permalinks in replies 2019-02-25 18:43:08 +01:00
Bruno Windels
31dda34e6b use new permalink class in share dialog & context menu 2019-02-25 18:43:08 +01:00
Bruno Windels
f7ea9cfeb2 rename all instances of permalinkCreator 2019-02-25 18:43:08 +01:00
Bruno Windels
f97ea37717 permalink is one word 2019-02-25 18:43:08 +01:00