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

9144 commits

Author SHA1 Message Date
Travis Ralston
7da9e0582f Rename DMInviteDialog to be a generic Invite Dialog 2020-01-16 13:42:34 -07:00
Travis Ralston
372861c9df Merge branch 'develop' into travis/ftue/user-lists/5.3-go-button 2020-01-16 13:36:59 -07:00
David Baker
83b1505401 Add a ToastStore 
To store toast. Rather than them being stored in the state of the
ToastContainer component, they now have a dedicated store. This mostly
fixes problems involving showing toasts when the app loaded because
we would otherwise have a race condition where something tries to
show a toast before the ToastContainer is mounted.
 2020-01-16 20:23:47 +00:00
Travis Ralston
d1fcef1211 Merge branch 'develop' into bwindels/verification-right-panel 2020-01-16 13:23:32 -07:00
Travis Ralston
cd9fc72fff Merge branch 'develop' into t3chguy/rightpanel 2020-01-16 10:04:18 -07:00
Michael Telatynski
0f61aa57ff
Apply suggestions from code review 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2020-01-16 17:00:04 +00:00
Travis Ralston
64c4677699
Merge pull request #3842 from matrix-org/t3chguy/fix_isModified 
Fix timing of when Composer considers itself to be modified
 2020-01-16 09:54:36 -07:00
Travis Ralston
564a30b7be
Merge pull request #3852 from matrix-org/travis/fix-member-avatar 
Fix not being able to open profiles from the timeline
 2020-01-16 09:47:17 -07:00
Travis Ralston
4ea2a2fee4 Merge branch 'develop' into t3chguy/fix_isModified 2020-01-16 09:46:28 -07:00
J. Ryan Stinnett
89230395eb
Merge pull request #3847 from matrix-org/jryans/cross-signing-setup 
Add post-login complete security flow
 2020-01-16 16:42:23 +00:00
Travis Ralston
869fd0b2c9 Fix not being able to open profiles from the timeline 
MemberAvatar was referencing the wrong dispatcher (it was imported as `dis`, like everywhere else, not `dispatcher`).

Fixes https://github.com/vector-im/riot-web/issues/11887
 2020-01-16 09:40:11 -07:00
Zoe
82c5349c4e Updated to properly handle logic 2020-01-16 16:31:50 +00:00
J. Ryan Stinnett
5926e277c4 Avoid logged in event race 2020-01-16 11:52:02 +00:00
Zoe
9ac3cb6fd0 Merge remote-tracking branch 'origin/develop' into zip/11225-shields-distinguish-encrypt-from-verify 2020-01-16 11:23:57 +00:00
Zoe
ff05041a5a Update room shield icons to represent encrypted but unverified chats in less alarmed tones 2020-01-16 11:10:23 +00:00
Travis Ralston
b137cd21d3 Replace the selected range instead of force-setting it 
This gives people the option of cutting parts or all of their message.
 2020-01-15 21:04:18 -07:00
Travis Ralston
be3ef2b50e Remove all text when cutting in the composer 
The previous function did in fact remove the elements, but left the model thinking there was a zero-length string. This approach deletes the text from the model and the DOM, resulting in the placeholder being shown when cutting all the text.

Part of https://github.com/vector-im/riot-web/issues/11378
 2020-01-15 19:08:14 -07:00
Travis Ralston
cad9562f8d
Merge pull request #3828 from krkc/develop 
Added cut/copy and pasting user pills from editor.
 2020-01-15 15:36:33 -07:00
J. Ryan Stinnett
71fa3222fe
Fix component index import 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2020-01-15 22:11:22 +00:00
J. Ryan Stinnett
6e027badc0
Tweak comparison 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2020-01-15 22:10:59 +00:00
J. Ryan Stinnett
27ee90cad5 Add post-login complete security flow 
This adds a step after login to complete security for your new session. At the
moment, the only verification method is entering your SSSS passphrase, but nicer
paths will be added soon.

This new step only appears when crypto is available and the account has
cross-signing enabled in SSSS.

Fixes https://github.com/vector-im/riot-web/issues/11214
 2020-01-15 21:53:36 +00:00
Travis Ralston
dd88809622 Fix imports for help & support tab 
This was missed, somehow, in the sourcemaps stuff. The tab currently breaks the dialog on load.
 2020-01-15 12:02:34 -07:00
