mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 14:22:50 +03:00
Code Issues Projects Releases Packages Wiki Activity
17647 commits 219 branches 562 tags 474 MiB
Commit graph

8161 commits

Author SHA1 Message Date
David Baker
85497610e3
Spell out identity server 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-08-14 10:08:15 +01:00
David Baker
0d560108b6
Kill smart quotes 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2019-08-14 10:07:50 +01:00
David Baker
b0420c106e Prepopulate client default on disconnect 2019-08-14 10:06:05 +01:00
David Baker
735c6d73d8 Merge remote-tracking branch 'origin/develop' into dbkr/disco_is 2019-08-14 10:03:32 +01:00
David Baker
e2c5dc6bac
Merge pull request #3300 from matrix-org/dbkr/change_is 
Add UI in settings to change ID Server
 2019-08-14 09:42:20 +01:00
David Baker
7c35107a37 Update 3pids section visibility when id server set / unset 2019-08-13 18:40:27 +01:00
Michael Telatynski
a44d61fb75 add copyright 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-13 18:17:42 +01:00
Michael Telatynski
6589e5dab9 Fix showing events which were replied to and then redacted 2019-08-13 18:13:47 +01:00
David Baker
c80c8dcf24 prefill id server box with default if there isn't one 2019-08-13 17:55:10 +01:00
David Baker
596ff93049 unused import 2019-08-13 16:38:46 +01:00
David Baker
2539da0dfa Use fetch instead of browser-request 2019-08-13 16:37:56 +01:00
David Baker
31fd36efba use accessiblebutton 2019-08-13 16:20:30 +01:00
Travis Ralston
d4bbed31d5 Merge branch 'develop' into travis/integs/account_set 2019-08-13 09:03:50 -06:00
Travis Ralston
831da696ad
Merge pull request #3301 from matrix-org/travis/integs/base 
Refactor integration manager handling into a common place
 2019-08-13 09:00:22 -06:00
David Baker
02504b9959 make it work again 2019-08-13 12:59:34 +01:00
David Baker
e5f913bc11 Merge remote-tracking branch 'origin/develop' into dbkr/change_is 2019-08-13 12:56:58 +01:00
David Baker
7afaba3bf1 link to doc issue 2019-08-13 11:05:41 +01:00
David Baker
860a9dbc82 s/tooltip/tooltipContent/ 2019-08-13 11:01:04 +01:00
David Baker
c36c3a9b33
other general grammar 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-08-13 10:51:26 +01:00
David Baker
934b711936
write Identity Server out in full to be less confusing 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-08-13 10:48:56 +01:00
David Baker
c732ae3aa9
Correct license header 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-08-13 10:46:42 +01:00
David Baker
12eeb20574
Merge pull request #3291 from matrix-org/t3chguy/fix_RoomAvatarEvent 
Fix wrong default-letter-avatar for RoomAvatarEvent
 2019-08-13 09:32:26 +01:00
Travis Ralston
03d735f4ed Support changing your integration manager in the UI 
Part of https://github.com/vector-im/riot-web/issues/10161
 2019-08-12 15:40:50 -06:00
Travis Ralston
e21c12c2c9 Merge remote-tracking branch 'origin/dbkr/change_is' into travis/integs/account_set 2019-08-12 13:06:36 -06:00
Travis Ralston
60778d843d Merge branch 'travis/integs/base' into travis/integs/account_set 2019-08-12 13:02:19 -06:00
Michael Telatynski
bb23374b8a
Merge pull request #3304 from matrix-org/t3chguy/un-hardcode-themes-in-settings 
Consolidate Themes into ThemeController. Remove hardcoded themes in view
 2019-08-12 15:57:56 +01:00
David Baker
0c4b29faa9 Merge remote-tracking branch 'origin/dbkr/change_is' into dbkr/disco_is 2019-08-12 14:47:40 +01:00
David Baker
4d33438acb c+p fail 2019-08-12 14:46:04 +01:00
David Baker
0b51a5f452 c+p fail 2019-08-12 14:45:15 +01:00
David Baker
115e4c0370 Remove IS access token too 2019-08-12 14:40:11 +01:00
David Baker
ebc84b4445 Merge remote-tracking branch 'origin/dbkr/change_is' into dbkr/disco_is 2019-08-12 14:39:46 +01:00
David Baker
f358b6162d Remove the access token for the old IS 
Pretty important that we don't send that to the new IS...
 2019-08-12 14:38:49 +01:00
David Baker
384f07adb2 Disconnect from IS button 2019-08-12 14:36:48 +01:00
Michael Telatynski
7bdac85a2a Break themes out into a separate file 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-12 14:24:12 +01:00
Michael Telatynski
691b9145ee
Merge pull request #3303 from matrix-org/t3chguy/ModularServerConfig_extend_ServerConfig 
Deduplicate code in ModularServerConfig by extending ServerConfig
 2019-08-12 14:19:17 +01:00
Michael Telatynski
76f5977a2a
Merge pull request #3299 from matrix-org/t3chguy/fix_registrationForm_defaultValue_Field 
RegistrationForm: the Fields are controlled, fix default values
 2019-08-12 13:48:42 +01:00
