OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
39,881 Commits
203 Branches
553 Tags
428 MiB
Commit Graph

476 Commits (bf2bb26cda5929d4d78fed4601b0694edb0373a5)

Author SHA1 Message Date
Šimon Brandner 2a22f03a6a
Support InfoTooltip kinds 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 14:40:27 +02:00
Robin Townsend 555b2e3266 Reuse Spinner styles for InlineSpinner 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-16 08:00:54 -04:00
Robin Townsend 74cc00b319 Merge branch 'develop' into better-spinners 2021-05-16 07:47:34 -04:00
Tulir Asokan cc919452b5 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-05-07 00:07:51 +03:00
Michael Telatynski d9912651d6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17176 
 Conflicts:
	src/components/structures/SpaceRoomDirectory.tsx
 2021-05-06 13:06:50 +01:00
Michael Telatynski 81b97590f6 fix styling of the disabled danger_outline button 2021-05-05 16:51:46 +01:00
Michael Telatynski acce9a4548 Fix rounded progress bars 2021-05-05 11:50:55 +01:00
Tulir Asokan 09f9916916 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-05-01 15:37:32 +03:00
Robin Townsend 3a62f6cdaa Merge branch 'develop' into better-spinners 2021-04-26 14:12:44 -04:00
Robin Townsend d3db5fe77f Vectorize mini avatar uploader spinner 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-04-26 14:10:09 -04:00
Šimon Brandner dad7a22055
Initial code for dynamic minZoom 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-24 08:03:39 +02:00
Michael Telatynski ca07b1ed04
Update res/css/views/elements/_FacePile.scss 
Co-authored-by: Germain <germain@souquet.com>
 2021-04-22 09:06:53 +01:00
Michael Telatynski 60828913d2 Iterate the spaces face pile design 2021-04-22 08:13:03 +01:00
Tulir Asokan b8ef67e447 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-04-19 13:37:27 +03:00
Travis Ralston ac00c80efb
Merge pull request #5521 from SimonBrandner/improve-image-view 
Improve image view
 2021-04-13 19:01:27 -06:00
RiotRobot 8af81ea90f Revert "Change to inset" 
Safari doesn't support `inset`.

This reverts commit b3706b682e.
 2021-04-12 14:37:11 +01:00
J. Ryan Stinnett 19d7ccac07 Rename toggle to view 2021-04-12 13:56:09 +01:00
J. Ryan Stinnett b3706b682e Change to inset 2021-04-12 13:56:09 +01:00
J. Ryan Stinnett 32049f849c Remove blur effect 2021-04-12 13:56:09 +01:00
J. Ryan Stinnett 650421eefb Tweak appearance of invite reason 
This adjusts the display of invite reasons to match design feedback.

Fixes https://github.com/vector-im/element-web/issues/16869
 2021-04-12 13:56:09 +01:00
Šimon Brandner 7f496c7bf5
Add comment: same on all themes 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-09 08:04:07 +02:00
Šimon Brandner 12a36d1a30
This is hopefully not true anymore 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-02 10:44:40 +02:00
Šimon Brandner 535ae086b4
Make sender bold 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-02 08:31:42 +02:00
Šimon Brandner 9606297f7c
Merge branch 'develop' into improve-image-view 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-02 08:15:51 +02:00
Tulir Asokan c31967dc97 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-03-26 21:31:28 +02:00
Michael Telatynski 4341dfb314 Iterate facepiles, fix default avatar alignment and sort explicit avatars first 2021-03-26 11:55:22 +00:00
Michael Telatynski 09601f1071 Add display name tooltip to the facepile avatars 2021-03-26 00:05:05 +00:00
Michael Telatynski ea77ab125e Show a face pile on a space preview 2021-03-25 16:15:34 +00:00
Šimon Brandner c96d2621a0
Set max-width and MIN_ZOOM 
This might have some side effects but as far as I can tell they shouldn't be too problematic

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-16 19:57:14 +01:00
Šimon Brandner 8f6f9cd6fa
Remove some unnecessary CSS and set MIN_ZOOM to 95 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-15 20:37:39 +01:00
Šimon Brandner 9c313854d0
Increase defautl size 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-15 19:23:40 +01:00
Šimon Brandner b27a8e3c3a
Merge branch 'develop' into improve-image-view 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-14 08:30:28 +01:00
Tulir Asokan 8c8b46b984 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-03-12 14:18:12 +02:00
Michael Telatynski 081e745417
Merge pull request #5751 from matrix-org/t3chguy/spaces4.7 
Rebuild space previews with new designs
 2021-03-11 14:06:31 +00:00
J. Ryan Stinnett 6a939c4de8
Merge pull request #5727 from matrix-org/matthew/rework-cross-signing-login 
Rework cross-signing login flow
 2021-03-11 12:53:55 +00:00