Travis Ralston
d763d7e633 Merge branch 'develop' into travis/ftue/user-lists/5.2-i18n 2020-01-15 10:49:38 -07:00
Travis Ralston
0529efc5cd
Merge pull request #3840 from matrix-org/travis/ftue/user-lists/5.1-suggestions 
Improve the quality of invite suggestions by filtering out DMs
 2020-01-15 10:49:00 -07:00
Travis Ralston
7bfb3686cd
Merge pull request #3839 from matrix-org/travis/sourcemaps 
Fix sourcemaps by refactoring the build system
 2020-01-15 10:11:33 -07:00
Travis Ralston
8b6a5d37aa Remove simulated error state used for screenshot 2020-01-14 23:35:45 -07:00
Travis Ralston
b9852c7264 Appease the linter 2020-01-14 23:35:07 -07:00
Travis Ralston
443744733d Move DM creation logic into DMInviteDialog 
Fixes https://github.com/vector-im/riot-web/issues/11645

The copy hasn't been reviewed by anyone and could probably use some work.
 2020-01-14 23:32:00 -07:00
Michael Telatynski
d37c19d785 Fix timing of when Composer considers itself to be modified 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-15 00:27:54 +00:00
Michael Telatynski
5a5a0d2233 Merge branches 'develop' and 't3chguy/rightpanel' of github.com:matrix-org/matrix-react-sdk into t3chguy/rightpanel 2020-01-15 00:03:18 +00:00
David Baker
fa174512cc
Merge pull request #3837 from matrix-org/dbkr/dont_error_on_unknown_devices 
Don't error on unverified/unknown devices.
 2020-01-14 17:12:14 +00:00
Zoe
1fd1e4b953
Merge pull request #3835 from matrix-org/zip/11832-more-padlock-icons 
Padlock icons in room header (behind feature_cross_signing)
 2020-01-14 14:15:46 +00:00
Zoe
f617fb7bbe Place RoomHeader privacy padlocks behind the crosssigning feature flag 2020-01-14 10:31:01 +00:00
Travis Ralston
76183fc8fd Appease the linter 2020-01-13 21:21:18 -07:00
Travis Ralston
b69b284efa Humanize the recent DM rooms ourselves for translations 2020-01-13 21:20:01 -07:00
Travis Ralston
9188183c9b Improve the quality of invite suggestions by filtering out DMs 
This helps the small rooms from being scored highly, bringing out users you've not seen in a long while.
 2020-01-13 21:04:13 -07:00
Travis Ralston
90c7535a69 Export VIEWS from MatrixChat for riot-web tests 2020-01-13 20:15:58 -07:00
David Baker
14501b748b lint again 2020-01-13 21:58:26 +00:00
David Baker
9a1be1a24d Don't try to set crypto options without crypto enabled 2020-01-13 21:54:14 +00:00
J. Ryan Stinnett
9cedfeb007
Merge pull request #3825 from aaronraimist/lock 
Emoji verification: Change name of 🔒 to lock
 2020-01-13 21:32:58 +00:00
Travis Ralston
bf6798e109 Appease the linter 2020-01-13 13:28:33 -07:00
Travis Ralston
5fd27a10bb Merge branch 'develop' into travis/sourcemaps 2020-01-13 11:19:41 -07:00
David Baker
e47240d838 Lint Eastwood 2020-01-13 17:56:40 +00:00
David Baker
d53016e8fc Room padlock decorations only if cross-signing is enabled 
Put the padlock decorations behind the labs flag as without the
context of the shields on the room icons they can be a bit misleading
and make people think it means 'encrypted'.
 2020-01-13 17:53:49 +00:00
