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

8513 commits

Author SHA1 Message Date
Michael Telatynski
a03e9e7a4f tidy ToggleSwitch 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-08 12:18:44 +01:00
Michael Telatynski
a782baf510 React error/warning cleanup 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-08 12:10:37 +01:00
Michael Telatynski
37b122aa16 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-08 10:50:37 +01:00
Bruno Windels
1ab19be46c also show dialog here 
unsure why this code seems duplicated?
 2019-10-08 08:54:23 +02:00
Bruno Windels
040bc5e157 show dialog when server says e-mail hasn't been verified yet 
as it's confusing to have nothing happen at all when clicking
continue straight away.
 2019-10-08 08:54:21 +02:00
Bruno Windels
80ec77a144 dont rely on timeline linkage to find events to redact 2019-10-08 08:46:13 +02:00
David Baker
c97d1d5b05
Merge pull request #3527 from matrix-org/dbkr/label_submit_button 
Label submit button in UI auth password prompt
 2019-10-07 17:48:51 +01: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
David Baker
1dec534493 Label submit button in UI auth password prompt 
Fixes https://github.com/vector-im/riot-web/issues/10739
 2019-10-07 13:13:30 +01:00
Travis Ralston
9200c55ce0
Merge pull request #3526 from matrix-org/travis/recaptcha-fix 
Null-guard the recaptcha setup
 2019-10-07 13:05:52 +01:00
Travis Ralston
495513028c Appease the linter 2019-10-07 12:46:14 +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
Travis Ralston
e841bd5442
Update src/components/views/auth/InteractiveAuthEntryComponents.js 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-10-07 12:43:07 +01:00
Travis Ralston
082ebe636e Null-guard the recaptcha setup 
Fixes https://github.com/vector-im/riot-web/issues/11069
 2019-10-07 12:36:20 +01:00
Michael Telatynski
1ec0bb284a Limit Backspace-consuming workaround to just Slate, tidy Keyboard :) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-04 11:47:33 +01:00
Michael Telatynski
fba646d2c5
Merge pull request #3519 from matrix-org/travis/enable-cider 
Enable CIDER composer by default
 2019-10-04 10:50:28 +01:00
Michael Telatynski
06c612ba3d
Merge pull request #3516 from matrix-org/t3chguy/clean_out_useless_errors 
Cull some easily fixable errors which make the console a mess
 2019-10-04 10:20:34 +01:00
Michael Telatynski
e200193b0a DRY and fix useCiderComposer being in both labs and preferences 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-04 10:15:00 +01:00
Travis Ralston
853c522467 Enable CIDER composer by default 
Also convert the setting to a watched setting to apply in realtime.
 2019-10-03 23:20:40 -06:00
Michael Telatynski
47c41759f7
Merge pull request #3518 from matrix-org/t3chguy/attempt_NPE_fix 
Handle null from TimelinePanel.getScrollState in RoomView _getScrollState
 2019-10-04 00:25:14 +01:00
Michael Telatynski
0f2eee1b1b
Merge pull request #3517 from matrix-org/t3chguy/fix_community_panel_preference 
Fix Community Panel preference not taking effect until some refreshing
 2019-10-04 00:24:57 +01:00
Michael Telatynski
9e9c56d327 rename settings watcher refs in LeftPanel 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-03 23:21:32 +01:00
Michael Telatynski
9e8234c98f Handle null from TimelinePanel.getScrollState in RoomView _getScrollState 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-03 23:00:08 +01:00
Michael Telatynski
d5f6d781bb Fix Community Panel preference not taking effect until some refreshing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-03 22:13:10 +01:00
Michael Telatynski
a0de7d5f14 Cull some easily fixable errors which make the console a mess 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-03 21:47:19 +01:00
Michael Telatynski
a9b4abaf78 Fix backspace without slate focus killing everything 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-03 21:16:18 +01:00
Michael Telatynski
8ef61ce43e
Merge pull request #3514 from matrix-org/t3chguy/accessibility3 
Various ARIA a11y fixes.
 2019-10-03 11:09:01 +01:00
David Baker
8e96bad0ce
Merge pull request #3511 from matrix-org/travis/ccar-debug 
Add a bit of debugging for where MatrixClient stops
 2019-10-03 11:05:03 +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
Michael Telatynski
f1db0cf027 Various ARIA a11y fixes. 
Notate RightPanel tabs.
Shorten Screen Reader queues.
Make AccessibleTooltipButton screen reader friendly
Flatten DOM for Sticker button using React Fragments

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-03 09:35:39 +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
Travis Ralston
37d16db0f0 Elsify 2019-10-02 12:46:21 -06:00
J. Ryan Stinnett
b605c0048d Add an error boundary around the RoomView 
This adds a more specific boundary around the `RoomView` for room-specific
errors and is an example how we could use add boundaries around just a portion
of the app.
 2019-10-02 17:31:22 +01: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
