OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
17,944 Commits
209 Branches
549 Tags
652 MiB
Commit Graph

14543 Commits (8d1d3090f36963c0f3921968f09b20d680810d80)

Author SHA1 Message Date
Bruno Windels 87f8000621 only hide x button when blurred && no more search term 2019-09-12 17:17:15 +02:00
Michael Telatynski f95ab2eeb1
Merge pull request #3290 from matrix-org/t3chguy/report_event 
Add way to report the content of a message
 2019-09-12 15:11:32 +01:00
Bruno Windels 1806e83247
Merge pull request #3428 from matrix-org/bwindels/breadcrumbs-after-10 
Breadcrumbs: only show after having joined at least 10 rooms
 2019-09-12 13:19:02 +00:00
Bruno Windels fb5a85db81 put min room count in constant 2019-09-12 15:12:18 +02:00
David Baker ef7d8c42a8 Fix merge 2019-09-12 13:09:59 +01:00
Bruno Windels 94bdedd25b show breadcrumbs only after having joined at least 10 rooms 2019-09-12 14:07:46 +02:00
RiotRobot b0abb52518 Merge branch 'master' into develop 2019-09-12 13:07:27 +01:00
Michael Telatynski 6dc69afe67 Merge branches 'develop' and 't3chguy/community_member_invite_IS_text' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/community_member_invite_IS_text 2019-09-12 12:53:32 +01:00
Michael Telatynski b6309a4294 Improve ReportEventDialog as per PR feedback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-12 12:52:11 +01:00
Michael Telatynski 9a15d4cfc1 Merge branches 'develop' and 't3chguy/report_event' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/report_event 
 Conflicts:
	src/i18n/strings/en_EN.json
 2019-09-12 12:45:16 +01:00
Michael Telatynski a40ecda993 Fix missed case of validAddressTypes being conditional 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-12 12:34:14 +01:00
Michael Telatynski d7bac95270
Merge pull request #3421 from matrix-org/t3chguy/nvl/fix_sso_flash 
Hide the change HS url button on SSO login flow if custom urls disabled
 2019-09-12 12:29:03 +01:00
Bruno Windels 122e15156a always show clear button in search box when focused 2019-09-12 12:21:18 +01:00
Michael Telatynski 7c54359d3a Hide the change HS url button on SSO login flow if custom urls disabled 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-12 12:17:52 +01:00
Michael Telatynski 5091658dc7 Update Copyright 2019-09-12 12:16:01 +01:00
Michael Telatynski 8eb8b00460 RoomDirectory: show spinner if loading more results 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-12 12:15:56 +01:00
Michael Telatynski d197fd90ad Merge branches 'develop' and 't3chguy/nvl/fix_sso_flash' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/nvl/fix_sso_flash 2019-09-12 10:25:54 +01:00
Bruno Windels 7c97078764 always show clear button in search box when focused 2019-09-12 11:12:06 +02:00
Michael Telatynski a4a85dc541 Hide the change HS url button on SSO login flow if custom urls disabled 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-11 23:02:52 +01:00
Travis Ralston ab6215f9aa
Merge pull request #3410 from matrix-org/t3chguy/disable_save_button_msg_edit_nochange 
EditMessageComposer: disable Save button until a change has been made
 2019-09-11 14:27:27 -06:00
Travis Ralston 9622ec9a1a
Merge pull request #3416 from matrix-org/t3chguy/nvl/room_directory_pagination_spinner 
RoomDirectory: show spinner if loading more results
 2019-09-11 14:26:51 -06:00