Michael Telatynski 6d81634eec Rebuild space previews with new designs 2021-03-11 11:49:43 +00:00
Matthew Hodgson 72f28240aa fix AccessibleButton layout some more 2021-03-08 23:28:54 +00:00
Matthew Hodgson c543f0a2d0 fix AccessibleButton label positioning now they can wrap 2021-03-08 22:29:08 +00:00
Matthew Hodgson b3cd6fcc9b vertically align labels in AccessibleButtons if their height is pushed out by wrapped text elsewhere 2021-03-08 17:59:02 +00:00
Travis Ralston 757597e55f Fixed review concerns 2021-03-05 16:29:14 -07:00
Travis Ralston 711181cc69 Rough style for new upload bar 
This repurposes ProgressBar which was not used anywhere in code.
 2021-03-05 14:14:43 -07:00
Šimon Brandner 1955fff08c
CSS cleanup 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 11:50:50 +01:00
Šimon Brandner dc283241aa
Remove wrapper 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 11:28:42 +01:00
Šimon Brandner 273753a42a
Fix hex formatting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 08:25:34 +01:00
Šimon Brandner 5a9e1a1482
Fix close icon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 08:10:54 +01:00
Šimon Brandner d58c17ff3b
Show grabbing cursor 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 07:50:53 +01:00
Šimon Brandner 25873c8759
Remove rounded border 2021-02-24 20:41:20 +01:00
Šimon Brandner 983895289c
Update info 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 20:04:25 +01:00
Šimon Brandner 81698a2714
Fix pointer-events 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 19:31:19 +01:00
Šimon Brandner 83e1a7a707
Add more button 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 18:13:12 +01:00
Šimon Brandner a6bb203a4b
Redo icons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 14:43:33 +01:00
Šimon Brandner fafb8d43a3
Fix padding according to the design 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 14:16:58 +01:00
Šimon Brandner 6aac8f1735
Change padding a bit 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 11:20:28 +01:00
Šimon Brandner 899ce1f605
Partially fix overflow issues 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 11:15:59 +01:00
Šimon Brandner ab79deb88f
Update the looks a bit more 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 08:11:53 +01:00
Šimon Brandner 768d268189
Fix css 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 07:54:36 +01:00
Robin Townsend 40b684d7de Vectorize spinners 
This replaces most of the GIF spinners used throughout the app with an
SVG that respects the user's theme. However, spinner.gif is still
retained for the room timeline avatar uploader component, since it is
more difficult to replace.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-02-23 20:22:09 -05:00
Šimon Brandner 87d5d73025
Merge branch 'develop' into improve-image-view 2021-02-23 20:42:16 +01:00
Tulir Asokan dfcf701449 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-02-19 21:47:10 +02:00
David Baker cf5ec7720c
Merge pull request #5525 from SimonBrandner/fix-screen-sharing 
Fix desktop Matrix screen sharing and add a screen/window picker
 2021-02-08 13:54:51 +00:00
Michael Telatynski 0e94d08d9a Update SSO Twitter social branding to match guidelines 2021-02-02 17:29:19 +00:00
Michael Telatynski 1ba0999915 Update SSO Facebook social branding to match guidelines 2021-02-02 17:19:18 +00:00
Michael Telatynski 62712159f6
Merge pull request #5578 from matrix-org/t3chguy/sso_fixes 
Improve SSO auth flow
 2021-01-29 13:28:53 +00:00
Michael Telatynski 0167c3cefb Iterate SSO auth ux styling 2021-01-29 13:04:05 +00:00
Michael Telatynski 2c2cf4c073 Update google branding 2021-01-29 11:42:34 +00:00
Ayush Kumar 6b56d0b987 change value #2e2f32 to -primary-color 2021-01-29 15:54:40 +05:30
Ayush Kumar 512ac5ef3b fixed invisible text after logging out in the dark theme 2021-01-29 03:58:05 +05:30
Michael Telatynski 34ae766893 Wire up MSC2858 brand attribute 
For better brand adherance.
Also removes old support for https IdP icons.
 2021-01-27 16:15:47 +00:00