Travis Ralston
4136e0722d Add a bit of debugging for clear cache & reload button 2019-10-02 09:34:30 -06:00
Bruno Windels
cdd1ad1e2f submit form when pressing enter 2019-10-02 16:26:52 +02:00
Bruno Windels
44e68f16ba use a way of unmounting the tooltip that seems to work 100% of the time 
¯\_(ツ)_/¯
 2019-10-02 14:32:08 +02:00
Bruno Windels
55c1c5e582 tell tooltip when format bar gets hidden, as it won't be unmounted 2019-10-02 14:31:42 +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
Travis Ralston
a719623bb9 Appease the linter 2019-10-01 17:06:55 -06:00
Travis Ralston
4b0596b6b7 Apply lipstick to hidden image design 2019-10-01 17:00:01 -06:00
Travis Ralston
daef5f7574 Move setting to real settings 2019-10-01 09:32:42 -06:00
Travis Ralston
3c589cffec Merge branch 'develop' into travis/hide-images 2019-10-01 09:31:54 -06:00
Travis Ralston
7d1a04cb12
Merge pull request #3500 from matrix-org/travis/permalinks 
Support local permalinks for unfederated instances
 2019-10-01 08:41:23 -06:00
Bruno Windels
558f8daeeb support custom themes from setting 
also move theme setting code from MatrixChat to own file.
 2019-10-01 15:21:22 +02:00
Bruno Windels
79d4434c9f remove custom color pickers 2019-10-01 15:20:11 +02:00
Michael Telatynski
891eb7af3f
Merge pull request #3499 from matrix-org/t3chguy/accessibility2 
Accessibility fixes to the LeftPanel
 2019-10-01 12:21:45 +01:00
Michael Telatynski
2d6461d376
Merge pull request #3497 from matrix-org/t3chguy/autocomplete_a11y 
Make Autocomplete more accessible to screen reader users
 2019-10-01 12:07:39 +01:00
David Baker
d369e1ff5c
Merge pull request #3496 from matrix-org/bwindels/fix-ac-bis 
Fix: even more resilience to detect slash commands
 2019-10-01 11:52:36 +01:00
David Baker
a75fd1801c
Merge pull request #3486 from matrix-org/t3chguy/fixes 
Fix PropTypes usage, sdk import path and GroupMemberTile letter-avatar
 2019-10-01 11:49:32 +01:00
Travis Ralston
fc66e69c02 Rename RoomPermalinkCreator -> Permalinks due to scope 
The file handles more than just a RoomPermalinkCreator, so we should name it accordingly.
 2019-09-30 20:39:58 -06:00
Travis Ralston
6f5ccd4c12 Minor comment updates 2019-09-30 20:38:03 -06:00
Travis Ralston
2824f468d9 Update pill processing to handle better permalinks 2019-09-30 20:27:51 -06:00
Travis Ralston
f879185aef Move permalink host check into permalink constructors 
Without the requirement for a room to work
 2019-09-30 12:53:45 -06:00
Travis Ralston
f9d5e89017 Move early parts of matrix.to bits into its own class 2019-09-30 12:37:13 -06:00
Travis Ralston
64aa6695f5 Move matrix-to.js to utils/permalinks/RoomPermalinkCreator 
Just a little bit of refactoring to make the feature of custom prefixes a bit easier.
 2019-09-30 12:16:46 -06:00
J. Ryan Stinnett
8b622dbd53 Only show service summary once 2019-09-30 17:37:30 +01:00
Michael Telatynski
2621ad1b43 Group room tiles in room sub list in the room list for ARIA 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-30 16:04:43 +01:00
Michael Telatynski
22fb925743 Stop using deprecated KeyboardEvent properties 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-30 16:04:06 +01:00
Bruno Windels
8dc94af1ba use native color picker instead of library 2019-09-30 16:54:32 +02:00
Michael Telatynski
f160a308b4 Make Autocomplete more accessible to screen reader users 
Use ARIA to:
 + notate that the composer has an autocomplete
 + notate the open/closed state of the autocomplete
 + notate the name of the open autocomplete options
 + notate the ID of the highlighted autocomplete option
 + improve naming of emoji autocomplete options for screen readers

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-30 14:04:39 +01:00
Bruno Windels
77a61519ef also allow commands to be pill-candidates 2019-09-30 11:15:46 +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
J. Ryan Stinnett
701ec259e6 Rename Terms column in modal to Document 2019-09-27 17:43:04 +01:00
J. Ryan Stinnett
66f450b995 Lowercase terms 2019-09-27 17:32:57 +01:00
Bruno Windels
5e960f50e3
Merge pull request #3487 from matrix-org/bwindels/redactpeers 
Fix: allow mass redaction for members with same or larger power level
 2019-09-27 14:56:24 +00:00
