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

2902 commits

Author SHA1 Message Date
Michael Telatynski
e455aa474d improve copy further 2020-01-21 17:58:53 +00:00
Michael Telatynski
a8df058ea6 tidy up, improve wording on modal 2020-01-21 17:54:27 +00:00
Michael Telatynski
9f7df33bc3 re-arrange to split the async task into two and only wait on the user-blocking one 2020-01-21 16:57:07 +00:00
Michael Telatynski
b34fe45518 First attempt. Has a lag issue due to the async-clear :( 2020-01-21 16:50:04 +00:00
Michael Telatynski
060938379a Fix changes after typing / at pos=0 allowing to cancel command 2020-01-21 15:58:51 +00:00
Michael Telatynski
b5e902e1f2 Fix escaping commands using double-slash //, e.g //plain sends /plain 2020-01-21 15:55:21 +00:00
Michael Telatynski
26bba4416b Fix emoticon space completion for upper case emoticons like :D xD 2020-01-21 10:12:23 +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
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
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