David Baker
bc088e4472 add comment 2019-08-12 13:31:31 +01:00
David Baker
10b19622db Don't clear field on failure 2019-08-12 13:29:52 +01:00
David Baker
bc66545fd0 shorten url by default 2019-08-12 13:11:05 +01:00
David Baker
06905bc5bb Actually appease linter 2019-08-12 12:05:25 +01:00
David Baker
bf9caa7fd8 add the rest of the files 2019-08-12 11:51:44 +01:00
David Baker
417d9b6af8 nicer way to appease linter 2019-08-12 11:50:11 +01:00
Michael Telatynski
916af736ad Consolidate Themes into ThemeController. Remove hardcoded themes in view 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-11 03:43:34 +01:00
Michael Telatynski
3e08bf6ecb Deduplicate code in ModularServerConfig by extending ServerConfig 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-11 03:34:12 +01:00
Travis Ralston
ffa49df889 Refactor integration manager handling into a common place 
It was already in a common place, but this is the boilerplate for supporting multiple integration managers, and multiple integration manager sources. 

For https://github.com/vector-im/riot-web/issues/4913 / https://github.com/vector-im/riot-web/issues/10161
 2019-08-09 16:08:06 -06:00
David Baker
4075cdde7f lint 2019-08-09 18:59:57 +01:00
Michael Telatynski
75bcd61934
Merge pull request #3298 from matrix-org/t3chguy/Modal.createX_promise 
change Modal async/await signature to use raw promises
 2019-08-09 18:16:40 +01:00
Michael Telatynski
242f23c753 RegistrationForm: the Fields are controlled, fix default values 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-09 18:08:17 +01:00
David Baker
c76514fceb Add UI in settings to change ID Server 
Just changes the current ID server being used

To come in subsequent PRs:
 * Store this in account data
 * Check for terms or support the proper UI for accepting terms when setting
 * Support disconnecting

Part 1 of https://github.com/vector-im/riot-web/issues/10094
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1013
 2019-08-09 18:07:58 +01:00
Michael Telatynski
49c7730503 change Modal async/await signature to use raw promises 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-09 17:29:22 +01:00
Michael Telatynski
a9afdec24a
Merge pull request #3297 from matrix-org/t3chguy/Modal.createX_promise 
Modal.createX return thenable which extends onFinished, for async/await
 2019-08-09 17:16:21 +01:00
Michael Telatynski
13c7149592
Merge pull request #3294 from matrix-org/t3chguy/mount-guard 
Add mount-guards to MImageBody
 2019-08-09 16:55:08 +01:00
Michael Telatynski
7fe078c07a Modal.createX return thenable which extends onFinished, for async/await 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-09 16:47:22 +01:00
David Baker
fcdbce1dda Change throttle to debounce 
And add an explanation of whyI think one's more apropriate than the
other for this.
 2019-08-09 15:30:05 +01:00
Michael Telatynski
72a83a8e6e Add mount-guards to MImageBody 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-09 14:51:07 +01:00
Michael Telatynski
ee3542453e Fix RoomAvatarEvent historic fallback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-09 11:31:04 +01:00
Michael Telatynski
423a74c99c Clean up implementation 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-08 20:21:53 +01:00
Michael Telatynski
28b42d512a Use the room name rather than sender name for fallback room avatar event 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-08 20:07:38 +01:00
J. Ryan Stinnett
3214ed8829
Merge pull request #3289 from matrix-org/jryans/rm-bind-at-reg 
Remove 3PID binding during registration
 2019-08-08 17:48:50 +01:00
J. Ryan Stinnett
c2f81a00c4
Merge pull request #3288 from matrix-org/jryans/user-settings-toggle-3pid 
Add controls for toggling discovery in user settings
 2019-08-08 17:48:17 +01:00
J. Ryan Stinnett
38e64ce966 Remove 3PID binding during registration 
This disables 3PID binding at registration time, so users won't be discoverable
by 3PID by default. Instead, new discovery controls in settings allow you to
opt-in.

Fixes https://github.com/vector-im/riot-web/issues/10424
 2019-08-08 16:25:48 +01:00
Travis Ralston
07d6fa7fdb
Merge pull request #3286 from matrix-org/travis/immutable-dms/basic 
Reuse DMs whenever possible instead of asking to reuse them
 2019-08-08 07:26:17 -06:00
J. Ryan Stinnett
11cf7493d9 Disable binding 3PIDs when adding to account 
Binding 3PIDs on the IS is now handled by a separate step in the Discovery
section of settings.

Fixes https://github.com/vector-im/riot-web/issues/10510
 2019-08-08 11:52:21 +01:00
J. Ryan Stinnett
178d6605c4 Add controls for toggling discovery in user settings 
This adds controls for each 3PID to allow the user to choose whether it's bound
on the IS.

Fixes https://github.com/vector-im/riot-web/issues/10159
 2019-08-08 11:35:35 +01:00
David Baker
54ca7b708e
Merge pull request #3285 from matrix-org/dbkr/work_without_is 
Work with no ID server set
 2019-08-08 09:48:44 +01:00
Travis Ralston
f85898cdca Remove ChatCreateOrReuseDialog 
Part of https://github.com/vector-im/riot-web/issues/10416

All usages of the dialog have been replaced with new DM logic.
 2019-08-07 12:18:41 -06:00
Travis Ralston
24705d02b7 Replace DM logic in view_start_chat_or_reuse 
Part of https://github.com/vector-im/riot-web/issues/10416