Michael Telatynski 9c1fb13d5f Apply PR feedback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-11 18:05:28 +01:00
Michael Telatynski 7c5e6ef2c5 regen 18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-11 18:05:26 +01:00
Michael Telatynski 7ddac8d475 Login: Add way to change HS from SSO Homeserver 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-11 18:04:11 +01:00
Michael Telatynski c26d71b5aa Login: don't assume supported flows, prevent login flash on SSO servers 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-11 18:04:11 +01:00
Bruno Windels ac65b28954 PR feedback 2019-09-11 18:03:15 +01:00
Bruno Windels 0cba5da03d add redact recent messages button in member info 2019-09-11 18:03:09 +01:00
Bruno Windels b67a2492b3 adapt design of room list in directory 2019-09-11 18:02:37 +01:00
Bruno Windels 9866efabe5 pr feedback 2019-09-11 17:58:14 +01:00
Bruno Windels 13a3cf3afe consistent naming 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2019-09-11 17:58:14 +01:00
Bruno Windels cf8ca176e2 remove labels and add join/view & preview button instead in directory 2019-09-11 17:58:14 +01:00
Bruno Windels ea7cbbc0ee keep filter field expanded if it has text in it 2019-09-11 17:57:40 +01:00
Bruno Windels b9421e4269 make add room button go to create room dialog instead of room directory 2019-09-11 17:57:40 +01:00
Bruno Windels 31682b61ce make filter feed transparent when not focussed 2019-09-11 17:57:40 +01:00
Bruno Windels b328fcb7e3 show shorter placeholder for filter feed when not focused 2019-09-11 17:57:40 +01:00
Bruno Windels 0fe31f843a hide explore button when focusing filter field 2019-09-11 17:57:40 +01:00
Bruno Windels 4ffa8c7b4a add explore button next to filter field 2019-09-11 17:57:40 +01:00
Travis Ralston 9e2cdecb9b Add a button to MemberInfo to deactivate a user 
Part of https://github.com/vector-im/riot-web/issues/4125
 2019-09-11 17:44:29 +01:00
Michael Telatynski 6f736e8407 Apply PR feedback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-11 17:44:04 +01:00
Michael Telatynski 370d9d8336 regen 18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-11 17:44:04 +01:00
Michael Telatynski 76e4363452 Login: Add way to change HS from SSO Homeserver 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-11 17:44:04 +01:00
Michael Telatynski f1ea5ff6f3 Login: don't assume supported flows, prevent login flash on SSO servers 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-11 17:44:04 +01:00
Michael Telatynski 792b70913c invert and rename changed to saveDisabled for clarity 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-11 17:37:11 +01:00
Michael Telatynski 2ff98b7c1f clear up ambiguity by poor naming 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-11 17:37:11 +01:00
Michael Telatynski e3643bf17a EditMessageComposer: disable Save button until a change has been made 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-11 17:37:11 +01:00
Michael Telatynski 980e9839ac Update Copyright 2019-09-11 17:22:45 +01:00
Michael Telatynski 0d28cd5840 RoomDirectory: show spinner if loading more results 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-11 17:22:45 +01:00
Michael Telatynski 81ea230a35
Merge pull request #3406 from matrix-org/t3chguy/reply_to_search_results 
Fix replying from search results for this and all rooms
 2019-09-11 17:14:55 +01:00
Michael Telatynski 379fab8068
Merge pull request #3411 from matrix-org/t3chguy/synapse_deactivate_memberinfo_no_room 
Support Synapse deactivate on MemberInfo without Room (timeline pill)
 2019-09-11 17:12:38 +01:00
J. Ryan Stinnett f23f35bbe9
Merge pull request #3419 from matrix-org/jryans/settings-3pid-state 
Lift 3PID state management up to Settings tab
 2019-09-11 16:56:18 +01:00
J. Ryan Stinnett c542ea5559 Force boolean value 2019-09-11 16:55:45 +01:00
J. Ryan Stinnett db33c138aa Update all 3PID state in Settings when IS changes 
This ensures we update all 3PID state (like bind status) whenever the IS
changes.
 2019-09-11 16:21:42 +01:00
J. Ryan Stinnett 0b7995dc11 Improve terms handling for 3PID state gathering 
This changes the 3PID state gathering (used in Settings) to ignore terms errors
(no modals will be shown) on the assumption that other UX handles this case.
 2019-09-11 16:21:42 +01:00
