PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
21269 commits 1 branch 0 tags 338 MiB
Commit graph

1027 commits

Author SHA1 Message Date
Travis Ralston
e7928e8def Use flex-start instead of start for postcss 
This is just something the loaders complain about - apparently `start` is old and we should feel bad.
 2019-12-22 20:56:19 -07:00
Michael Telatynski
b2249d0561 Initial rejig 2019-12-19 20:09:05 +00:00
Michael Telatynski
6c1944359e Add RoomTile online indicator to DMs 2019-12-19 14:29:46 +00:00
Michael Telatynski
66783dff9e Fix scaling of the avatar in UserInfo 2019-12-19 12:27:25 +00:00
Michael Telatynski
3196655524 Replace UserInfo avatar with <MemberAvatar/> for fallback logic 2019-12-19 10:42:47 +00:00
Michael Telatynski
7b4ad61bea post-merge fix 2019-12-16 16:23:35 +00:00
Michael Telatynski
6f5ac780fa Use new image.svg placeholder for AvatarSetting in Rooms 2019-12-16 16:19:43 +00:00
Michael Telatynski
5ab98e9899 open ImageView when clicking on a set avatar 2019-12-16 15:21:05 +00:00
Michael Telatynski
9fa2680dc6 Implement new design for uploading/removing avatars 2019-12-16 14:58:12 +00:00
David Baker
be914c7b0c
Merge pull request #3728 from matrix-org/jryans/verify-users 
Verify users when cross-signing enabled
 2019-12-16 10:12:46 +00:00
J. Ryan Stinnett
2df72bfde2 Update room / user decoration for cross-signing 2019-12-13 17:57:26 +00:00
Michael Telatynski
17a42cd287 Make LInkPreviewWidget close button Keyboard & SR Accessible 2019-12-13 14:02:50 +00:00
J. Ryan Stinnett
fae819dfe5 Merge remote-tracking branch 'origin/develop' into jryans/4s-new-key-backup 2019-12-11 10:05:20 +00:00
Michael Telatynski
f079c2fdd2
Merge pull request #3709 from matrix-org/t3chguy/what-input 
Add what-input to allow different scoping to focus-visible for MAB a11y
 2019-12-09 13:45:59 +00:00
Half-Shot
626ab17ed3 Styling 2019-12-09 13:22:45 +00:00
Michael Telatynski
4be8b87869 Add what-input to allow different scoping to focus-visible for MessageActionBar keyboard a11y 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-07 13:07:52 +00:00
Michael Telatynski
86e52d1ef3 Mark the This/All Rooms scope buttons as radios for a11y 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-07 12:45:28 +00:00
J. Ryan Stinnett
9f1c2cd3e1 Add dialogs for creating and accessing secret storage 
This adds dialogs for creating and accessing secret storage via a passphrase or
recovery key. These flows are adapted from the ones used for key backup.
 2019-12-05 15:34:07 +00:00
J. Ryan Stinnett
2a8853dd82 Remove duplicate dialog CSS 2019-12-04 17:24:49 +00:00
Michael Telatynski
be6da03348
Merge pull request #3611 from matrix-org/t3chguy/context_menus 
ARIA compliant context menus
 2019-12-04 17:17:47 +00:00
David Baker
bc52db5423
Merge pull request #3697 from matrix-org/travis/e2e-icons 
Match e2e icons on events to expectations
 2019-12-04 10:33:47 +00:00
Travis Ralston
33044d713e Match e2e icons on events to expectations 
Fixes https://github.com/vector-im/riot-web/issues/11547

Steps taken:
* Convert `E2ePadlock` to a class-style component so the hover state can be tracked (tooltips).
* Convert the image mask to a background image to keep the `!` in the shield.
* Update copy.
 2019-12-03 22:41:22 -07:00
Travis Ralston
e47752ff8d Match room upgrade warning to the new design 
See https://github.com/matrix-org/matrix-react-sdk/pull/3684#issuecomment-560514872
 2019-12-02 17:21:53 -07:00
