Commit Graph

29983 Commits (07fa535513745c9488214da1756bbefb088f612e)

Author SHA1 Message Date
David Baker 07fa535513 Merge remote-tracking branch 'origin/develop' into dbkr/line_1_2 2020-12-10 16:11:29 +00:00
David Baker 89240b84fb Only want margins on the large view 2020-12-10 15:52:03 +00:00
Travis Ralston 18a60ae2ea
Merge pull request #5484 from matrix-org/travis/remove-dead-feature
Remove impossible labs feature: sending hidden read receipts
2020-12-10 08:24:05 -07:00
David Baker 80be46bc32 Fix vertical scrolling in videoview
Fixes https://github.com/vector-im/element-web/issues/15886
2020-12-10 15:18:22 +00:00
David Baker 8e66fea7ca
Merge pull request #5456 from matrix-org/dbkr/call_ui_height
Fix height of Remote Video in call
2020-12-10 13:49:47 +00:00
David Baker 026b4422a8 Merge remote-tracking branch 'origin/develop' into dbkr/call_ui_height 2020-12-10 12:36:51 +00:00
David Baker 5282c6bbe8 Merge remote-tracking branch 'origin/develop' into dbkr/line_1_2 2020-12-10 12:36:11 +00:00
David Baker f987908d04
Merge pull request #5446 from matrix-org/dbkr/hold_ui
Add UI for hold functionality
2020-12-10 12:30:59 +00:00
Travis Ralston 80d6629c3e delete the rest too 2020-12-09 18:50:16 -07:00
Travis Ralston 27df6ae6e1 Remove impossible labs feature: sending hidden read receipts
This claims it requires a compatible homeserver, but that does not exist and hasn't for years. Let's just remove the option to stop giving people false hope.