J. Ryan Stinnett f04c347df7 Lift 3PID state management up to Settings tab 
This pulls the 3PID state management in Settings up to a single location so that
the Account and Discovery sections now work from a single list that updates
immediately.

Fixes https://github.com/vector-im/riot-web/issues/10519
 2019-09-11 16:21:42 +01:00
Bruno Windels 24c4a16da1 adapt design of room list in directory 2019-09-11 16:23:59 +02:00
Bruno Windels 77175fcbc4 pr feedback 2019-09-11 16:18:34 +02:00
Bruno Windels 094c9e3468
consistent naming 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2019-09-11 14:15:46 +00:00
Bruno Windels 7754e08d84 remove labels and add join/view & preview button instead in directory 2019-09-11 15:45:51 +02:00
Bruno Windels 62ddc1e544
Merge pull request #3412 from matrix-org/bwindels/explore-button 
Add explore button in left panel to go show room directory
 2019-09-11 11:54:18 +00:00
Bruno Windels ad2e16d432 keep filter field expanded if it has text in it 2019-09-11 13:46:18 +02:00
Travis Ralston 7fcabd799d
Merge pull request #3415 from matrix-org/travis/min-updates 
Only update m.accepted_terms if there were changes
 2019-09-10 12:43:05 -06:00
Travis Ralston ccd42900f7
Merge pull request #3414 from matrix-org/travis/address-picker-stack 
Make uses of AddressPickerDialog static dialogs
 2019-09-10 12:38:40 -06:00
Travis Ralston b35d56167e const-antly annoying linter 
although it's a valid complaint here
 2019-09-10 11:16:45 -06:00
Travis Ralston 312143315b Only update m.accepted_terms if there were changes 
Fixes https://github.com/vector-im/riot-web/issues/10744
 2019-09-10 11:13:35 -06:00
Travis Ralston 4fbedec013 Make uses of AddressPickerDialog static dialogs 
Fixes https://github.com/vector-im/riot-web/issues/10603

Static dialogs are ones that stay open underneath other dialogs, like the terms of service prompt. This is how user/room settings operate.
 2019-09-10 11:01:20 -06:00
Travis Ralston 096dff4b54
Merge pull request #3395 from matrix-org/travis/hidden_rr 
Support sending hidden read receipts
 2019-09-10 10:55:45 -06:00
Bruno Windels 68dde07f49 make add room button go to create room dialog instead of room directory 2019-09-10 11:59:59 +02:00
Bruno Windels 1c4093eb0f make filter feed transparent when not focussed 2019-09-10 11:11:08 +02:00
Bruno Windels 15d3774665 show shorter placeholder for filter feed when not focused 2019-09-10 11:11:08 +02:00
Bruno Windels da98080859 hide explore button when focusing filter field 2019-09-10 10:57:25 +02:00
Bruno Windels 80dd5a1b0a add explore button next to filter field 2019-09-10 10:55:55 +02:00
Michael Telatynski 80add7be92 delint more properly 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-10 08:38:51 +01:00
Michael Telatynski 0b56e7a81c Support Synapse deactivate on MemberInfo without Room (timeline pill) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-10 08:26:10 +01:00
Michael Telatynski c6f3ca20c0
Merge pull request #3407 from matrix-org/t3chguy/fix_custom_pl_levels_hidden_error 
Catch error from changing room power level requirements and show modal
 2019-09-09 17:50:58 +01:00
Bruno Windels 3edf345b02 PR feedback 2019-09-09 16:19:10 +02:00
Michael Telatynski 043a8d35e6 Move the rest of the IS/email supported logic to AddressPickerDialog 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-09 15:03:00 +01:00
Bruno Windels f205ddbc8f add redact recent messages button in member info 2019-09-09 15:10:50 +02:00
Michael Telatynski 194cd0a460 Fix identity server text in AddressPickerDialog 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-09 13:53:56 +01:00
Michael Telatynski 9c488426cc add i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-09 12:51:30 +01:00
Michael Telatynski 088f9e4cc5 Catch error from changing room power level requirements and show modal 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-09 12:50:05 +01:00
J. Ryan Stinnett a03b224ff7
Merge pull request #3394 from matrix-org/jryans/bound-3pids-warning 
Add bound 3PID warning when changing IS as well
 2019-09-09 12:28:19 +01:00