This code is used by the welcome bot logic and the groups/communities section of the app. goHomeOnCancel can be removed because no matter what happens we'll end up in a room with the user (and we aren't showing a dialog anymore).
 2019-08-07 12:13:59 -06:00
Travis Ralston
3144b9f1a2 Disable 'Start New Chat' button in MemberInfo if we already have chats 
Part of https://github.com/vector-im/riot-web/issues/10416
 2019-08-07 12:06:27 -06:00
David Baker
9fa5e01f2f Disable password reset if no ID server 2019-08-07 13:30:52 +01:00
David Baker
d31f1ea7f2 Disable addign threepids if no IS configured 2019-08-07 11:51:42 +01:00
David Baker
366f7e277a Make registration work without an IS. 2019-08-07 11:15:56 +01:00
Bruno Windels
66ef08120e
Merge pull request #3282 from matrix-org/bwindels/extract-common-editor-code 
Split MessageEditor up in edit-specifics & reusable parts for main composer
 2019-08-07 07:58:52 +00:00
Travis Ralston
610baff09a
Merge pull request #2668 from azuenko/develop 
Fix waste of space of collapsed left panel
 2019-08-06 13:54:04 -06:00
Michael Telatynski
f6dbeef204
Merge pull request #3257 from matrix-org/t3chguy/slashcommands_help 
Add help slash command
 2019-08-06 18:50:49 +01:00
Michael Telatynski
c022f58f3b
Merge pull request #3278 from matrix-org/t3chguy/electron_keep_alt_menu 
Allow setting in electron whether or not to auto hide menu bar
 2019-08-06 18:20:22 +01:00
Michael Telatynski
daf1a794e6
Merge pull request #3276 from matrix-org/t3chguy/react16_1 
Progress towards React 16 compatibility
 2019-08-06 18:09:30 +01:00
Michael Telatynski
5d048972ab delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-06 18:06:47 +01:00
Michael Telatynski
ae834f8d05 Split out SlashCommandHelpDialog, group by category and style it 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-06 18:03:38 +01:00
Michael Telatynski
71338d5140 Hide settings button on Room Tile Context Menu for myMembership=invite 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-06 16:25:29 +01:00
Michael Telatynski
8c446bbd29
Merge pull request #3279 from matrix-org/t3chguy/remove_withMatrixClient 
Remove withMatrixClient as we are committed to using Contexts
 2019-08-06 14:12:14 +01:00
Michael Telatynski
d99fb4796f avoid using import * as Matrix 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-06 14:04:33 +01:00
J. Ryan Stinnett
accb1eea9f Move existing 3PID settings UX to account directory 2019-08-06 13:03:49 +01:00
J. Ryan Stinnett
aa0a2a579e Add copyright headers 2019-08-06 12:43:30 +01:00
Anton Zuenko
a3eb45e0b9 Fix waste of space of collapsed left panel 
Signed-off-by: Anton Zuenko <anton@zuenko.ru>
 2019-08-05 18:03:20 +02:00
J. Ryan Stinnett
11f2b4320d Update existing 3PID management UX 
This tweaks the appearance of the existing 3PID management UX to use a different
style for the remove button. This styling will more closely match the soon to be
added 3PID discovery settings.

Part of https://github.com/vector-im/riot-web/issues/10159
 2019-08-05 16:34:04 +01:00
Bruno Windels
299cf8542c Split MessageEditor in edit-specifics & reusable part for main composer 2019-08-05 15:31:18 +02:00
David Baker
e8fcfbe2bf
Merge pull request #3280 from matrix-org/bwindels/user-deactivated 
Let user know their account has been deactivated upon trying to login
 2019-08-05 13:23:40 +01:00
Bruno Windels
7a5167b1a3 Let user know their account has been deactivated upon trying to login 2019-08-05 13:48:25 +02:00
Michael Telatynski
224dac3ffb Remove withMatrixClient as we are committed to using Contexts 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-05 12:26:31 +01:00
Michael Telatynski
1e9881dd7d Allow setting in electron whether or not to auto hide menu bar 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-05 11:58:53 +01:00
Michael Telatynski
e400053b69 s/hasCloseX/hasCloseButton/ 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-05 10:45:49 +01:00
Andrew Morgan
f80cbebb9d
Don't switch rooms when forgetting a room (#3275) 
Don't randomly change to another room upon forgetting a room.
 2019-08-05 10:34:46 +01:00
Michael Telatynski
debc124714 Use the documented syntax for default props in CreateReactClass 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-05 10:08:07 +01:00
David Baker
5f45bbd6b7
Merge pull request #3273 from matrix-org/dbkr/dont_load_guest_session 
Don't load guest sessions on post-registration login link
 2019-08-02 17:46:00 +01:00
David Baker
1c156f0a5a Don't load guest sessions on post-registration login link 
If guest access was enabled, clicking the login link on the 'registration
completed' page would just load the guest account you had before registering.

Fixes https://github.com/vector-im/riot-web/issues/10482
 2019-08-02 11:22:42 +01:00
Bruno Windels
9d49a5bb73 pass caret to history manager upon initial render 
otherwise caret is put at editor start when undoing last step
 2019-08-01 11:28:01 +02:00