Once notifications are decoupled from read receipts, this sort of thing should be more possible.
2020-12-09 18:36:48 -07:00
J. Ryan Stinnett 083fecbddb
Merge pull request #5411 from aaronraimist/searchbox-fix-width
Allow SearchBox to expand to fill width
2020-12-09 20:14:02 +00:00
Travis Ralston af69ba9c79
Merge pull request #5451 from iokiwi/new/room-alias-in-permalink
Use room alias in generated permalink for rooms
2020-12-09 12:07:44 -07:00
Travis Ralston 560a8412d0
Merge pull request #5482 from matrix-org/travis/fix-confetti
Only show confetti if the current room is receiving an appropriate event
2020-12-09 12:06:50 -07:00
Travis Ralston 3e3a32cf10 Only show confetti if the current room is receiving an appropriate event 2020-12-09 11:56:57 -07:00
Michael Telatynski d05ad1e36c
Merge pull request #5481 from matrix-org/t3chguy/fix/15905
Throttle RoomState.members handler to improve performance
2020-12-09 12:53:34 +00:00
Michael Telatynski 91ae8df423
Merge pull request #5477 from matrix-org/t3chguy/fix/15913
Handle manual hs urls better for the server picker
2020-12-09 11:32:33 +00:00
Michael Telatynski 5be65a525d Improve identifiers and code readability 2020-12-09 11:14:06 +00:00
Michael Telatynski 412d84ccb2 improve comments 2020-12-09 11:09:18 +00:00
Michael Telatynski ecb0b0113f Also use `getJoinedMemberCount` as its capable of using the room summary member count instead
Leave the useRoomMembers hook for future use as it is very useful.
2020-12-09 11:07:40 +00:00
Michael Telatynski 184c73cca4 Throttle RoomState.members handler to improve performance
Lazy Loading emits a RoomState.members for each member which in the case of a room like
Matrix HQ means it happens over 8000 times in a very short span of time causing the UI
to lock up.
2020-12-09 11:02:30 +00:00
Aaron Raimist 918326631f
fix lint
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-12-08 14:35:05 -06:00
David Baker 8f24656603 Make margins & header font match widgets 2020-12-08 19:26:57 +00:00
David Baker 70964e43f6 Fix font weights in hold text 2020-12-08 19:05:58 +00:00
J. Ryan Stinnett 5f4320e80d
Merge pull request #5479 from matrix-org/jryans/add-olm
Add Olm as a dev dependency for types
2020-12-08 16:50:23 +00:00
J. Ryan Stinnett 49bd7887d2 Add Olm as a dev dependency for types
Fixes https://github.com/vector-im/element-web/issues/15803
2020-12-08 16:18:12 +00:00
Michael Telatynski 05e6b52191
Merge pull request #5476 from matrix-org/t3chguy/fix/15895
Hide Invite to this room CTA if no permission
2020-12-08 15:33:33 +00:00
Michael Telatynski 9a9b0433ce
Merge pull request #5478 from matrix-org/t3chguy/fix/15923
Fix width of underline in server picker dialog
2020-12-08 15:32:06 +00:00
Travis Ralston 36c65b8684
Merge pull request #5475 from matrix-org/travis/confetti-2
Fix confetti room unread state check
2020-12-08 07:54:39 -07:00
Michael Telatynski d77c5b46eb Fix width of underline in server picker dialog 2020-12-08 11:56:42 +00:00
David Baker 4a009d480d Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui 2020-12-08 11:48:14 +00:00
Michael Telatynski e896b009f1 Handle manual hs urls better 2020-12-08 10:58:16 +00:00
Michael Telatynski 9f9699bf75 Hide Invite to this room CTA if no permission 2020-12-08 10:31:40 +00:00
Travis Ralston f30d2ff1c5 Fix confetti room unread state check
Turns out that if you want confetti from other people you would need to have rooms on "All Messages" or higher - this isn't as fun for those of us who have most of our rooms as Mentions Only.
2020-12-07 16:54:09 -07:00
Travis Ralston 603a1c8ffb Fix linter 2020-12-07 15:37:26 -07:00
Travis Ralston 87dbc82a9f Merge branch 'feature_confetti#14676' into develop 2020-12-07 15:12:45 -07:00
Travis Ralston 550a5220d9 Undocumented linter cleanup 2020-12-07 15:12:26 -07:00
Travis Ralston 2c992c456e Merge remote-tracking branch 'origin/develop' into feature_confetti#14676 2020-12-07 14:58:56 -07:00
Travis Ralston f5ce50a472
Merge pull request #5391 from su-ex/fix-inverted-settings-default
Fix inverted settings default value
2020-12-07 14:51:28 -07:00
Michael Telatynski 14600adf66
Merge pull request #5474 from matrix-org/t3chguy/socials
Improve usability of the Server Picker Dialog
2020-12-07 20:08:04 +00:00
David Baker b9d70cb1a3 Fix indentation 2020-12-07 18:40:29 +00:00
David Baker 365d6982ce Add secondary call avatar to main voice content view 2020-12-07 18:28:43 +00:00
David Baker 8a58c9dea0 Update UI for two calls in the PiP view
and also merge hold_ui changes
2020-12-07 17:56:36 +00:00
David Baker 747d743bd0 Add 60% opacity black over the avatars when on hold 2020-12-07 16:22:57 +00:00
Michael Telatynski 499f7e8af7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials 2020-12-07 16:08:11 +00:00
Michael Telatynski d06a00bcce Improve usability of the Server Picker Dialog 2020-12-07 16:05:41 +00:00
David Baker 3b25a3be98 Smaller avatar, more padding on text 2020-12-07 15:42:35 +00:00
David Baker c7f1d97b1a Round off the sharp corners
Before you have someone's eye out
2020-12-07 15:38:55 +00:00
Michael Telatynski 52ada641ba
Merge pull request #5473 from schwukas/fixed-typos
Fix typos in some strings
2020-12-07 14:35:30 +00:00
Lukas 9bb04a857b Add generated i18n json 2020-12-07 15:21:31 +01:00
J. Ryan Stinnett 07a1754768
Merge pull request #5472 from matrix-org/dependabot/npm_and_yarn/highlight.js-10.4.1
Bump highlight.js from 10.1.2 to 10.4.1
2020-12-07 12:58:21 +00:00