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

2953 commits

Author SHA1 Message Date
Zoe
51fb3b494f lint and i18n 2020-01-20 15:25:28 +00:00
Zoe
f77eb07849 Verify individual messages via cross-signing 
Fixes #11880
 2020-01-20 15:16:41 +00:00
David Baker
277f107924 Set flag before mutating on cut too 2020-01-20 13:03:09 +00:00
David Baker
2ed5d89c9f Fix arrows keys moving through edit history 
Different fix that fixes https://github.com/vector-im/riot-web/issues/11817
by setting the flag before the callback rather than having the update
method set the flag.

Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/3842
Fixes https://github.com/vector-im/riot-web/issues/11917
 2020-01-20 12:20:21 +00:00
Travis Ralston
43f97af805
Merge pull request #3848 from matrix-org/travis/fix-cut 
Remove all text when cutting in the composer
 2020-01-16 15:03:41 -07:00
Travis Ralston
4ea2a2fee4 Merge branch 'develop' into t3chguy/fix_isModified 2020-01-16 09:46:28 -07: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
Michael Telatynski
2230b7732a rearrange 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-16 01:45:16 +00:00
Michael Telatynski
781db63fa6 split out home/end handling into a helper as not all roving-tab-index widgets want it 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-16 01:35:42 +00:00
Michael Telatynski
2b37fe7624 do some renaming 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-16 00:40:08 +00:00
Michael Telatynski
e6ab18c9ba Merge branches 'develop' and 't3chguy/roving' of github.com:matrix-org/matrix-react-sdk into t3chguy/roving 
 Conflicts:
	src/components/views/rooms/RoomList.js
 2020-01-16 00:31:43 +00: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
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
Michael Telatynski
dedf1eab31 Iterate to get rid of the magic group and just provide a generic functional render wrapper 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-15 11:37:14 +00:00
Michael Telatynski
5252cf4c45 Implement roving tab index context based magic thing and demo on LeftPanel 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-15 02:44:22 +00: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
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
5fd27a10bb Merge branch 'develop' into travis/sourcemaps 2020-01-13 11:19:41 -07: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
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
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
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
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
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
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
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
Michael Telatynski
64754a3f88 Add comment and delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-06 00:18:24 +00:00
Michael Telatynski
d31c863563 Remove all usages of slate in favour of CIDER 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-06 00:15:48 +00:00
Michael Telatynski
4bea87f00d Merge branches 'develop' and 't3chguy/render_html_entities_in_og-description' of github.com:matrix-org/matrix-react-sdk into t3chguy/render_html_entities_in_og-description 
 Conflicts:
	package.json
 2020-01-05 22:23:03 +00:00
Michael Telatynski
378a82e6fb Use html-entities instead 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-05 22:22:09 +00:00
Travis Ralston
9edc361afc Use new imports for js-sdk's ContentRepo 
Per f4d1c5c006
 2020-01-03 12:29:22 -07:00
J. Ryan Stinnett
76f3a08909
Merge pull request #3800 from matrix-org/jryans/key-backup-dialogs-4s 
Update key backup creation and recovery paths for SSSS
 2020-01-03 16:32:02 +00:00
David Baker
2125bcf5a6 Comment remaining non-cross-signing-compliant components 
Fixes https://github.com/vector-im/riot-web/issues/11748
 2020-01-03 15:38:59 +00:00
J. Ryan Stinnett
b8683462e8 Update backup creation paths for SSSS 
This updates the various backup creation entry points to ensure they support
creating with secret storage if the feature flag is enabled.
 2020-01-03 15:34:05 +00:00
J. Ryan Stinnett
4211ec5063 Fix DOM structure in RoomRecoveryReminder 
Buttons (which end up as <div>s) aren't allowed inside <p>s.
 2020-01-03 13:51:45 +00:00
J. Ryan Stinnett
99559c5121 Update backup restore paths for SSSS 
This updates all the various key backup entry points to ensure they use a flow
that supports backups stored under secret storage.
 2020-01-03 13:33:36 +00:00
David Baker
89ac476281 Unused import 2020-01-02 16:59:46 +00:00
David Baker
39777620a3 order copyright lines by date 2020-01-02 16:58:00 +00:00
David Baker
ffba19bd61 Remove E2eIcon onClick 
It displayed the Encrypted Event Info dialog, but this full of
super advanced debug information and base64 strings that no normal
users should ever have to see. It's still accessible via the comtext
menu (ie. the same place as 'View Source').
 2020-01-02 16:52:25 +00:00
Michael Telatynski
4489b5a21a Escape HTML in og:description and render any html &-encoded entities 2019-12-28 20:05:55 +00:00
Travis Ralston
98571d706f Fix NPE when searching for rooms 
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/3751
 2019-12-27 11:31:15 -07:00
Michael Telatynski
eac66f020f
Merge pull request #3783 from matrix-org/t3chguy/fuzzy_sort_memberlist 
fuzzy-sort MemberList
 2019-12-27 17:19:19 +00:00
Michael Telatynski
f9e386adaa Improve SORT_REGEX 2019-12-27 17:04:14 +00:00
Michael Telatynski
2b39f3bdf1
Merge pull request #3784 from matrix-org/t3chguy/fix_stickerPickerChevronOffset 
Fix sticker picker chevron offset calculation
 2019-12-27 16:52:46 +00:00
Michael Telatynski
9bdadd2103
Merge pull request #3751 from matrix-org/t3chguy/react16_contexts_online_dot 
Room Tile DMs online/active green dot
 2019-12-27 16:50:21 +00:00