Bruno Windels
234404e598 add mod+z/y shortcuts, set editor state to what history manager returns 2019-08-01 11:27:09 +02:00
Bruno Windels
98bc0d24f4 push changes to history manager 2019-08-01 11:26:20 +02:00
Michael Telatynski
4694a9bf12
Merge pull request #3263 from matrix-org/t3chguy/prop-types 
Replace React.PropTypes with usage of the `prop-types` package
 2019-07-31 14:24:27 +01:00
Bruno Windels
3e07d29926
Merge pull request #3261 from matrix-org/bwindels/edithistorywarning 
Get rid of warning of required prop
 2019-07-31 11:57:47 +00:00
Michael Telatynski
201d7fb448 Merge branches 'develop' and 't3chguy/prop-types' of github.com:matrix-org/matrix-react-sdk into t3chguy/prop-types 
# Conflicts:
#	test/components/structures/MessagePanel-test.js
 2019-07-31 12:21:00 +01:00
Michael Telatynski
1087e04bb5 Replace React.PropTypes with usage of the prop-types package 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-31 12:19:29 +01:00
J. Ryan Stinnett
fb77802d54
Merge pull request #3260 from matrix-org/t3chguy/hide_msg_action_buttons_on_perms 
Introduce RoomContext for sharing state between RoomView and children
 2019-07-31 11:43:26 +01:00
J. Ryan Stinnett
c338f8bf1f Add room context to test 2019-07-31 11:17:28 +01:00
J. Ryan Stinnett
ddf558b3ed Fix context when using subtree of components 2019-07-31 11:10:49 +01:00
Bruno Windels
17e838e23b this is optional, and not provided for first edit 2019-07-31 09:47:02 +02:00
Michael Telatynski
4517fea496 Introduce RoomContext for sharing state between RoomView and children 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-31 00:47:38 +01:00
J. Ryan Stinnett
5bb68b4b3b Display lookup errors in the UI 2019-07-30 17:41:26 +01:00
J. Ryan Stinnett
4ebafb93c3 Rename isAccessToken to identityAccessToken 2019-07-30 17:37:48 +01:00
J. Ryan Stinnett
dacb5d42ac Support IS v2 auth in preview bar 2019-07-30 17:37:48 +01:00
J. Ryan Stinnett
244b613623 Convert 3PID lookup in preview bar to async / await 2019-07-30 17:37:48 +01:00
J. Ryan Stinnett
4d01d6a5b1 Move auth steps to IdentityAuthClient 2019-07-30 17:37:48 +01:00
J. Ryan Stinnett
432e70e2ce Add IS auth to AddressPickerDialog 2019-07-30 17:35:36 +01:00
J. Ryan Stinnett
dd792e10a9 Convert 3PID lookup in address picker to async / await 2019-07-30 17:35:35 +01:00
Bruno Windels
e855a056c7
Merge pull request #3247 from matrix-org/bwindels/editortests 
Unit tests for new editor
 2019-07-30 14:46:33 +00:00
Michael Telatynski
106af39a82
Merge pull request #3255 from matrix-org/t3chguy/hide_msg_action_buttons_on_perms 
Show MessageActionBar buttons conditionally on room state permissions
 2019-07-29 23:11:19 +01:00
Michael Telatynski
c70e404f65
Merge pull request #3249 from matrix-org/t3chguy/AddressPickerDialog_pasting 
Handle onPaste AddressPickerDialog, allow addressing CSV/NL/Space delim list
 2019-07-29 23:10:35 +01:00
Michael Telatynski
90a3fedbef Add close button to Slash Commands /help dialog 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-29 22:33:56 +01:00
Michael Telatynski
883b3d1563 iterate PR based on feedback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-29 22:30:07 +01:00
Michael Telatynski
31ab97772c Match code-style better 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-29 22:27:31 +01:00
Michael Telatynski
f45b1bfdda Fix StubRoom for react-sdk tests 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-29 13:18:02 +01:00
Michael Telatynski
856e161c8b add Debug 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-29 12:54:09 +01:00
Michael Telatynski
48f219f090 null-guard 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-29 12:28:30 +01:00
Michael Telatynski
7b2e18ff7c Show MessageActionBar buttons conditionally on room state permissions 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-29 12:13:23 +01:00
Michael Telatynski
bf1d65623c Move history with alt up/down regardless of where selection is 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-29 11:31:22 +01:00
Michael Telatynski
a97e2e6ef2 clean up onPaste error handling in AddressPickerDialog 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-25 21:49:22 +01:00
Michael Telatynski
c9e1c68726 Handle onPaste AddressPickerDialog, allow addressing CSV/NL/Space delim list 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-25 21:45:32 +01:00
Bruno Windels
9bfba9db3e make PartCreator a bit more testable by not asking for deps of dep 2019-07-25 14:50:20 +02:00
J. Ryan Stinnett
cef67d5784
Merge pull request #3245 from matrix-org/jryans/tooltip-larger-buffer 
Tweak interactive tooltip buffer area allow for overshoot
 2019-07-25 13:16:20 +01:00
J. Ryan Stinnett
f5fbd30a28 Tweak interactive tooltip buffer area allow for overshoot 
This uses a larger buffer area around the tooltip, as it easy to overshoot and
mouse the cursor past the tooltip.

Fixes https://github.com/vector-im/riot-web/issues/10400
 2019-07-25 12:17:07 +01:00