Šimon Brandner e2abbf9a7c
Merge branch 'develop' into improve-image-view 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-23 08:12:32 +01:00
Michael Telatynski 928ddeb718 Improve styling of SSO Buttons for multiple IdPs 2021-01-21 13:33:25 +00:00
Šimon Brandner b2850e11db
Merge remote-tracking branch 'upstream/develop' into fix-screen-sharing 2021-01-13 19:47:07 +01:00
Šimon Brandner b1010189be
Tabbed copyright link 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-05 20:41:33 +01:00
Šimon Brandner bb7e76f69e
Hopefully fixed copyrights 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-05 20:36:54 +01:00
Šimon Brandner 8652c2e653
Fixed class names 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-05 19:49:09 +01:00
Šimon Brandner 95d93d143e
Clean up the SCSS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-28 08:38:29 +01:00
Michael Telatynski 8ee65258be Unfloat the MiniAvatarUploader "tooltip" 2020-12-27 21:13:01 +00:00
Šimon Brandner eff26600e8
Linting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-26 18:33:23 +01:00
Šimon Brandner 675ca58eef
Improve UI 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-26 16:56:25 +01:00
Šimon Brandner eae3c1c496
Get screen-sharing working, somehow 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-26 08:32:51 +01:00
Šimon Brandner 6315c8ecef Fix formatting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-20 20:45:33 +01:00
Šimon Brandner 0dff150bb2 Fix some more sizing issues 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-20 20:18:21 +01:00
Šimon Brandner cbfa6c5f94 Fix some sizing issues 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-20 20:15:25 +01:00
Šimon Brandner 6758734593 Remove panel element 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-20 19:48:24 +01:00
Šimon Brandner 7dd7aeffed Remove imageBox 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-20 18:19:11 +01:00
Šimon Brandner f9884b1cc7 Implement translation 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-20 17:40:16 +01:00
Šimon Brandner 8de019c054 Added some padding 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-20 12:16:05 +01:00
Šimon Brandner be9b68a4dd Use height and width properties for scaling again 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-20 10:07:03 +01:00
Šimon Brandner ae25ff8216 Switched to scale 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-19 15:54:26 +01:00
Šimon Brandner 633221f012 Center image 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-19 13:50:21 +01:00
Šimon Brandner b9f480a825 Remove flex property 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-19 13:13:34 +01:00
Šimon Brandner 8aabe1f330 Reorganized elements 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-19 09:26:09 +01:00
Michael Telatynski 1b1c482f9c Iterate tests 2020-11-25 10:22:16 +00:00
Michael Telatynski 758b47c64d Replace *ServerConfig and SignInToText with ServerPicker 2020-11-25 09:46:56 +00:00
Michael Telatynski 1d53a5cf23 Initial support for MSC2858 2020-11-24 11:18:11 +00:00
Michael Telatynski bf62960e1a
Merge pull request #5413 from matrix-org/t3chguy/fix/11415 
Change how we expose Role in User Info and hide in DMs
 2020-11-11 18:15:46 +00:00
Michael Telatynski 5fb86f74d7 Remove unused IconButton 2020-11-10 12:06:56 +00:00
Michael Telatynski 6aeea3e38e Extract MiniAvatarUploader into a reusable component 2020-11-05 15:42:45 +00:00
Michael Telatynski 24c4a3876c Increase Border Radius of Accessible Buttons to 8px 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-20 15:05:38 +01:00
Tulir Asokan 2bb7b6535f Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2020-10-02 17:28:45 +03:00
Travis Ralston bfbbf44dfc Add a note to use the desktop builds when seshat isn't available 
Fixes https://github.com/vector-im/element-web/issues/15184

This is currently temporary design for https://github.com/vector-im/element-web/issues/12896 but does not fix it.
 2020-09-16 17:23:37 -06:00
Tulir Asokan 75a0178dad Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2020-09-04 12:41:38 +03:00
Travis Ralston 7c1a9993e3 Add new create group dialog 2020-08-25 21:08:24 -06:00
Jorik Schellekens a61cbc1a11 Add more left padding to fix focus highlight 2020-08-04 15:07:13 +01:00
Jorik Schellekens 271eeeabee Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/style-fighting 2020-08-04 15:04:56 +01:00
Tulir Asokan db5121aeca Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2020-08-03 16:49:43 +03:00
Jorik Schellekens fb953ade8e Accessibility focus checkboxes and radio boxes 2020-07-28 16:08:25 +01:00
Jorik Schellekens 4f55ef685d
Merge pull request #4989 from matrix-org/joriks/resize-handlebars-2.0 
Fix handlebar interaction
 2020-07-28 14:30:00 +01:00
Michael Telatynski c980b58c69 Fix field tooltips 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-18 11:36:23 +01:00
Michael Telatynski 38dc3c8bd1 Replace non-functional Interactive Tooltip 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-17 18:43:42 +01:00
Michael Telatynski 9ec2ca447c Update style of default tooltips to match the new style 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-17 16:19:10 +01:00
Jorik Schellekens 173ccbcec9 Fix handles 2020-07-16 16:21:38 +01:00
Michael Telatynski 5e6f8b20bc Visual WIP 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 16:16:41 +01:00
Michael Telatynski fb222c7eff
Merge pull request #5001 from swapnilraj/swapnilraj/country-code-width 
Increase width for country code dropdown
 2020-07-16 16:09:43 +01:00