J. Ryan Stinnett
c6e56d98b3 Merge remote-tracking branch 'origin/develop' into jryans/4s-new-key-backup 2019-11-29 11:31:23 +00:00
J. Ryan Stinnett
c103fe4273 Add cross-signing diagnostic panel 
This is not part of any designs, so it may be short-lived, but it's quite handy
for diagnosing issues with cross-signing at least while the feature is in
development.
 2019-11-29 11:29:08 +00:00
Michael Telatynski
6d69ec17d9 Merge branches 'develop' and 't3chguy/context_menus' of github.com:matrix-org/matrix-react-sdk into t3chguy/context_menus 
 Conflicts:
	src/components/views/context_menus/RoomTileContextMenu.js
 2019-11-28 16:25:59 +00:00
Travis Ralston
f020929345 Add an option to invite users to upgraded private rooms 
The option doesn't show up on public room upgrades.
 2019-11-27 20:29:11 -07:00
Bruno Windels
4a684d01a4
Merge pull request #3661 from matrix-org/bwindels/verif-toasts 
Show incoming verification requests in in-app notifications
 2019-11-22 16:39:18 +00:00
Bruno Windels
309633181d use FormButton in verification request tile too and dedupe styles 2019-11-22 16:32:50 +01:00
Bruno Windels
66cc68bae4 add new-styled button 
might merge it later on with accessible button
 2019-11-22 16:04:51 +01:00
Matthew Hodgson
e77cf2b87e
Merge pull request #3653 from matrix-org/bwindels/fixe2eicons 
Fix e2e icons
 2019-11-21 19:01:17 +00:00
Travis Ralston
72f0401589 Merge branch 'develop' into jryans/4s-new-key-backup 2019-11-21 10:22:13 -07:00
Bruno Windels
f75e45a715 reduce margin on e2e icon in room header 2019-11-21 18:17:55 +01:00
Bruno Windels
854f27df3f remove obsolete style from message composer for e2e icon as it's now the default size for the e2e iconn 2019-11-21 18:16:10 +01:00
Bruno Windels
cb0e6ca5d2 dont make e2e icons themable, as they have multiple colors 2019-11-21 18:13:01 +01:00
Travis Ralston
6597e0bd42
Merge pull request #3646 from matrix-org/travis/integration-manager-opt 
Add an option to disable the use of integration managers for provisioning
 2019-11-21 08:10:56 -07:00
Travis Ralston
81c9bdd9f3 It's called an "Integration Manager" (singular) 
Fixes https://github.com/vector-im/riot-web/issues/11256

This was finally annoying me enough to fix it.
 2019-11-20 20:14:25 -07:00
Travis Ralston
3391cc0d90 Add the toggle switch for provisioning 2019-11-20 20:05:32 -07:00
Travis Ralston
b0eb54541c Rip out options to change your integration manager 
We are not supporting this due to the complexity involved in switching integration managers. We still support custom ones under the hood, just not to the common user. A later sprint on integrations will consider re-adding the option alongside fixing the various bugs out there.
 2019-11-20 19:50:13 -07:00
Travis Ralston
66c51704cc Fix indentation 2019-11-20 19:21:10 -07:00
Travis Ralston
fd12eb28e7 Move many widget options to a context menu 
Part of https://github.com/vector-im/riot-web/issues/11262
 2019-11-20 19:17:42 -07:00
Travis Ralston
f6394b1251 Remove stray colour correction on composer e2e icon 
We want it to match the room header
 2019-11-20 11:03:53 -07:00
Travis Ralston
93e4de9861 Fix positioning and sizing of e2e icon in the composer 
This also removes the special case class for the composer because the input is now aligned regardless of icon.
 2019-11-20 11:00:39 -07:00
J. Ryan Stinnett
9dea848927 Use div around buttons to fix React warning 2019-11-19 16:28:49 +00:00
Bruno Windels
f9b5678b06
Merge pull request #3631 from matrix-org/bwindels/userinfo-css-fixes 
Fix some styling regressions in member panel
 2019-11-19 13:24:06 +00:00
Bruno Windels
5f7b0fef33 scale (new) icons to fit available size 
fixes https://github.com/vector-im/riot-web/issues/11399
 2019-11-19 12:55:28 +01:00