Michael Telatynski
ed24f19a3f Fix stick picker chevron offset calculation 2019-12-26 20:12:50 +00:00
Michael Telatynski
ab12288979 Add more punctuation to regex 2019-12-26 19:29:25 +00:00
Michael Telatynski
e320f64ba1 fuzzy-sort MemberList 2019-12-26 19:27:04 +00:00
Michael Telatynski
e95b67e101 Only show it if exactly 2 members, until we get Canonical DMs 2019-12-26 18:15:08 +00:00
Michael Telatynski
22fe0add3c Make UserOnlineDot more generic 2019-12-26 18:14:46 +00:00
Michael Telatynski
659644e612
Merge pull request #3773 from matrix-org/t3chguy/fix_incoming_call_dup 
Fix duplicate Incoming Call prompt on Community Invite sublist
 2019-12-23 18:10:51 +00:00
Michael Telatynski
e552195701 Fix duplicate Incoming Call prompt on Community Invite sublist 2019-12-23 17:57:53 +00:00
Michael Telatynski
1098fc939a
Merge pull request #3771 from matrix-org/t3chguy/ReactDOM.findDOMNode 
stop using ReactDOM.findDOMNode in componentWillUnmount, use refs
 2019-12-23 17:16:47 +00:00
Michael Telatynski
207045e979 fix ReadReceiptMarker ref 2019-12-23 12:54:31 +00:00
Michael Telatynski
17f5849985 stop using ReactDOM.findDOMNode in componentWillUnmount, use refs 2019-12-23 12:24:49 +00:00
Travis Ralston
0d2cb6e731 Import haveTileForEvent() from the right place 2019-12-22 21:23:07 -07:00
Travis Ralston
d002c2ccde Merge branch 'travis/babel7-wp-es6-export' into travis/sourcemaps-es6 2019-12-22 21:20:13 -07:00
Travis Ralston
f1ac3d2f64 Convert imports to ES6 from CommonJS 
This is needed because `require()` means something different in webpack - it ends up importing the module as something we didn't expect (and is occasionally async)
 2019-12-22 21:16:06 -07:00
Travis Ralston
042bd35d79 Fix MatrixClientPeg imports 2019-12-22 21:15:54 -07:00
Travis Ralston
806d728d59 Import from the js-sdk's src/ directory 
Because ES6 and such.
 2019-12-22 21:14:33 -07:00
Travis Ralston
d56f0f2a25 Convert many imports to handle ES6 exports 
Reliant upon https://github.com/matrix-org/matrix-react-sdk/pull/3761
 2019-12-22 21:04:42 -07:00
Travis Ralston
4aec432b30 Convert the more complicated CommonJS exports to ES6-style 2019-12-22 21:01:03 -07:00
Travis Ralston
344dac4fb9 Convert CommonJS exports to ES6-compatible exports 
We use `export default` begrudgingly here. Ideally we'd use just `export`, though this entire SDK expects things to be exported as a default. Instead of breaking everything, we'll sacrifice our export pattern for a smaller diff - a later commit can always do the default export -> regular export conversion.
 2019-12-22 21:01:02 -07:00
Michael Telatynski
24a1017d6d
Fix typo in comment 2019-12-21 20:26:32 +00:00
Michael Telatynski
e936f7eb09 Fix room list filtering weird case sensitivity 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-21 11:13:37 +00:00
Michael Telatynski
24d0d0d596
Merge pull request #3743 from matrix-org/t3chguy/react16_contexts 
Migrate away from React Legacy contexts API
 2019-12-19 20:32:11 +00:00
Michael Telatynski
a410cc004f
Merge pull request #3745 from matrix-org/t3chguy/get_rid_of_emoji_stripped_data 
Get rid of stripped-emoji.json in favour of an in-memory single source of truth
 2019-12-19 19:25:50 +00:00
Michael Telatynski
e54429680b tidy up 2019-12-19 15:28:11 +00:00
Michael Telatynski
26980e2ad5 apply unhomoglyph when filtering room list to fuzzify it 2019-12-19 15:26:04 +00:00
Michael Telatynski
db069b9602 delint 2019-12-19 14:33:46 +00:00
Michael Telatynski
6c1944359e Add RoomTile online indicator to DMs 2019-12-19 14:29:46 +00:00
Michael Telatynski
d35b01b63a Get rid of stripped-emoji.json in favour of an in-memory single truth source 2019-12-18 15:40:19 +00:00
Michael Telatynski
da4d72b3c4 delint 2019-12-17 17:34:03 +00:00
Michael Telatynski
937b32663c Migrate away from Legacy React Contexts 2019-12-17 17:26:12 +00:00
Michael Telatynski
d28a892bb0 Stop using KeyboardEvent.keyCode as it is deprecated 2019-12-16 17:14:03 +00:00
David Baker
be914c7b0c
Merge pull request #3728 from matrix-org/jryans/verify-users 
Verify users when cross-signing enabled
 2019-12-16 10:12:46 +00:00
J. Ryan Stinnett
2df72bfde2 Update room / user decoration for cross-signing 2019-12-13 17:57:26 +00:00
Michael Telatynski
17a42cd287 Make LInkPreviewWidget close button Keyboard & SR Accessible 2019-12-13 14:02:50 +00:00
Travis Ralston
225695ab5c Fix exports for rate limited functions and MatrixClientPeg 
MatrixClientPeg in particular doesn't work very well with this.
 2019-12-12 19:33:08 -07:00
Travis Ralston
7230d51cca
Merge pull request #3703 from matrix-org/travis/right-panel-v2 
Refactor RightPanel to match expected behaviour
 2019-12-11 10:50:45 -07:00