Swapnil Raj 8253756276 Remove unnecessary import 2020-07-16 20:28:19 +05:30
Swapnil Raj 0ddfd9ee8c Use rem to guard against font scaling breakages 2020-07-16 20:15:28 +05:30
Michael Telatynski d5f2d43429 Improve Tooltip font/layout consistency 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 15:15:00 +01:00
Swapnil Raj 1195c09f5c Increase width for country code dropdown 2020-07-16 19:11:52 +05:30
Michael Telatynski 9f199758b9 restore old tooltip positioning (right) instead of (above) for timeline tooltips 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-14 13:00:25 +01:00
Michael Telatynski cd2f323002 re-add text-align center 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-13 23:18:33 +01:00
Michael Telatynski 646c5d4a64 Replace timeline tooltips to match breadcrumb tooltips 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-13 23:14:00 +01:00
Michael Telatynski 33422f1744 Switch out Labs spinner to be the Flow-generated from Design 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-13 17:39:57 +01:00
Michael Telatynski 5a542281ed Make Styled Radio Button outlines default-off 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-03 19:27:45 +01:00
Jorik Schellekens aab372c648 Add tooltips 2020-07-01 01:50:31 +01:00
David Baker 21c5c745c1
Merge pull request #4831 from matrix-org/dbkr/recovery_key_passphrase_2 
Implement new design on security setup & login
 2020-06-30 17:55:03 +01:00
Michael Telatynski cf3c914382 Merge branches 'develop' and 't3chguy/notifications0' of github.com:matrix-org/matrix-react-sdk into t3chguy/notifications0 2020-06-26 15:35:36 +01:00
Michael Telatynski 72035c8078 Make <ProgressBar /> relevant again 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-26 14:19:58 +01:00
David Baker f4460ca78f Merge remote-tracking branch 'origin/develop' into dbkr/recovery_key_passphrase_2 2020-06-26 13:12:06 +01:00
David Baker bf45cb0588 PR feedback: re-order CSS & add underscore 2020-06-26 11:24:07 +01:00
Andrew Morgan e790a31f09 Include newline at end of _InlineSpinner.scss 2020-06-26 09:44:47 +01:00
Andrew Morgan a2e33a2386 Prevent old InlineSpinner gif from spinning 2020-06-26 09:41:18 +01:00
Andrew Morgan 87f961df3f Put behind a labs flag 2020-06-26 01:22:46 +01:00
Andrew Morgan 6ea5dc7b7c Change the look of the spinner 2020-06-26 01:19:38 +01:00
Jorik Schellekens 41c59cc75e Fix deactivated checked checkbox styling 2020-06-25 14:21:08 +01:00
David Baker 6ce8584337 Implement first screen (recovery key / passphrase choice) 2020-06-23 15:04:39 +01:00
Michael Telatynski 26e763d135 Fix Styled Checkbox and Radio Button disabled state 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-17 14:26:22 +01:00
Jorik Schellekens 2617ce5dd5 fix checkbox regression 2020-06-11 12:40:49 +01:00
Jorik Schellekens b63d73e3b6
Merge pull request #4729 from matrix-org/joriks/appearance-tab 
Move Settings flag to ts
 2020-06-10 16:57:18 +01:00
Travis Ralston 60b5f2dbec
Merge pull request #4744 from matrix-org/joriks/radio-buttons-isolated 
Add styled radio buttons
 2020-06-10 07:27:17 -06:00
Jorik Schellekens ab47e0ed24
lint lines 2020-06-10 13:49:03 +01:00
Jorik Schellekens a2294a73a4 Make checkboxes a11y friendly 2020-06-10 13:41:34 +01:00
Jorik Schellekens 70fe7ce619 fix licensing info 2020-06-10 13:39:28 +01:00
Jorik Schellekens 8fc6289290 Use appearance instad of display for accessibility 2020-06-10 13:37:09 +01:00
Jorik Schellekens 3bea64e950 smaller margin 2020-06-10 13:06:17 +01:00
Jorik Schellekens 0fb6846c9d Radio buttons 2020-06-10 13:03:00 +01:00
Jorik Schellekens bd58f6ea7b Hide checkbox on dark backgrounds 2020-06-08 17:38:07 +01:00
Tulir Asokan 4521e9feb1 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2020-06-07 15:12:30 +03:00
Jorik Schellekens 5bc756cba1 Fix checkbox bleed 2020-06-03 16:48:05 +01:00
Jorik Schellekens 66c0d53f3e Create and use stylised checkboxes 2020-05-28 22:33:00 +01:00
Tulir Asokan dfe277b78d Remove unnecessary right margin in reply blockquote 2020-05-25 19:24:23 +03:00
Tulir Asokan 4e5680de85 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2020-05-25 19:21:19 +03:00