Bruno Windels
39939de04f remove white background on ! and ✅ so it looks better on dark theme 2019-11-19 12:51:46 +01:00
Bruno Windels
de15965c4a improve device list layout 2019-11-19 12:51:37 +01:00
Bruno Windels
92292003c8 make shield on verification request scale correctly 
by not overriding `mask-size` using `mask` for `mask-image`
 2019-11-19 12:51:02 +01:00
Travis Ralston
6b726a8e13 Implement the bulk of the new widget permission prompt design 
Part 1 of https://github.com/vector-im/riot-web/issues/11262

This is all the visual changes - the actual wiring of the UI to the right places is for another PR (though this PR still works independently).

The help icon is known to be weird here - it's a bug in the svg we have. The tooltip also goes right instead of up because making the tooltip go up is not easy work for this PR - maybe a future one if we *really* want it to go up.
 2019-11-15 14:26:16 -07:00
Bruno Windels
0f39a9f72d fix pr feedback 2019-11-15 17:29:38 +01:00
Bruno Windels
d416ba2c0c add verify button while we don't have the verification in right panel 2019-11-15 16:14:18 +01:00
Bruno Windels
ecc842629a fix css lint errors 2019-11-15 16:14:18 +01:00
Bruno Windels
edd5d3c915 make custom power level not grow too wide 2019-11-15 16:14:18 +01:00
Bruno Windels
1162d1ee43 Fix user info scroll container growing larger than available height 
making whole room view grow taller than viewport
 2019-11-15 16:14:18 +01:00
Bruno Windels
48b1207c6e split up PowerLevelEditor into two components 
one while editing (PowerLevelEditor) and one
while not editing (PowerLevelSection).

Also save when pressing the button, not when changing the
power dropdown.

Also show the spinner next to the dropdown when saving,
not at the bottom of the component.
 2019-11-15 16:14:18 +01:00
Bruno Windels
6db162a3a7 add PL edit mode, don't show selector by default 
still saves when changing the selector though
 2019-11-15 16:14:18 +01:00
Bruno Windels
b278531f2f add IconButton as in design 2019-11-15 16:14:18 +01:00
Bruno Windels
942a1c9a56 fix e2e icon in composer having wrong colors 2019-11-15 16:14:18 +01:00
Bruno Windels
e3f7fe51dc use normal shield for verification requests 2019-11-15 16:14:18 +01:00
Bruno Windels
fe059e524f don't need this, as it takes height from the constrained width 2019-11-15 16:14:18 +01:00
Bruno Windels
030827f77d mark destructive actions in red 2019-11-15 16:14:18 +01:00
Bruno Windels
0bd1e7112d style security section as per design 2019-11-15 16:14:18 +01:00
Bruno Windels
73b6575082 fixup: verified shield should be green 2019-11-15 16:14:18 +01:00
Bruno Windels
0a2255ce73 fixup: bring back margin above display name 2019-11-15 16:14:18 +01:00
Bruno Windels
3e356756aa style profile info 2019-11-15 16:14:18 +01:00
Bruno Windels
f4988392f9 restyle e2e icons 2019-11-15 16:14:18 +01:00
Bruno Windels
af4ad488bd Restyle Avatar 
Make it a circle with the profile picture centered,
with a max height/width of 30vh
 2019-11-15 16:14:18 +01:00
Travis Ralston
6d0b388fa2
Merge branch 'develop' into travis/mjolnir 2019-11-12 10:00:01 -07:00
Michael Telatynski
1c4d89f2d7 Migrate all standard Context Menus over to new custom framework 2019-11-11 17:53:17 +00:00
J. Ryan Stinnett
cc9ef57f0e
Merge pull request #3609 from matrix-org/jryans/rounded-style-bar 
Fix draw order when hovering composer format buttons
 2019-11-11 17:40:58 +02:00
J. Ryan Stinnett
ef05294133 Fix draw order when hovering composer format buttons 
This ensures all 4 sides of a button show the hover border colour as intended.

Another part of https://github.com/vector-im/riot-web/issues/11203
 2019-11-11 10:24:40 +00:00