J. Ryan Stinnett
7296fb8fd3
Merge pull request #3243 from matrix-org/jryans/app-perm-url 
Keep widget URL in permission screen to one line
 2019-07-25 11:38:24 +01:00
J. Ryan Stinnett
a5ac50f90f
Merge pull request #3242 from matrix-org/jryans/terms-modal 
Avoid visual glitch when terms appear for Integration Manager
 2019-07-24 14:27:43 +01:00
Bruno Windels
ac31b4b8f4
Merge pull request #3244 from matrix-org/bwindels/diffhtmledits 
Show diff for formatted messages in the edit history
 2019-07-24 09:59:23 +00:00
Bruno Windels
3753e5261d Implement diffing html messages in the edit history 2019-07-24 11:28:56 +02:00
J. Ryan Stinnett
2d4264c39d Keep widget URL in permission screen to one line 
This keeps the widget URL to one line max, so that the allow button will always
be visible. The full URL can be viewed by hovering.

Fixes https://github.com/vector-im/riot-web/issues/10402
 2019-07-23 18:06:37 +01:00
J. Ryan Stinnett
846a908bb4 Add missing copyright header 2019-07-23 17:52:00 +01:00
Bruno Windels
e73690439f
Merge pull request #3239 from matrix-org/bwindels/redirectpastetocomposer 
Redirect paste to composer when event target can't receive input
 2019-07-23 16:38:55 +00:00
J. Ryan Stinnett
39d5aa7cf4 Avoid visual glitch when terms appear for IM 
This avoids a visual glitch where the Integration Manager portal would briefly
appear, but then be replaced by a smaller Terms dialog when there's something to
agree to.

To resolve this minimal code churn, this cheats a bit and customises the size of
the terms dialog to match the IM portal modal when terms are shown for IM
purposes.

Fixes https://github.com/vector-im/riot-web/issues/10386
 2019-07-23 15:11:38 +01:00
Bruno Windels
58fd828944
Merge pull request #3241 from matrix-org/bwindels/dofocuscomposer 
Restore manual composing focusing logic
 2019-07-23 11:55:44 +00:00
David Baker
2eb8a8879b
Merge pull request #3199 from matrix-org/dbkr/terms 
ToS for ISes/IMs: prompt on use screen
 2019-07-23 10:32:11 +01:00
Bruno Windels
82d7617287 add comments 2019-07-23 09:44:17 +02:00
Bruno Windels
ceb53dc0bb Revert "remove unnessary manual focussing of composer" 
This reverts commit 57abbc4273.
 2019-07-23 09:13:51 +02:00
David Baker
84bb0eb696 Remove random capital 2019-07-22 12:25:12 +01:00
J. Ryan Stinnett
09c2d899ac Defer IM token until widget is shown and permission granted 
This defers the work to request the IM token when displaying a widget until
after we know that widget will actually be shown and the user has granted
permission for this widget to be displayed.