J. Ryan Stinnett 24f1ec8abb
Merge pull request #3398 from matrix-org/jryans/is-input-tweak 
Stop setting IS input field on account change
 2019-09-09 10:28:00 +01:00
J. Ryan Stinnett c3adddb5ac Change to paragraphs outside the strings 2019-09-09 10:27:02 +01:00
Michael Telatynski ef2ff31a46 Fix replying from search results for this and all rooms 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-09 09:34:08 +01:00
Bruno Windels 1422b1d73e
Merge pull request #3403 from matrix-org/bwindels/cider-italics 
New composer: use underscore for italics so it doesn't collide with bold when toggling
 2019-09-09 08:06:51 +00:00
Travis Ralston e29184ae1d Support secret per-room hidden read receipts 2019-09-06 13:02:18 -06:00
Michael Telatynski d8dbe28015
Merge pull request #3404 from matrix-org/t3chguy/react16_10 
Switch to createReactClass: views/elements & views/groups. React 16 :D
 2019-09-06 18:49:11 +01:00
Michael Telatynski b243004a6c Switch to createReactClass: *everything else*. React 16 :D 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-06 18:38:11 +01:00
Michael Telatynski d5db67be38 Switch to createReactClass: views/elements & views/groups. React 16 :D 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-06 18:35:52 +01:00
Michael Telatynski 13258132e7
Merge pull request #3400 from matrix-org/t3chguy/react16_9 
Switch to createReactClass: views/rooms and test/components. React 16 :D
 2019-09-06 18:18:32 +01:00
Bruno Windels 48247e66be use underscore for italics so it doesn't collide with bold when toggling 2019-09-06 17:52:37 +02:00
Bruno Windels fe482258ac
Merge pull request #3402 from matrix-org/bwindels/cider-toggle-inline-formatting 
New composer: support toggling inline formatting
 2019-09-06 14:42:16 +00:00
Bruno Windels 14fff3be9a
Merge pull request #3399 from matrix-org/bwindels/fix-formatbar-edit-position 
Fix format bar not appearing in edit composer
 2019-09-06 14:28:23 +00:00
Bruno Windels 26bd694c6a support toggling inline formatting 2019-09-06 16:25:55 +02:00
J. Ryan Stinnett 3ad88604cc Stregthen bound 3PID warning dialog 
This tweaks the bound 3PID text and adds danger styling.

Fixes https://github.com/vector-im/riot-web/issues/10750
 2019-09-06 15:18:01 +01:00
Michael Telatynski 70ff2bc9cd Switch to createReactClass: views/rooms and test/components. React 16 :D 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-06 15:04:46 +01:00
Bruno Windels 4e98721ba9 take bounding box for positioning calculation 2019-09-06 15:56:46 +02:00
J. Ryan Stinnett 5fddb20d86 Stop setting IS input field on account change 
This stops setting a value in the IS input on account change. While it may have
been marginally useful if you have the form open and change on a different
device, it also seems to pick up changes on the current device, leading to
strange UX locally.

Fixes https://github.com/vector-im/riot-web/issues/10756
Fixes https://github.com/vector-im/riot-web/issues/10757
 2019-09-06 14:33:40 +01:00
Michael Telatynski 4db8ef4d89 Correct case of propTypes property in ES6 React Components. React 16 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-06 14:27:33 +01:00
J. Ryan Stinnett 11a5fca702 Remove logs 2019-09-06 13:44:44 +01:00
J. Ryan Stinnett df03477907 Show change warning only when different from current 2019-09-06 11:54:08 +01:00
J. Ryan Stinnett 19fff51b01 Rework handling for terms CORS error 
Earlier changes in this branch removed the "next step" of saving from the
dialogs, so we need to fold in the CORS error case.
 2019-09-06 11:12:10 +01:00