J. Ryan Stinnett
719709250b
Merge pull request #3605 from matrix-org/jryans/rounded-style-bar 
Fix rounded corners for the formatting toolbar
 2019-11-08 20:01:31 +02:00
J. Ryan Stinnett
e161e99b63 Fix rounded corners for the formatting toolbar 
The formatting toolbar is meant to have rounded corners like the message action
bar.

Fixes https://github.com/vector-im/riot-web/issues/11203
 2019-11-08 17:46:08 +00:00
J. Ryan Stinnett
2a5dc9bfac Remove lint comments about no-descending-specificity 
We have disabled the `no-descending-specificity` stylelint rule, so we no longer
need these block comments.
 2019-11-08 16:35:42 +00:00
David Baker
3070ee6d7b Put back the grouped rule & disable the linting rule instead 2019-11-08 16:10:51 +00:00
David Baker
4283f9ec74 Split CSS rule to fix descending specificity lint error 2019-11-08 16:01:53 +00:00
Bruno Windels
2516d8ee61 fix repeated css class 2019-11-07 20:11:31 +01:00
Bruno Windels
0d2f9c4215 add verification request tile + styling 2019-11-07 19:54:56 +01:00
David Baker
328fc5a02d fix style lint 2019-11-06 10:41:10 +00:00
Michael Telatynski
888da3ad84 delint stylesheet 2019-11-05 12:01:30 +00:00
Michael Telatynski
99c8a909b3 Fix focus-within on EventTile and more showing onClick 2019-11-04 16:47:20 +00:00
Michael Telatynski
92ee50fb77
Merge pull request #3587 from matrix-org/t3chguy/a11y_message_actions_bar 
Improve A11Y of timeline. Show timestamp & Actions on focus-within
 2019-11-04 10:33:16 +00:00
Michael Telatynski
10a63ada48 Fix SVG mask-image usage in a bunch of places for correct outlining 2019-11-01 14:46:30 +00:00
Michael Telatynski
fd4cdd0dec Improve A11Y of timeline. Show TS & Actions on focus-within 2019-11-01 10:50:58 +00:00
Travis Ralston
3c45a39caa Appease the other linter 2019-10-31 16:30:51 -06:00
Travis Ralston
11068d189c Hide messages blocked by ban lists 2019-10-31 16:19:42 -06:00
Travis Ralston
39b657ce7c Add basic structure for (un)subscribing from lists 2019-10-31 15:54:22 -06:00
Travis Ralston
b93508728a Add personal list management to Mjolnir section 2019-10-31 14:24:51 -06:00
Travis Ralston
23383419e8 Add settings base for Mjolnir rules 2019-10-31 13:20:18 -06:00
J. Ryan Stinnett
e661e3b115 Fix quick reactions to be aligned with other emoji 
This uses center alignment for quick reactions as well, so that they line up
with the larger emoji categories above.
 2019-10-28 13:17:59 +00:00
Michael Telatynski
2e6899be93 Improve Accessibility of the new Emoji picker 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-23 18:39:39 +01:00
Michael Telatynski
190fccea15 delint scss 2019-10-22 16:35:36 +01:00
Michael Telatynski
e7f292794c
Merge pull request #3556 from matrix-org/t3chguy/a11y4 
Use Navigation Treeview pattern for RoomList Accessibility
 2019-10-22 13:42:08 +01:00
Michael Telatynski
c5d5cd72bc
Merge pull request #3465 from matrix-org/t3chguy/nvl/userinfo 
UserInfo consolidation of GroupMemberInfo and MemberInfo panels
 2019-10-21 15:50:08 +01:00
