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

19653 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
a062fe0096 Merge branches 'develop' and 't3chguy/context_menus' of github.com:matrix-org/matrix-react-sdk into t3chguy/context_menus 2019-12-02 23:20:47 +00:00
Michael Telatynski
a17df6dd38
Merge pull request #3689 from matrix-org/t3chguy/dont_trap_context_menu_keyboard 
Do not trap Key ContextMenu into composer for keyboard a11y
 2019-12-02 11:37:24 +00:00
Michael Telatynski
947753b04a
Merge pull request #3690 from matrix-org/t3chguy/case_insensitive_emoji_picker_filtering 
Make EmojiPicker filtering case-insensitive
 2019-12-02 10:28:10 +00:00
Michael Telatynski
7a3b8a522f Make EmojiPicker filtering case-insensitive 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-02 10:18:02 +00:00
Michael Telatynski
e2733a27c4 add null-guard 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-02 10:06:58 +00:00
Michael Telatynski
3ad4b0fb64 Do not trap Key ContextMenu into composer for keyboard a11y 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-02 10:01:08 +00:00
Travis Ralston
f4b1c4f360 Remove useless file 2019-11-29 15:13:46 -07:00
Travis Ralston
9cae685e22
Merge pull request #3686 from matrix-org/travis/theme-fix 
Ensure the settings page accurately represents theme choices
 2019-11-29 10:17:55 -07:00
Travis Ralston
1c766d8594
Merge pull request #3688 from matrix-org/travis/rr-fix 
Ensure read receipts end up with a valid reference to checkUnmounting
 2019-11-29 07:41:49 -07:00
Travis Ralston
7b1ee944c8
Merge pull request #3687 from matrix-org/travis/rr-velocity 
Convert Velociraptor component to a class
 2019-11-29 07:41:17 -07:00
Travis Ralston
5aad914c25
Merge pull request #3675 from aaronraimist/labs-explain 
Add a link to the labs feature documentation
 2019-11-28 22:07:47 -07:00
Aaron Raimist
4c50ac0e56
Improve wording 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-11-28 22:22:42 -06:00
Travis Ralston
36f9fab474 Ensure read receipts end up with a valid reference to checkUnmounting 
Fixes https://github.com/vector-im/riot-web/issues/11496
Fixes https://github.com/vector-im/riot-web/issues/11385
Fixes https://github.com/vector-im/riot-web/issues/10007
Fixes https://github.com/vector-im/riot-web/issues/9769

React does (kinda) bind `this._isUnmounting` for us in the context of the EventTile, but the EventTile then passes the function straight through to the ReadReceiptMarker component, which then binds it in the context of EventTile. This results in `this._mounted` being falsey all the time, preventing the ReadReceiptMarker from hitting the code where it updates rrInfo in its unmount. 