Bruno Windels
a8695d345b allow mass redaction for members with same or larger power level 2019-09-27 16:16:44 +02:00
Michael Telatynski
37978e5ef5 Fix GroupMemberTile wrong default avatar letter and colour 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-27 12:24:01 +01:00
Michael Telatynski
12c46838c3 fix sdk import 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-27 12:20:48 +01:00
Michael Telatynski
cde75dc4f7 fix PropTypes.oneOfType 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-27 12:18:19 +01:00
J. Ryan Stinnett
bfcd28f00a
Merge pull request #3483 from matrix-org/t3chguy/accesibility 
Improve keyboard/screen reader accesibility some more
 2019-09-27 10:07:51 +01:00
Michael Telatynski
ce78de2185 re-order imports 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-27 10:05:08 +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
8301943cfa
Merge pull request #3481 from matrix-org/bwindels/cider-ac-shifttab 
Fix: don't block Shift+Tab in CIDER autocomplete
 2019-09-26 15:08:36 +00:00
Michael Telatynski
3674b87415 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-26 14:58:40 +01:00
Michael Telatynski
c37e27f03d Improve a11y: 
+ Close context menu on escape
+ Use AccessibleButtons for more things (Context Menus and TabbedView)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-26 14:52:20 +01:00
Michael Telatynski
8ec0ffea3a Make the message context menu more accessible 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-26 14:24:10 +01:00
Michael Telatynski
14e3cb8736 Allow keyboard control even without a screen reader 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-26 13:52:09 +01:00
Bruno Windels
f5b9373eb5 don't block Shift+Tab keypresses 2019-09-26 11:00:55 +02:00
Bruno Windels
99961df9d0
Merge pull request #3479 from matrix-org/bwindels/command-detection-resilience 
Fix: make command detection more resilient
 2019-09-26 07:36:25 +00:00
Michael Telatynski
d588e709e5 Add tab indexes, role=button and aria-labels to TabbedViews for a11y 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-25 18:55:18 +01:00
Michael Telatynski
3672832d38 conform to style 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-25 18:10:05 +01:00
Michael Telatynski
ab3e5c3b87 Merge branches 'develop' and 't3chguy/accesibility' of github.com:matrix-org/matrix-react-sdk into t3chguy/accesibility 2019-09-25 16:59:46 +01:00
Bruno Windels
0bbbb5e336 use mxid for user pill in command 2019-09-25 17:30:12 +02:00
Bruno Windels
c760ba0839 make command detection more resilient 2019-09-25 17:30:01 +02:00
Bruno Windels
10b692c1a2
Merge pull request #3477 from matrix-org/bwindels/cjk-ime-fixes 
Fix: latin input through Chinese IME
 2019-09-25 14:21:15 +00:00
Bruno Windels
30af9a9056 need to check isComposing on native event 2019-09-25 16:11:37 +02:00
Bruno Windels
1c11b8e274 Move focus to first field in create room dialog when showing 2019-09-25 15:08:48 +02:00
Bruno Windels
c8af1a6256 fixup: remove flag 2019-09-25 14:59:27 +02:00
Bruno Windels
ffe34ee8a1 try to see if this fixes safari back 
on of the 2 changes (updating dom async from compositionend,
or ignoring keydown while composing) here has, while fixing chrome,
broken safari.

Don't do the async dom updating for safari if that was it.
 2019-09-25 14:47:35 +02:00
Bruno Windels
7bda1c58eb better naming 2019-09-25 14:45:39 +02:00
J. Ryan Stinnett
b248918aca
Merge pull request #3476 from matrix-org/jryans/msisdn-reg-submit-url 
Send MSISDN validation token to submit_url during registration
 2019-09-25 11:30:33 +01:00
J. Ryan Stinnett
9e33be9b2a Send MSISDN validation token to submit_url during registration 
Similar to previous changes for 3PID add, this changes registration with MSISDN
to also send tokens to `submit_url` when supplied.

Fixes https://github.com/vector-im/riot-web/issues/10939
 2019-09-25 10:29:18 +01:00