Bruno Windels dd1c01068f fix rename that didn't make it through rebasing 2019-09-06 11:58:27 +02:00
J. Ryan Stinnett 2ff592c542 Use existing modal promises 2019-09-06 10:48:24 +01:00
Bruno Windels 5014b606db
Merge pull request #3391 from matrix-org/bwindels/cider-format-history 
New composer: ensure undo history is persisted before applying formatting
 2019-09-06 09:28:18 +00:00
Bruno Windels df4762871a
Merge pull request #3392 from matrix-org/bwindels/cider-paste-plain 
New composer: fix pasting from word processors
 2019-09-06 09:22:37 +00:00
Bruno Windels 6b104f6344
Merge pull request #3393 from matrix-org/bwindels/cider-fix-lastcaret 
New composer: fix needing to push arrow-up twice after sending first message after switching to a room
 2019-09-06 09:22:10 +00:00
Bruno Windels 9dac91a70d ensure step before formatting is persisted in undo history 2019-09-06 11:20:24 +02:00
Bruno Windels 0252c7ae37 force pasting as plain text in new composer 2019-09-06 11:10:41 +02:00
Bruno Windels 2596281a7c update last caret from update callback instead of input event 
many editor updates are not caused by an input event, so
the last caret wasn't always up to date.

Updating the caret from the update callback ensures that every
time the editor contents is changed, the last caret is updated.
 2019-09-06 11:09:01 +02:00
Bruno Windels f4938f9d11 dont format empty ranges 2019-09-06 10:59:41 +02:00
Bruno Windels 06143ba7a1 show keyboard shortcuts in format button tooltip 2019-09-06 10:59:41 +02:00
Bruno Windels bdcea6f21e add shortcuts for formatting 2019-09-06 10:59:41 +02:00
Bruno Windels d6a493a2b1 fixup: language strings moved 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 02681d50b9
Merge pull request #3386 from matrix-org/bwindels/cider-formatbar 
New composer: show format bar on selection
 2019-09-06 08:38:01 +00:00
Bruno Windels 92c0c1a4e2 add comment about positioning the format bar 2019-09-06 10:29:18 +02:00
Bruno Windels d2949babcd copyright is solely assigned to matrix foundation now, copy paste error 2019-09-06 10:29:12 +02:00
Travis Ralston af35cdc2ea Support sending hidden read receipts 
Fixes https://github.com/vector-im/riot-web/issues/2527
 2019-09-05 20:30:19 -06:00
J. Ryan Stinnett d5552e4a17 Add bound 3PID warning when changing IS as well 
This extends the bound 3PID warning from the disconnect button to also appear
when changing the IS as well. At the moment, the text is a bit terse, but will
be improved separately.

Fixes https://github.com/vector-im/riot-web/issues/10749
 2019-09-05 17:52:46 +01:00
Bruno Windels 124b7135cd make sure the update callback gets a caret when calling reset 2019-09-05 17:54:08 +02:00
J. Ryan Stinnett 46ee52a406
Merge pull request #3388 from matrix-org/jryans/bound-3pids-warning 
Add new agreed URLs to account data instead of overwriting
 2019-09-05 15:02:15 +01:00
Travis Ralston 26eb617bec
Merge pull request #3384 from matrix-org/travis/fix-pl 
Fix member power levels in room settings
 2019-09-05 07:16:52 -06:00
J. Ryan Stinnett 0929a9cc72 Add new agreed URLs to account data instead of overwriting 
This changes terms account data storage to always add, rather than setting only
the current set of displayed URLs.

Fixes https://github.com/vector-im/riot-web/issues/10755
 2019-09-05 13:38:32 +01:00