Tulir Asokan
438ad54701 Remove space between emojis in picker 
Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2019-10-20 12:31:28 +03:00
Tulir Asokan
be829980f6 Split inline SVGs to their own files 
Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2019-10-20 12:13:32 +03:00
Michael Telatynski
3400808f6e Use navigation treeview aria pattern for roomlist sublists and tiles 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-17 15:53:39 +01:00
Tulir Asokan
6ce2e3d796 Make selected emojis more transparent 
Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2019-10-15 19:10:10 +03:00
Tulir Asokan
318754d31c Reorganize reaction sending and show if emoji is selected 
Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2019-10-15 19:07:04 +03:00
Tulir Asokan
a6e0986bf8 Improve style 
Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2019-10-14 20:38:09 +03:00
Tulir Asokan
e16d0bfa4d Underline visible sections in header 
Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2019-10-14 20:14:44 +03:00
Tulir Asokan
088c9bff9e Add recently used section and scroll to category 
Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2019-10-14 19:41:10 +03:00
Tulir Asokan
497b779334 Add full emoji picker for reactions 
Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2019-10-14 00:32:11 +03:00
Michael Telatynski
6e33cc0650
Merge pull request #3433 from matrix-org/t3chguy/nvl/react16/EventListSummary 
Summarise state events after room creation
 2019-10-11 09:53:26 +01:00
Michael Telatynski
5643743167 Don't intercept TAB on the app outside of the composer, fix tabIndex > 0 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-10 14:13:29 +01:00
Michael Telatynski
34530843f4 Factor out generic EventListSummary from MELS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-09 12:50:03 +02:00
Michael Telatynski
df02eb8e92 Add UserInfo panel (consolidation of MemberInfo & GroupMemberInfo) Labs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-07 16:52:50 +01:00
Travis Ralston
c547367b62
Merge pull request #3513 from matrix-org/travis/mask-eye 
Use a mask instead of an img for "Show image" eye
 2019-10-07 12:45:22 +01:00
David Baker
ae7ecf7f8f
Merge pull request #3512 from matrix-org/jryans/error-boundary 
Add error boundaries to catch rendering errors
 2019-10-03 10:49:03 +01:00
Travis Ralston
0491b742c2 Use a mask instead of an img for "Show image" eye 
See https://github.com/matrix-org/matrix-react-sdk/pull/3492#pullrequestreview-296223646
 2019-10-02 12:52:07 -06:00
Travis Ralston
b94c94db04
Merge pull request #3492 from matrix-org/travis/hide-images 
Add an option to hide image previews
 2019-10-02 12:46:45 -06:00
J. Ryan Stinnett
0e8dc24c3f Add a basic error boundary for the entire app 
This adds a basic error boundary around the entire app to catch errors during
rendering and present the user with the options on how to proceed. This is not
implemented as a modal so that it could be used selectively in portions of the
app as well, such as just the `RoomView`.

Fixes https://github.com/vector-im/riot-web/issues/11009
 2019-10-02 17:31:22 +01:00
Bruno Windels
4bd72b1494 dont let placeholder show scrollbar when composer is narrow 2019-10-02 11:36:56 +02:00
Bruno Windels
c8c4dc29d1
Merge pull request #3503 from matrix-org/bwindels/custom-themes-mvp 
Custom theming MVP
 2019-10-02 09:14:07 +00:00
Bruno Windels
fbc3f68fd2 remove old style 2019-10-02 11:06:31 +02:00
Travis Ralston
4b0596b6b7 Apply lipstick to hidden image design 2019-10-01 17:00:01 -06:00
Travis Ralston
3c589cffec Merge branch 'develop' into travis/hide-images 2019-10-01 09:31:54 -06:00
Bruno Windels
15b7a5af31 fix contrast issue 
when badges with and without highlighted state have a very
different brightness (as they might do in dark mode), hardcoding
the fg color of a badge independent of it's highlighted state
to $accent-fg-color doesn't work well, so add an extra SASS
variable we can reassign to something more specific in the custom theme
 2019-10-01 16:58:14 +02:00
Travis Ralston
59b29e4a7f Add an option to hide image previews 
Applies to images, stickers, and URL previews.

Fixes https://github.com/vector-im/riot-web/issues/10735
 2019-09-27 21:08:31 -06:00