Michael Telatynski
e01be212e6 improve Settings Accessibility for Toggles and Dialogs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-25 09:25:11 +01:00
Michael Telatynski
4a5ee4a969 Put aria-disabled on AccessibleButtons and attempt to a11y ToggleSwitch 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-25 09:01:49 +01:00
Travis Ralston
6ab816f79e Hide browser a11y outline on context menus 
Fixes https://github.com/vector-im/riot-web/issues/10926
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/3454/files
Class introduced in https://github.com/matrix-org/matrix-react-sdk/pull/2994
 2019-09-24 12:29:20 -06:00
J. Ryan Stinnett
17e42eacd4
Merge pull request #3473 from matrix-org/jryans/rm-id-server-reg-and-reset 
Remove id_server param from threepid_creds
 2019-09-24 17:34:45 +01:00
J. Ryan Stinnett
ec9e7f5855 Remove id_server for MSISDN registration 
For HSes that no longer need it, remove the id_server param when verifying
MSISDNs at registration.

Fixes https://github.com/vector-im/riot-web/issues/10941
 2019-09-24 15:02:30 +01:00
Matthew Hodgson
df33d0f74c Remove debug for https://github.com/vector-im/riot-web/issues/10940 2019-09-24 14:57:45 +01:00
J. Ryan Stinnett
0c51e41ea4 Remove id_server param for password reset 
For HSes that no longer need it, remove the id_server param from password reset.

Part of https://github.com/vector-im/riot-web/issues/10941
 2019-09-24 14:54:26 +01:00
Bruno Windels
9f47fad305 ignore keydown events while doing IME composition 2019-09-24 15:32:30 +02:00
Bruno Windels
4d151722ff delay DOM modification after compositionend 2019-09-24 15:32:08 +02:00
Bruno Windels
26a8398a0e make sure client exists while logging out 2019-09-24 12:53:33 +02:00
Matthew Hodgson
3ce47a0181 notify new screen after setting state 2019-09-24 01:51:21 +01:00
Matthew Hodgson
b85dc7b5a8 add debug for vector-im/riot-web#10940 2019-09-24 01:35:43 +01:00
Matthew Hodgson
54355c0e28 put the room name in the title tag 
should fix https://github.com/vector-im/riot-web/issues/4454
 2019-09-23 22:01:52 +01:00
Bruno Windels
3e0278d41a add validation when clicking Ok in dialog 2019-09-23 11:22:30 +02:00
Bruno Windels
6ae4b3e966 add room alias field to dialog 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
c5f9ef87ba fixup: detailsOpen state var 2019-09-23 11:22:30 +02:00
Bruno Windels
761233c473 add public switch 2019-09-23 11:22:30 +02:00
Bruno Windels
4a7ae3ca8e add optional topic field 2019-09-23 11:22:30 +02:00
Bruno Windels
157a3388a5 change name to Field, no_federate to switch 
also construct room create options in dialog,
instead of MatrixChat, as we'll have more to come
 2019-09-23 11:22:30 +02:00
J. Ryan Stinnett
351a3ebd67
Merge pull request #3462 from matrix-org/jryans/msc2290 
Use separate 3PID add and bind flow for supporting HSes
 2019-09-20 14:37:03 +01:00
J. Ryan Stinnett
f9a09d271b Use separate MSISDN add and bind flow for supporting HSes 
This changes the paths used for binding MSISDNs for discovery to use the new
separate bind / unbind APIs on supporting servers.

Fixes https://github.com/vector-im/riot-web/issues/10839
 2019-09-20 12:45:22 +01:00
J. Ryan Stinnett
ff69ad02b9 Use separate email add and bind flow for supporting HSes 
This changes the paths used for binding emails for discovery to use the new
separate bind / unbind APIs on supporting servers.

Part of https://github.com/vector-im/riot-web/issues/10839
 2019-09-20 12:19:43 +01:00
J. Ryan Stinnett
9a1305bf4a Extract separate add / bind methods on AddThreepid 2019-09-19 15:53:50 +01:00
Michael Telatynski
d1fb31a6dc Merge branches 'develop' and 't3chguy/register_disable_no_custom_url_spinner' of github.com:matrix-org/matrix-react-sdk into t3chguy/register_disable_no_custom_url_spinner 2019-09-19 10:07:42 +01:00
Michael Telatynski
f356b8a3c9
Merge pull request #3457 from matrix-org/t3chguy/sso_device_name 
Use same initial device name rules for SSO login as password login
 2019-09-19 09:27:13 +01:00