Bruno Windels 4ef9fa53ac better i18n 2019-09-05 11:10:13 +02:00
Travis Ralston d6adf0fd6d Add responsible error handling because we're responsible people 2019-09-04 11:24:31 -06:00
Bruno Windels 2ea556e0b4 support update callback setting selection instead of caret 2019-09-04 16:40:34 +02:00
Bruno Windels 037ac29c57 be more forgiving with offset that don't have atNodeEnd=true 
if index is not found, it means the last position should be returned
if there is any.

We still return -1 for empty documents, as index should always point
to a valid part if positive.
 2019-09-04 16:40:34 +02:00
Bruno Windels 42c37d8293 fixup: improve quote and code block newline handling 2019-09-04 16:40:34 +02:00
Bruno Windels e0668e8517 improve algorithm to reduce selection to text node + charactar offset 
this follows the documentation of {focus|anchor}{Offset|Node} better
and was causing problems for creating ranges from the document selection
when doing ctrl+A in firefox as the anchorNode/Offset was expressed
as childNodes from the editor root.
 2019-09-04 16:40:34 +02:00
Bruno Windels 4691108a16 only increase offset if caret hasn't been found yet 
also rename caret away as this isn't used for the caret solely anymore
 2019-09-04 16:40:34 +02:00
Bruno Windels 7a01d1407f make _replaceRange internal only 2019-09-04 16:40:34 +02:00
Bruno Windels 4c04bc19c9 fixup: remove now unused import 2019-09-04 16:40:34 +02:00
Bruno Windels 6e694c113a add support for inline/block code formatting 2019-09-04 16:40:34 +02:00
Bruno Windels b35a3531bb move quote formatting out of react component 2019-09-04 16:40:34 +02:00
Bruno Windels b72d1a78ec move inline formatting code out of react component 2019-09-04 16:40:34 +02:00
Bruno Windels 47d8d86bbe whitespace (in model) 2019-09-04 16:40:23 +02:00
Bruno Windels 7f501b2aef first impl of quote formatting 2019-09-04 16:40:13 +02:00
Bruno Windels d4c7992f5a first impl of inline formatting 2019-09-04 16:39:56 +02:00
Bruno Windels c15dfc3c05 make Range start and end public 2019-09-04 16:38:42 +02:00
Bruno Windels 7dc39baaf3 implement bold support in format bar 2019-09-04 16:35:03 +02:00
Bruno Windels 77b14beb1f add getter for intersecting parts of range, and total length 
we'll need this when replacing selection, to preserve
newlines, etc ... in the selected range (e.g. we can't just
use range.text).
 2019-09-04 16:35:03 +02:00
Bruno Windels 48f1bf1816 sort positions in Range constructor, so start always comes before end 2019-09-04 16:35:03 +02:00
Bruno Windels 65ddfc0a50 show format bar when text is selected 2019-09-04 16:35:03 +02:00
Bruno Windels 4575aaa9f6
Merge pull request #3382 from matrix-org/bwindels/escape-command-slash 
New composer: allow escaping the first slash to not write a command
 2019-09-03 16:04:23 +00:00
Bruno Windels 9a409a7acc
Merge pull request #3381 from matrix-org/bwindels/plain-command 
/plain command to bypass markdown conversion
 2019-09-03 16:04:07 +00:00
J. Ryan Stinnett 3cb06c01b7
Merge pull request #3385 from matrix-org/jryans/email-invite-text 
Improve email invite preview messaging
 2019-09-03 16:58:14 +01:00
J. Ryan Stinnett 261bdab156 Fix indent 2019-09-03 16:55:17 +01:00
J. Ryan Stinnett 67299842e3 Use more specific messaging for email invite preview 
This changes email invite previews to check more specific cases about whether
the email has been added to your account, you have an IS, the email is bound,
etc.

In addition, it always allows you to join if you want to.

Fixes https://github.com/vector-im/riot-web/issues/10669
 2019-09-03 15:41:53 +01:00