David Baker
76fe87c941 Don't error on unverifie/unknownd devices. 
When cross-signing is enabled, we no longer want to fail and
prompt the user to ack every device in the room. All the info should
be conveyed in the shield colour (although isn't fully just yet).

Fixes https://github.com/vector-im/riot-web/issues/11750
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1150
 2020-01-13 17:41:58 +00:00
Zoe
397637d59d used classnames module 2020-01-13 15:08:07 +00:00
Zoe
0bd2ecd798 lint 2020-01-13 14:51:10 +00:00
Zoe
e43174c636 Show padlock in room headers for invite-only rooms 
Fixes #11832
 2020-01-13 14:49:23 +00:00
Christopher
59ea865e8e Added missing semicolon. 2020-01-13 14:29:42 +00:00
Michael Telatynski
66b55495bb Fix right panel buttons highlighting 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-13 12:40:45 +00:00
J. Ryan Stinnett
8fc85797a7 Guard against missing members in avatars 
Part of https://github.com/vector-im/riot-web/issues/11744
 2020-01-13 12:40:40 +00:00
J. Ryan Stinnett
dd652f6af3
Merge pull request #3832 from matrix-org/jryans/community-user-list-fire 
Repair community member info panel
 2020-01-13 12:38:24 +00:00
J. Ryan Stinnett
77b479d50c Guard against missing members in avatars 
Part of https://github.com/vector-im/riot-web/issues/11744
 2020-01-13 12:29:10 +00:00
J. Ryan Stinnett
56a7b6c33e
Merge pull request #3831 from matrix-org/jryans/feature-presence-indicator 
Add feature flag around the presence indicator in room list
 2020-01-13 12:25:00 +00:00
Zoe
edd08c279c
Merge pull request #3821 from matrix-org/zip/11226-padlock-icons 
Display a padlock icon beside invite-only rooms (excluding DMs) in the room list
 2020-01-13 12:20:32 +00:00
Michael Telatynski
9c686bf501 Fix right panel buttons highlighting 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-13 12:15:54 +00:00
Zoe
878c5b5b52 removed unnecessary lint rule 2020-01-13 12:11:19 +00:00
J. Ryan Stinnett
2168e7ec0c Add feature flag around the presence indicator in room list 
This adds a feature flag (disabled by default for now) around the room list
presence indicator, as it still needs some tweaking before it's ready for
production use.

Part of https://github.com/vector-im/riot-web/issues/11799
 2020-01-13 11:48:55 +00:00
Zoe
422d4cd73a small simplification in code as .getContent() will always return an object 2020-01-13 11:18:24 +00:00
Christopher
c370b28694 #11378. Added cut/copy and pasting user pills from editor. 2020-01-12 16:19:24 +00:00
Zoe
54c69b4630 this is what we call fast iteration 2020-01-10 17:47:39 +00:00
Z. E. Cat
1b75909cad
Update src/components/views/rooms/RoomTile.js 
Co-Authored-By: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-10 17:36:33 +00:00
Zoe
fbabe79647 use getContent() instead 2020-01-10 17:35:57 +00:00
Z. E. Cat
fb587cc62c
Update src/components/views/rooms/RoomTile.js 
Co-Authored-By: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-10 17:33:37 +00:00
Zoe
bebfd60daf Very fastidiously check for null/undefined 2020-01-10 17:22:09 +00:00
Zoe
df1fd4db72 suppress private icon if the room is a DM 2020-01-10 16:49:07 +00:00
Zoe
808785c2f8 lint 2020-01-10 16:43:36 +00:00
Zoe
5551b207c1 Actually, this task was about join rules, not encryption ones. Oops. 2020-01-10 16:33:08 +00:00
Zoe
cb250c9b10 Use existing available props data to determine whether a room is encrypted, thereby allowing a state update to properly rerender the tile 2020-01-10 13:09:16 +00:00
David Baker
4a78faae4c
Merge pull request #3826 from matrix-org/dbkr/roomview_listener_leak 
Fix listener leak on RoomView
 2020-01-10 11:25:36 +00:00
David Baker
63942d5200 Fix listener leak on RoomView 
It looks like this was causing entire detached DOM trees to leak
in memory by react's internal fibers holding onto them from the
component.
 2020-01-10 11:12:52 +00:00
Aaron Raimist
6cf5b3f1a2 Emoji verification: Change name of 🔒 to lock 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-01-09 21:56:28 -06:00
Travis Ralston
135c84251c Fix more imports post-merge 2020-01-09 14:19:19 -07:00
Travis Ralston
dc914774fb Delete files that were conflicting in the merge and deleted on develop 2020-01-09 14:19:19 -07:00
Travis Ralston
19f78d4d97 Fix class construction in MemberList 2020-01-09 14:17:33 -07:00
Travis Ralston
727ce892de Fix remaining RoomView conflict 
RoomContext was pulled out to its own file.
 2020-01-09 14:17:33 -07:00
Travis Ralston
3e5cc9550b Fix import merge conflicts, removing any that aren't needed anymore 
Many imports were removed as part of refactoring work, so here we are.
 2020-01-09 14:17:33 -07:00
Travis Ralston
fde32f13a5 [CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop 2020-01-09 14:15:09 -07:00
Travis Ralston
d40091afc5
Merge pull request #3820 from matrix-org/travis/ftue/user-lists/4.5.5-paste 
Support pasting a bunch of identifiers into the invite dialog
 2020-01-09 14:13:55 -07:00
Travis Ralston
ad33a2322e
Merge pull request #3819 from matrix-org/travis/ftue/user-lists/4.5-3pids 
Support 3PIDs (email addresses) in the invite dialog
 2020-01-09 14:13:32 -07:00
Travis Ralston
ba73600cf0
Merge pull request #3815 from matrix-org/travis/ftue/user-lists/4-composer 
Wire up the invite targets dialog to a real composer and show selections
 2020-01-09 13:57:22 -07:00
Travis Ralston
cb9e4376b8 Fix flow comment 2020-01-09 13:39:50 -07:00
Travis Ralston
f452ea225a
FlowJS is not Flow 2020-01-09 12:31:16 -07:00
Michael Telatynski
0a9d7f43c6 pass the correct phase params for consistency 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-09 15:51:19 +00:00
Michael Telatynski
7dfc392a2b Merge branches 'develop' and 't3chguy/rightpanel' of github.com:matrix-org/matrix-react-sdk into t3chguy/rightpanel 2020-01-09 15:48:06 +00:00
Zoe
5d22561815 Display a padlock icon beside encrypted rooms in the room list 
https://github.com/vector-im/riot-web/issues/11226
 2020-01-09 15:42:31 +00:00
Michael Telatynski
245a68b3ba Merge branches 'develop' and 't3chguy/clean_up_TextualBody' of github.com:matrix-org/matrix-react-sdk into t3chguy/clean_up_TextualBody 
 Conflicts:
	yarn.lock
 2020-01-09 12:17:21 +00:00
Michael Telatynski
8116ac74ce
Update src/components/views/context_menus/MessageContextMenu.js 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2020-01-09 12:10:44 +00:00
Travis Ralston
1d9d706b9c
Merge pull request #3789 from matrix-org/t3chguy/render_html_entities_in_og-description 
Render encoded html entities in og:description
 2020-01-08 21:38:31 -07:00
Travis Ralston
4ad4437f33 Support pasting a bunch of identifiers into the invite dialog 
Part of https://github.com/vector-im/riot-web/issues/11199
 2020-01-08 21:21:08 -07:00
Travis Ralston
6e5de1893b Bind handlers to this 2020-01-08 21:01:53 -07:00
Travis Ralston
ab5d82b5ac Appease the linter 2020-01-08 20:53:20 -07:00
Travis Ralston
79ab69353c Support searching for 3PIDs from the invite dialog 
Part of https://github.com/vector-im/riot-web/issues/11199
 2020-01-08 20:49:29 -07:00
Travis Ralston
4936e16a15 Remove unused ThreepidMember class for now 
It's going to be used for future work in this area, but for this particular PR it isn't needed.
 2020-01-07 12:21:14 -07:00
Travis Ralston
45a44b9102 Appease the linter 2020-01-07 12:20:02 -07:00
Travis Ralston
091bfdeaa0 Add checkmarks to selected individuals 2020-01-07 12:13:40 -07:00
Travis Ralston
ffd40c2c40 Initial editor for user list selection 
For https://github.com/vector-im/riot-web/issues/11199
 2020-01-07 12:13:40 -07:00
Michael Telatynski
a62c260f79 Fix userinfo for users not in the room 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-07 12:58:24 +00:00
Michael Telatynski
653f31b22d
Merge pull request #3752 from matrix-org/t3chguy/fix_react_complaining 
Add bunch of null-guards and similar to fix React Errors/complaints
 2020-01-06 21:42:27 +00:00
Michael Telatynski
163df614f3
Merge pull request #3807 from matrix-org/t3chguy/fix_AliasSettings 
Delegate all room alias validation to the RoomAliasField validator
 2020-01-06 21:26:00 +00:00