The velocity stuff is smart enough to realize that it has a read receipt and shuffles everything over by one, but when it goes to check the starting height (which will be null/undefined because the RRMarker didn't update it) it assumes it has never seen the receipt before and appends it again - this is what causes some holes/stacking.

By forcefully binding the `this._isUnmounting` function we ensure that the `this._mounted` variable is correctly referenced in the context of the MessagePanel, allowing the RRMarker to update its position, and therefore allowing the velocity behaviour to be consistent.
 2019-11-28 19:45:37 -07:00
Travis Ralston
24843cf25e Convert Velociraptor to a class 2019-11-28 19:36:30 -07:00
Michael Telatynski
bfb5706b4a don't consume all keys 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-28 20:51:21 +00:00
Michael Telatynski
29b59dde5b undo unrelated change 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-28 20:44:08 +00:00
Travis Ralston
37ec7e6f7e Ensure the settings page accurately represents theme choices 
Fixes https://github.com/vector-im/riot-web/issues/11518

This also fixes a bug where the the theme logic can incorrectly get stuck in the light theme - the ThemeController was overriding *all* values, not just supposed themes. Null values aren't overridden so that the various theme logic bits don't assume the user has chosen the light theme explicitly.
 2019-11-28 13:40:28 -07:00
Michael Telatynski
811454462d fix Stickerpicker and MessageContextMenu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-28 20:38:58 +00:00
Michael Telatynski
3847996b5b transition Tooltips over to deprecated code 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-28 20:26:09 +00:00
Michael Telatynski
2daf3a96bf delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-28 18:42:38 +00:00
Michael Telatynski
6c5b777a77 Consolidate all except tooltips 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-28 18:16:59 +00:00
Michael Telatynski
5a540f5949 Migrate MemberStatusMessageAvatar over to new Context Menus 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-28 16:40:45 +00:00
Michael Telatynski
ecf51a0569 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-28 16:28:53 +00:00
Michael Telatynski
6d69ec17d9 Merge branches 'develop' and 't3chguy/context_menus' of github.com:matrix-org/matrix-react-sdk into t3chguy/context_menus 
 Conflicts:
	src/components/views/context_menus/RoomTileContextMenu.js
 2019-11-28 16:25:59 +00:00
Travis Ralston
25809c54a7
Merge pull request #3682 from matrix-org/travis/fix-calltype-i18n 
Improve translatable strings for calls
 2019-11-28 09:16:52 -07:00
Travis Ralston
01ba4aca45
Merge pull request #3680 from matrix-org/travis/fix-list-diff 
Don't assume that diffs will have an appropriate child node
 2019-11-28 09:10:43 -07:00
Travis Ralston
fde116458c
Words are hard 2019-11-28 09:08:24 -07:00
Travis Ralston
90a1cb68eb
Merge pull request #3681 from matrix-org/travis/fix-jitsi 
Fix persisted widgets getting stuck at loading screens
 2019-11-28 09:06:44 -07:00
Travis Ralston
c1d5d20b86
Merge pull request #2959 from matrix-org/t3chguy/clear_notifications 
Add button to clear all notification counts, sometimes stuck in historical
 2019-11-28 09:06:35 -07:00
Travis Ralston
96ffe94876 Merge remote-tracking branch 'origin/develop' into t3chguy/clear_notifications 2019-11-27 19:27:52 -07:00
Travis Ralston
ac8afe6dd1
Merge pull request #3679 from matrix-org/travis/fix-invite-errors 
Fix multi-invite error dialog messaging
 2019-11-27 17:06:19 -07:00
Travis Ralston
3b5aa5e9b8
Update src/RoomInvite.js 
Co-Authored-By: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-27 16:57:44 -07:00
Travis Ralston
97515511ce Improve translatable strings for calls 
Fixes https://github.com/vector-im/riot-web/issues/11507
 2019-11-27 13:03:51 -07:00
Travis Ralston
7b013ecc69 Fix persisted widgets getting stuck at loading screens 
The widget itself is rendered underneath the loading screen, so we just have to disable the loading state.

This commit also removes the "is" attribute because React 16 includes unknown attributes: https://reactjs.org/blog/2017/09/08/dom-attributes-in-react-16.html

Fixes https://github.com/vector-im/riot-web/issues/11536
 2019-11-27 12:54:31 -07:00
Travis Ralston
673e6c3162 Don't assume that diffs will have an appropriate child node 
Fixes https://github.com/vector-im/riot-web/issues/11497

This is a regression from react-sdk v1.5.0 where the diff feature was added in the first place. It only affects lists.
 2019-11-27 12:26:43 -07:00
Travis Ralston
275bd33a6c Move the description into the relevant branch 2019-11-27 10:48:05 -07:00
Travis Ralston
d6821ecb99 Fix multi-invite error dialog messaging 
Fixes https://github.com/vector-im/riot-web/issues/11515
 2019-11-27 10:44:36 -07:00
Travis Ralston
fbba55ab05
Merge pull request #3670 from matrix-org/travis/toggle-communities 
Make the communities button behave more like a toggle
 2019-11-27 07:52:05 -07:00
J. Ryan Stinnett
54d6b6aa73 Flip JS SDK back to develop 2019-11-27 13:31:44 +00:00
RiotRobot
6223ca8243 Merge branch 'master' into develop 2019-11-27 10:39:33 +00:00
RiotRobot
1a98c0d04e v1.7.4 2019-11-27 10:38:35 +00:00
RiotRobot
25b5921ddf Prepare changelog for v1.7.4 2019-11-27 10:38:35 +00:00
RiotRobot
d9e322bbca Upgrade to JS SDK 2.4.5 2019-11-27 10:32:21 +00:00
David Baker
dd7b08ec25
Merge pull request #3674 from matrix-org/dbkr/read_marker_css_transition 
Change read markers to use CSS transitions
 2019-11-27 09:18:53 +00:00
Matthew Hodgson
f0430d341b
Merge pull request #3677 from matrix-org/matthew/font-smoothing 
fix font smoothing to match figma
 2019-11-27 01:07:47 +00:00
Matthew Hodgson
bb7cc20b1a fix font smoothing to match figma 
as per https://github.com/vector-im/riot-web/issues/11425

with apologies to https://usabilitypost.com/2012/11/05/stop-fixing-font-smoothing/ :/
 2019-11-27 00:45:49 +00:00
Aaron Raimist
98c47265c9
Fix indentation 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-11-26 15:01:02 -06:00
Aaron Raimist
7905e6cc3b
Add a link to the labs feature documentation 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-11-26 14:31:48 -06:00
J. Ryan Stinnett
c2c8b1b6e0 Clarify that cross-signing is in development 
In an attempt to clarify the state of this highly anticipated feature, this
updates the labs flag name to match.

Part of https://github.com/vector-im/riot-web/issues/11492
 2019-11-26 12:06:13 -07:00
David Baker
a2e3f64963 Change read markers to use CSS transitions 
Removes one of the two places we use Velocity, so we're one step
closer to getting rid of it for good.

Should therefore fix the fact that Velocity is leaking data entries
and therefore <hr> elements.

Hopefully also makes the logic in getEventTiles incrementally simpler,
if still somwewhat byzantine.
 2019-11-26 19:06:02 +00:00