This is useful in general to avoid making unnecessary token checks, but it's
particularly helpful with the new Terms API, so that we only show the Terms flow
when widget are actually being used (as opposed to entering the room where
widgets exist, but haven't been shown / permitted).

Part of https://github.com/vector-im/riot-web/issues/10088
 2019-07-22 11:50:54 +01:00
Bruno Windels
023130bb4b Redirect paste to composer when event target can't receive input 2019-07-19 17:49:04 +02:00
Bruno Windels
84e2333105
Merge pull request #3226 from matrix-org/bwindels/readmarker-invisble-events 
Move read marker past invisible events
 2019-07-19 15:10:03 +00:00
Bruno Windels
c335c04c75
Merge pull request #3238 from matrix-org/bwindels/diffplainedits 
Basic diff visualisation for plain text edits
 2019-07-19 14:41:53 +00:00
Bruno Windels
c713172a37 add proptypes 2019-07-19 16:34:50 +02:00
Bruno Windels
de1c4e0cfe better naming 2019-07-19 16:34:39 +02:00
Bruno Windels
f305d8ac08 Basic diff visualisation for plain text edits 2019-07-19 16:09:23 +02:00
Bruno Windels
77f5274cd8 don't focus composer on keydown with modifier 
this breaks shortcuts like copy, ...
 2019-07-19 09:10:20 +02:00
Bruno Windels
4fa7302f69
Merge pull request #3224 from matrix-org/bwindels/focus-composer-on-type 
Focus composer when typing anywhere in the app
 2019-07-18 16:10:23 +00:00
Bruno Windels
aca41fe80a dont show remove button for original event in edit history 2019-07-18 14:09:29 +02:00
J. Ryan Stinnett
599c49613f Remove reactions feature flag 
Fixes https://github.com/vector-im/riot-web/issues/10282
 2019-07-17 17:00:36 +01:00
J. Ryan Stinnett
674f33917f Remove editing feature flag 
Part of https://github.com/vector-im/riot-web/issues/10282
 2019-07-17 16:56:15 +01:00
Bruno Windels
03f577bea9 use keydown here, as its a div element 2019-07-17 17:23:19 +02:00
Bruno Windels
50c88279a0 remove non-existing keypress handler 2019-07-17 17:05:56 +02:00
Bruno Windels
4bde0c08ad make sure we don't break any A or BUTTON keyboard handling 2019-07-17 16:53:12 +02:00
Bruno Windels
10a74696b3 hack around React having its own bubbling phase 2019-07-17 16:50:05 +02:00
J. Ryan Stinnett
fc8cdc5661 Improve interactive tooltip safe mousing area 
This adds a more complex trapezoidal safe area between the button that triggers
the tooltip and the tooltip itself. It should be easier to move from the button
into the tooltip without accidentally closing it.

Fixes https://github.com/vector-im/riot-web/issues/10185
 2019-07-17 14:11:27 +01:00
Bruno Windels
3d4cd8aa1c local echos should always be ignored (for both RM and RR),so remove flag 
pending events won't be in liveEvents (where we look) anyway
 2019-07-17 10:19:44 +02:00
Bruno Windels
c94715150d as both RM and RR move past invisible events, remove the flag 2019-07-17 10:18:51 +02:00
Bruno Windels
741ae9957b also put read marker past (like RR) invisible events 2019-07-17 10:15:09 +02:00
Michael Telatynski
df26840d9e ChatCreateOrReuse show only rooms both you and the other party still in 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-15 23:07:59 +01:00
Travis Ralston
2471f92331
Merge pull request #3218 from matrix-org/travis/check-when-dead 
Check for liveliness on submission when the server was previously dead
 2019-07-15 14:46:55 -06:00
Travis Ralston
2bc0e8e151 Don't rely on React being fast 2019-07-15 10:51:08 -06:00
Bruno Windels
57abbc4273 remove unnessary manual focussing of composer 
now that composer is focused automatically when no other shortcuts
apply, remove the manual focusing we have in place where it's not needed
 2019-07-15 18:21:10 +02:00
Bruno Windels
4adea67eb3 focus the composer in the body keydown handler if not other shortcuts apply 
this allows the user to start typing a message even if the composer is not focused.
 2019-07-15 18:12:45 +02:00
Travis Ralston
d08cb70fa6
Merge pull request #3219 from matrix-org/travis/fix-delay 
Fix autocomplete delay text field not accepting text
 2019-07-15 09:30:33 -06:00
Travis Ralston
3fcbd46939
Merge pull request #3220 from matrix-org/travis/kick-reason 
Don't show a reason if there's no reason for a kick/ban
 2019-07-15 09:30:19 -06:00
Bruno Windels
7e25e1b2fc remove unneeded else 2019-07-15 14:02:41 +02:00
Bruno Windels
034883dc7e improve comments 2019-07-15 14:01:28 +02:00
Bruno Windels
8ac54661be take adjacent no-tile events in combination with ignored events into account when determining the last displayed event 2019-07-15 12:53:39 +02:00
Travis Ralston
31339aa11f Don't show a reason if there's no reason for a kick/ban 
Fixes https://github.com/vector-im/riot-web/issues/9677
 2019-07-14 23:31:38 -06:00
Travis Ralston
345dbce6e4 Fix autocomplete delay text field not accepting text 
SettingsStore.setValue is async (fire&forget) however getValueAt is cached. Theory was supposed to be that getValueAt local echos, however the animation loop of React is probably just too fast to actually make the local echo happen.

Fixes https://github.com/vector-im/riot-web/issues/9907
 2019-07-14 23:28:23 -06:00
Travis Ralston
c6a18b11f0 Check for liveliness on submission when the server was previously dead 
Fixes https://github.com/vector-im/riot-web/issues/10017

Specifically the `return` at the end of the diff fixes the problem, but it seems worthwhile to check for liveliness when we know the server has been dead in previous attempts.
 2019-07-14 23:23:48 -06:00
Travis Ralston
78ba22d12e
Merge pull request #3206 from matrix-org/travis/tombstone-autojoin 
Autojoin rooms when clicking the tombstone
 2019-07-12 08:14:42 -06:00
Travis Ralston
ff0c4c0571
Merge pull request #3211 from matrix-org/travis/send-proper-uia 
Send the correct UIA alongside the wrong UIA for backwards comaptibility
 2019-07-12 08:14:01 -06:00
Travis Ralston
5f98e4ea61
Merge pull request #3213 from matrix-org/travis/remove-is-flag 
Remove unused identityEnabled property from ValidatedServerConfig
 2019-07-12 08:11:55 -06:00
David Baker
28c3578b02
Merge pull request #3205 from matrix-org/travis/soft-logout-copy 
Remove misleading text about admins logging people out from soft logout
 2019-07-12 12:32:24 +01:00
J. Ryan Stinnett
b27c1a45e4 Adjust spelling on debug log screen 2019-07-12 09:42:02 +01:00
Bruno Windels
7fc19e61a9
Merge pull request #3210 from matrix-org/bwindels/prevent-autocomplete-on-paste 
Prevent autocomplete on paste, and verserev-ing text before and after :
 2019-07-12 08:25:06 +00:00
Travis Ralston
7a3aa9be2e Remove unused identityEnabled property from ValidatedServerConfig 
See https://github.com/vector-im/riot-web/issues/10229
 2019-07-11 15:11:09 -06:00
Travis Ralston
ba5238d86a Finally fix tests 2019-07-11 15:01:56 -06:00
Travis Ralston
733401652b Close settings after deactivating 
Fixes https://github.com/vector-im/riot-web/issues/9566
 2019-07-11 14:54:49 -06:00
Travis Ralston
5958cf0693 Merge branch 'develop' into travis/soft-logout-copy 2019-07-11 14:47:13 -06:00
Travis Ralston
862fb16120 Send the correct UIA alongside the wrong UIA for backwards comaptibility 
Fixes https://github.com/vector-im/riot-web/issues/10312
 2019-07-11 14:28:10 -06:00
Travis Ralston
c89a864a82 update copy 2019-07-11 12:54:26 -06:00
Bruno Windels
507b89fc61 manually attach input event handler, as React doesn't pass inputType 2019-07-11 18:46:56 +02:00
Travis Ralston
000d545ffd Remove misleading text about admins logging people out from soft logout 2019-07-11 09:18:33 -06:00
Travis Ralston
5f9a123a80 Require an issue URL (or notes) on rageshakes 
Fixes https://github.com/vector-im/riot-web/issues/8155
 2019-07-11 09:14:31 -06:00
Travis Ralston
ed2f88fd79 Autojoin rooms when clicking the tombstone 
Fixes https://github.com/vector-im/riot-web/issues/10299
 2019-07-11 08:39:41 -06:00
David Baker
99d1ed5efe s/terms/policies/ 2019-07-11 14:48:18 +01:00
David Baker
18dde859af
s/terms/policies/ 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-07-11 14:46:20 +01:00
Michael Telatynski
56b1775209
Merge pull request #3198 from matrix-org/t3chguy/kick 
Show anything other than ban/invite -> leave as a kick
 2019-07-11 11:33:53 +01:00
David Baker
f77e7fc3e8 Use m.accepted_terms account data 
To remember what policies the user has agreed to
 2019-07-11 10:53:45 +01:00
J. Ryan Stinnett
9b3848d083
Merge pull request #3200 from matrix-org/jryans/stylelint-all-files 
Run stylelint on all SCSS files
 2019-07-11 09:38:18 +01:00
Bruno Windels
dd12824a52
Merge pull request #3195 from matrix-org/bwindels/include-orig-in-history 
Show original event in edit history
 2019-07-11 08:10:01 +00:00
Travis Ralston
2a54fe321f Use the state variable for the password when deactivating 
The Field is controlled, so we should be using the state. Otherwise the value is undefined, which means we don't supply the required auth.

Fixes https://github.com/vector-im/riot-web/issues/10302
Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/3071
 2019-07-10 11:26:09 -06:00
J. Ryan Stinnett
38d6953bf6 Manually fix remaining stylelint issues 2019-07-10 16:56:40 +01:00
David Baker
0316aa11b7 Rest of terms/policies renaming 2019-07-10 15:12:05 +01:00
Travis Ralston
ce11eff1b8 Simplify parameter check 2019-07-10 08:01:32 -06:00
David Baker
8de5c348f3 focus is a bit silly if its starts disabled 2019-07-10 14:33:20 +01:00
David Baker
06c0bce053 These can be pure components 2019-07-10 14:32:37 +01:00
David Baker
72b1ad37a2
Remove random space 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-07-10 14:30:48 +01:00
David Baker
fcf82efc7c
Bots isn't a proper noun so no real reason for it to get a capital 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-07-10 14:17:42 +01:00
David Baker
189dd4c7b1 SERVICE_TYPES 2019-07-10 12:08:26 +01:00
Michael Telatynski
8d4356a5b9 Show anything other than ban/invite -> leave as a kick 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-10 08:57:00 +01:00
Travis Ralston
2ca6633fda Update copy as per design 2019-07-09 23:55:20 -06:00
Travis Ralston
041379fa3c Don't refuse the soft logout page if the user is soft logged out 2019-07-09 23:44:14 -06:00
Travis Ralston
1eb60ef1c4 Support SSO for rehydrating a soft-logged-out session. 
Fixes https://github.com/vector-im/riot-web/issues/10238
 2019-07-09 20:16:44 -06:00
David Baker
83f697a9a2 lint 2019-07-09 19:01:22 +01:00
David Baker
d4af8d4993 Use showIntegrationsManager in other places 2019-07-09 18:56:39 +01:00
David Baker
54aaabac74 Initial support for ToS dialogs for IS/IM 
as per MSC2140
 2019-07-09 18:51:56 +01:00
Travis Ralston
4b1d78e04d Merge branch 'develop' into travis/soft-logout-design 2019-07-09 11:35:49 -06:00
Travis Ralston
a33e5f1918
Merge pull request #3188 from matrix-org/travis/soft-logout-non-default-hs 
Fix React crash when using a non-default homeserver on soft logout
 2019-07-09 11:32:31 -06:00
Travis Ralston
370fa27de3
Merge pull request #3187 from matrix-org/travis/soft-logout-keys 
Change soft logout rehydrate text if there's pending key backups
 2019-07-09 11:32:17 -06:00
Travis Ralston
7b869f2824
Merge pull request #3182 from matrix-org/travis/soft-logout-rehydrate 
Ask for the user's password to rehydrate their soft logged out session
 2019-07-09 11:31:51 -06:00
Bruno Windels
11718a982a use originalEvent if present and append it to list 2019-07-09 17:54:59 +02:00
Bruno Windels
31723e9e5b
Merge pull request #3194 from matrix-org/bwindels/fix-history-redactions 
Don't try to call bodyToHtml with an empty content
 2019-07-09 15:05:03 +00:00
Bruno Windels
7ab665bf31
Merge pull request #3193 from matrix-org/bwindels/replace-server-date 
Take server-side aggregation into account for timestamp on (edited) tooltip
 2019-07-09 15:03:21 +00:00
Bruno Windels
f03187190e Don't try to call bodyToHtml with an empty content 
with the stripReply flag, this crashes.
 2019-07-09 15:00:26 +02:00
Michael Telatynski
349afb13f3
Merge pull request #3164 from matrix-org/t3chguy/fix_proptypes_mismatches 
Fix some React errors
 2019-07-09 10:59:29 +01:00
Bruno Windels
58d7ed02b7 use method that also takes server aggregations into account for tooltip date 2019-07-09 11:31:29 +02:00
Travis Ralston
ab63e8bd04 Remove backwards compat function 2019-07-08 11:55:00 -06:00
Travis Ralston
d2ab0a5ca7 Move key backup init to componentDidMount 2019-07-08 11:53:26 -06:00
Travis Ralston
3e0be640fd Merge branch 'travis/soft-logout-rehydrate' into travis/soft-logout-keys 2019-07-08 11:52:58 -06:00
Travis Ralston
c3383e9315 Move _initLogin to componentDidMount 2019-07-08 11:51:22 -06:00
Bruno Windels
f6e71b2335 turn flag into options object 2019-07-08 16:55:56 +02:00
Bruno Windels
e601037cd2 don't show reply fallback in edit history 2019-07-08 15:32:38 +02:00
Bruno Windels
888e4d1ec2 preserve reply fallback when editing 2019-07-08 15:25:44 +02:00
Michael Telatynski
dd27891ee9
Merge pull request #3191 from matrix-org/t3chguy/lightbox_remove_no_pl 
Don't show Remove button in ImageView if can't redact, delint ImageView
 2019-07-08 10:23:51 +01:00
Bruno Windels
7a482461dd
Merge pull request #3180 from matrix-org/bwindels/history-actions 
Edit history actions
 2019-07-08 08:19:27 +00:00
Bruno Windels
1af2ca6b36 constistent jsx bracket and indent styling 2019-07-08 10:12:26 +02:00
Bruno Windels
cf11a3758f set analyticsInfo for dialogs 2019-07-08 10:12:04 +02:00
Michael Telatynski
c2905bd33b make things a tad saner 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-06 11:16:01 +01:00
Michael Telatynski
89ece266c6 Make id used in EditableItemList unique, namespace mx_EditableItemList_* 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-06 11:15:10 +01:00
Michael Telatynski
6b9c6a31f0 Don't show Remove button in ImageView if can't redact, delint ImageView 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-06 10:42:14 +01:00
Michael Telatynski
040e580cf0
Merge pull request #3183 from matrix-org/t3chguy/editing_while_replying 
Don't allow editing via up-arrow when Replying
 2019-07-06 08:53:22 +01:00
Michael Telatynski
000f7e8007
Merge pull request #3103 from matrix-org/t3chguy/edit_skip_if_no_edit 
If oldContent matches newContent, skip sending the edit
 2019-07-06 08:52:58 +01:00
Travis Ralston
ae79ce97f3 Dress up the soft logout page to look like the design 
Fixes https://github.com/vector-im/riot-web/issues/10262

Also fixes showing the user ID twice. We might have a User object which helpfully sets the display name to the user ID, so check for that.
 2019-07-05 15:05:31 -06:00
Travis Ralston
ca6563dce4 Merge branch 'travis/soft-logout-rehydrate' into t1 2019-07-05 15:03:24 -06:00
Travis Ralston
1f1a5b2aac Fix React crash when using a non-default homeserver on soft logout 
The function used exists on the peg, not the client. This commit also fixes the name of the function in a backwards compatible way.
 2019-07-05 14:35:21 -06:00
Travis Ralston
55b4ef2169 Change soft logout rehydrate text if there's pending key backups 
Fixes https://github.com/vector-im/riot-web/issues/10263
Requires https://github.com/matrix-org/matrix-js-sdk/pull/982
 2019-07-05 13:52:14 -06:00
Travis Ralston
d39b4e9c7c Merge branch 'travis/soft-logout-rehydrate' into travis/soft-logout-keys 2019-07-05 13:41:04 -06:00
J. Ryan Stinnett
017fc84862
Merge pull request #3184 from matrix-org/jryans/reactions-send-marks-unread 
Track live events in timeline and use for read receipts and read markers
 2019-07-05 17:55:59 +01:00
J. Ryan Stinnett
74431fe8b1
Merge pull request #3186 from matrix-org/jryans/reactions-allow-text 
Allow diplayed reaction values to contain anything
 2019-07-05 16:35:06 +01:00
J. Ryan Stinnett
87188e9229
Merge pull request #3185 from matrix-org/jryans/tooltip-target-null 
Fix interactive tooltip null target error
 2019-07-05 16:28:12 +01:00
J. Ryan Stinnett
eb0e1eade4 Clamp reaction content width to at most 100px 
Part of https://github.com/vector-im/riot-web/issues/10256
 2019-07-05 16:18:16 +01:00
J. Ryan Stinnett
2a8f9a81f7 Allow diplayed reaction values to contain anything 
Part of https://github.com/vector-im/riot-web/issues/10256
 2019-07-05 16:18:06 +01:00