J. Ryan Stinnett
d80a2df979 Move document name to new column 2019-09-27 17:57:10 +01:00
Michael Telatynski
192dcbb31f delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-27 09:14:29 +01:00
Michael Telatynski
8d1d3090f3 Improve keyboard accessibility using :focus-visible CSS polyfill 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-27 09:00:54 +01:00
Bruno Windels
cca41c184c very basic color pickers for custom theme 2019-09-26 17:35:06 +02:00
Bruno Windels
151af65e4f hide details summary arrow in create room dialog on webkit too 2019-09-23 18:05:44 +02:00
Bruno Windels
0ab7962ebd add z-index to format bar so it appears above status area and reply wrapper 2019-09-23 14:06:59 +02:00
Bruno Windels
3c7a0f4c49 remove invalid css 2019-09-23 11:22:30 +02:00
Bruno Windels
6a3723c69e dialog styling 2019-09-23 11:22:30 +02:00
Bruno Windels
8a1c1bbec4 implement RoomAliasField component 
adding a postfix to Field to show the domain name
 2019-09-23 11:22:30 +02:00
Bruno Windels
e6554bdaad
Merge pull request #3429 from matrix-org/bwindels/breadcrumbs-empty 
Breadcrumbs: show placeholder for empty slot
 2019-09-12 12:56:58 +00:00
Bruno Windels
df8ce7fb33 Show placeholder for empty slot in breadcrumbs 2019-09-12 14:46:54 +02:00
Bruno Windels
cc67742fa9 undo whitespace setting, accessible button is used in too many places to make this a safe assumption 2019-09-12 12:24:05 +02:00
Bruno Windels
6f62cdb22c basic styling to make it look ok before applying new design 2019-09-11 15:45:51 +02:00
Bruno Windels
80dd5a1b0a add explore button next to filter field 2019-09-10 10:55:55 +02:00
Bruno Windels
06143ba7a1 show keyboard shortcuts in format button tooltip 2019-09-06 10:59:41 +02:00
Bruno Windels
042822c90a copyright is solely assigned to matrix foundation now, copy paste error 2019-09-06 10:39:19 +02:00
Bruno Windels
b4b9c7d072 Add tooltip for format buttons 2019-09-06 10:39:19 +02:00
Bruno Windels
da29057fd8 move format bar to own component 2019-09-06 10:39:19 +02:00
Bruno Windels
e3d70f3999 ensure selection is not lost upon clicking format bar in chrome 2019-09-05 11:01:44 +02:00
Bruno Windels
af535986d2 fix css lint 2019-09-04 16:40:34 +02:00
Bruno Windels
e7db660820 fixup: css, we have 5 buttons 2019-09-04 16:39:07 +02:00
Bruno Windels
65ddfc0a50 show format bar when text is selected 2019-09-04 16:35:03 +02:00
Bruno Windels
1063da0ed1
Revert "New composer: show markdown legend on focus" 2019-09-03 08:27:45 +00:00
Bruno Windels
422f482a6d
Merge pull request #3378 from matrix-org/bwindels/cider-md-legend 
New composer: show markdown legend on focus
 2019-09-02 14:59:44 +00:00
Bruno Windels
b7768f34f2 Add legend and style it 2019-09-02 16:15:18 +02:00
J. Ryan Stinnett
3feeaceb68 Restrict green link colours to address picker dialog 
This changes to a more targeted selection of what becomes green (just the
actionable links in address picker).

Fixes https://github.com/vector-im/riot-web/issues/10703
 2019-09-02 10:33:19 +01:00
J. Ryan Stinnett
27fdef557d
Merge pull request #3359 from matrix-org/jryans/features-without-is 
Allow connecting to an IS from address picker
 2019-08-30 10:19:28 +01:00
J. Ryan Stinnett
166fb696c2 Allow connecting to an IS from address picker 
This allows those who previously disconnected from an IS to either choose the
default IS or a custom one from Settings via the address picker dialog.

Part of https://github.com/vector-im/riot-web/issues/10619
 2019-08-29 15:28:34 +01:00
Sorunome
fe9ae46ffb
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into soru/spoilers 2019-08-28 20:23:24 +02:00
J. Ryan Stinnett
599fccd9ce
Merge pull request #3343 from matrix-org/jryans/hide-is-field-during-auth 
Reveal custom IS field only when required
 2019-08-28 18:36:02 +01:00