Michael Telatynski
c286f2214f Fix disabled save button on message editor when pasting 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-18 14:09:38 +01:00
Michael Telatynski
6209d62f49 Don't show spinner if registration is disabled 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-18 13:19:33 +01:00
J. Ryan Stinnett
99b804d567 Change to separate add and bind to guard 3PID account section 
This changes to checking for HS support of separate add and bind when guarding
the 3PID account section.

For older HSes, we in fact always require an IS for add with bind param, so the
previous version of this was incorrect.

Part of https://github.com/vector-im/riot-web/issues/10839
 2019-09-18 13:02:52 +01:00
Michael Telatynski
c633df3c15 Use same initial device name rules for SSO login as password login 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-18 12:16:41 +01:00
Michael Telatynski
648527e650 Fix failure to render newly verified phone number and nested forms 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-18 08:41:05 +01:00
Travis Ralston
9f3f88ba00 Focus context menus so screen readers can find them 
Fixes https://github.com/vector-im/riot-web/issues/10899

The `tabIndex` is required to make the thing actually focusable. This is the same trick employed in https://github.com/matrix-org/matrix-react-sdk/pull/2994
 2019-09-17 15:41:39 -06:00
Matthew Hodgson
832123524d make the lifetimes of the RM configurable 2019-09-17 17:34:30 +01:00
J. Ryan Stinnett
4e42dbe418 Fix address type props to state conversion 
The address picker recently started tracking props and state versions of valid
address types separately
(https://github.com/matrix-org/matrix-react-sdk/pull/3408), where props
represents the maximal set of possible types and the state is the current
available types right now (since it can change while the dialog is open).

For the case where there is no a IS, a regression was introduced by that PR by
mutating the props in place instead returning a modified copy for the state.

Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/3408
Fixes https://github.com/vector-im/riot-web/issues/10878
 2019-09-17 15:00:32 +01:00
RiotRobot
dd0ffa8e72 Merge branch 'master' into develop 2019-09-16 17:49:46 +01:00
Michael Telatynski
5d1056e1ef don't fire onFinished twice 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-16 18:20:31 +02:00
Michael Telatynski
597433d549 Reuse showRoom for onJoinClick so we join using alias if its available 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-16 18:20:24 +02:00
Michael Telatynski
7f5d38772d don't fire onFinished twice 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-15 21:30:01 +01:00
Michael Telatynski
54d98c22ba Reuse showRoom for onJoinClick so we join using alias if its available 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-15 21:25:36 +01:00
Travis Ralston
e18b38c409
Merge pull request #3437 from matrix-org/travis/fix-deactivate 
Wrap deactivation check with sanity conditions
 2019-09-13 15:59:04 -06:00
Travis Ralston
3150d65bd7 De-async _calculateCanPermissions 2019-09-13 12:43:57 -06:00
Travis Ralston
d18d15311f Remove extraneous guard on deactivation check 2019-09-13 12:43:47 -06:00
David Baker
7afd80e55b
Merge pull request #3408 from matrix-org/t3chguy/community_member_invite_IS_text 
Fix identity server text in AddressPickerDialog
 2019-09-13 15:45:22 +01:00
David Baker
05a26373e8
Merge pull request #3438 from matrix-org/travis/revoke-1 
Change copy for sharing an email
 2019-09-13 15:42:53 +01:00
Bruno Windels
40bd1845d2
Merge pull request #3441 from matrix-org/bwindels/fixroomdir-itemclick-bis 
Fix: stop propagation click handler for <TR> doesn't run
 2019-09-13 13:08:42 +00:00
Bruno Windels
6d13ea0043 stop propagation click handler for <TR> doesn't run 2019-09-13 14:07:36 +01:00
Michael Telatynski
c3d01715ff Improve ReportEventDialog as per PR feedback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-13 13:41:50 +01:00
Michael Telatynski
92af11bce7 fix indentation 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-13 13:40:31 +01:00
Michael Telatynski
fc49290459 Add way to report the content of a message 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-13 13:40:25 +01:00
Bruno Windels
f73f08e998 stop propagation click handler for <TR> doesn't run 2019-09-13 14:33:09 +02:00
David Baker
e548e4d7a5
Merge pull request #3436 from matrix-org/travis/deactivate-release 
Fix synapse deactivate button for release
 2019-09-13 13:26:19 +01:00
Bruno Windels
820869d99b fix clicking on room dir item 2019-09-13 11:00:55 +01:00
Bruno Windels
bf460dbd3d fix clicking on room dir item 2019-09-13 11:09:02 +02:00
Travis Ralston
f25529eed7 Change copy for sharing an email 
Fixes https://github.com/vector-im/riot-web/issues/10758
 2019-09-12 22:39:32 -06:00