Commit graph

26868 commits

Author SHA1 Message Date
Hubert Chathi
b05a19ef13 lint 2020-07-16 18:07:51 -04:00
Hubert Chathi
a85af47b0a use a proper HTML sanitizer to strip <mx-reply>, rather than a regexp 2020-07-16 17:46:49 -04:00
Travis Ralston
ddb5c7fb24
Merge pull request #5005 from matrix-org/travis/room-list/log-debug
Convert room list log setting to a real setting
2020-07-16 14:50:01 -06:00
Travis Ralston
f8f9c4880a
Merge pull request #5003 from matrix-org/dependabot/npm_and_yarn/test/end-to-end-tests/lodash-4.17.19
Bump lodash from 4.17.15 to 4.17.19 in /test/end-to-end-tests
2020-07-16 14:44:32 -06:00
Travis Ralston
65d7a82644
Merge pull request #5004 from matrix-org/dependabot/npm_and_yarn/lodash-4.17.19
Bump lodash from 4.17.15 to 4.17.19
2020-07-16 14:44:21 -06:00
Travis Ralston
c29da883db Convert room list log setting to a real setting
To debug https://github.com/vector-im/riot-web/issues/14554 and https://github.com/vector-im/riot-web/issues/14508
2020-07-16 14:43:43 -06:00
Travis Ralston
8b65b19e60
Merge pull request #4936 from matrix-org/travis/general/perf/js-roomstate-map
Convert devtools dialog to use new room state format
2020-07-16 13:01:45 -06:00
Travis Ralston
9c9ff281e7 Use .entries() 2020-07-16 13:00:02 -06:00
Michael Telatynski
82f6a6b710
Merge pull request #5000 from swapnilraj/swapnilraj/update-discovery-checkbox
Update checkbox
2020-07-16 17:04:36 +01:00
dependabot[bot]
4d61d6320a
Bump lodash from 4.17.15 to 4.17.19 in /test/end-to-end-tests
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-16 15:12:32 +00:00
dependabot[bot]
4aedf857cb
Bump lodash from 4.17.15 to 4.17.19
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-16 15:12:26 +00:00
RiotRobot
2f9bfdbb69 Reset matrix-js-sdk back to develop branch 2020-07-16 16:11:59 +01:00
RiotRobot
1016b35f6c Merge branch 'master' into develop 2020-07-16 16:11:04 +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
RiotRobot
0c89b8d267 v2.10.1 2020-07-16 16:09:41 +01:00
RiotRobot
f68ad8f19e Prepare changelog for v2.10.1 2020-07-16 16:09:41 +01:00
RiotRobot
bc97f731fc Upgrade matrix-js-sdk to 7.1.0 2020-07-16 16:03:00 +01:00
Swapnil Raj
8253756276 Remove unnecessary import 2020-07-16 20:28:19 +05:30
Michael Telatynski
7d14dc08f0
Merge pull request #5002 from matrix-org/t3chguy/nad/rampage
Post-launch Element Web polish
2020-07-16 15:55:35 +01:00
Michael Telatynski
a704eefdd5 Merge branches 'develop' and 't3chguy/nad/rampage' of github.com:matrix-org/matrix-react-sdk into t3chguy/nad/rampage
 Conflicts:
	src/components/views/elements/AccessibleTooltipButton.tsx
2020-07-16 15:47:12 +01:00
Michael Telatynski
ebb9c4e814 Update text input placeholder active colour to 75% inactive
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 15:46:06 +01:00
Swapnil Raj
0ddfd9ee8c Use rem to guard against font scaling breakages 2020-07-16 20:15:28 +05:30
Michael Telatynski
e6dff951b8 Fix composer text alignment
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 15:42:58 +01:00
Michael Telatynski
1a9680b527 Update font size of member filter field
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 15:40:31 +01:00
J. Ryan Stinnett
9b13ef1446 Revert "Merge branch 'joriks/horizontal-resize-bars' into 'element'"
This reverts commit eb0cb5c279.
2020-07-16 15:31:41 +01:00
Michael Telatynski
007f63b5bb Update the SVGs with 24x24 fixed Figma ones
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 15:30:06 +01:00
Michael Telatynski
576294e7ce Add shadow to the reply preview and autocomplete composer panes
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 15:26:25 +01:00
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
Swapnil Raj
ddb6104590 Revert "Increase width for country code dropdown"
This reverts commit cb794af5f1.
2020-07-16 19:09:33 +05:30
Michael Telatynski
b6cd8065f8 Re-export top right header button svg masks to match Figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 14:39:02 +01:00
Michael Telatynski
a2b5e5a6a1 Fix top right header button layout and hover consistency
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 14:38:46 +01:00
Michael Telatynski
cb4f4c96b4 Update colour of typing indicator in timeline to match topic
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 14:38:23 +01:00
Michael Telatynski
f2104b59f0 Simplify room sublist context menu
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 14:38:04 +01:00
Michael Telatynski
2b260a69a0 Change colour of unread count dot to primary fg
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 14:37:41 +01:00
Swapnil Raj
cb794af5f1 Increase width for country code dropdown 2020-07-16 19:07:15 +05:30
Jorik Schellekens
2e8285590c
Merge pull request #4992 from matrix-org/joriks/irc-layout-e2e-icon
Move e2e icon
2020-07-16 14:35:08 +01:00
Swapnil Raj
8de6863bf6 Fix indentation 2020-07-16 18:12:11 +05:30
Michael Telatynski
f4da1b6f6b
Merge pull request #4976 from matrix-org/t3chguy/a11y-toolbar-breadcrumbs
Wire up new room list breadcrumbs as an ARIA Toolbar
2020-07-16 12:52:59 +01:00
Swapnil Raj
15f94d3732 Update checkbox 2020-07-16 17:22:35 +05:30
Michael Telatynski
9db05db951
Merge pull request #4999 from matrix-org/t3chguy/room-list/14503
Fix Room Tile Icon to not ignore DMs in other tags
2020-07-16 12:42:07 +01:00
Michael Telatynski
725fa7df9b
Merge pull request #4997 from matrix-org/t3chguy/fix/14526
Fix filtering by community not showing DM rooms with community members
2020-07-16 12:41:50 +01:00
Michael Telatynski
b1d57ca13e
Merge pull request #4996 from matrix-org/t3chguy/room-list/14491
Fix enter in new room list filter breaking things
2020-07-16 12:41:39 +01:00
Michael Telatynski
19d733561d
Merge pull request #4995 from matrix-org/t3chguy/room-list/14509
Notify left panel of resizing when it is collapsed&expanded
2020-07-16 12:41:32 +01:00
Michael Telatynski
dcc59198be
Merge pull request #4994 from matrix-org/t3chguy/room-list/14487
When removing a filter condition, try recalculate in case it wasn't last
2020-07-16 12:41:22 +01:00
Michael Telatynski
05b100f44d
Merge pull request #4975 from matrix-org/t3chguy/a11y-toolbar
Create a generic ARIA toolbar component
2020-07-16 12:41:05 +01:00
Michael Telatynski
91b4193e6a
Merge pull request #4604 from matrix-org/t3chguy/fix-op
Fix /op Slash Command
2020-07-16 12:34:40 +01:00
Michael Telatynski
c94c937b31 Fix Room Tile Icon to not ignore DMs in other tags
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 12:33:05 +01:00
Michael Telatynski
8546d09fc4
Merge pull request #4998 from swapnilraj/swapnilraj/copy-button-fix
Fix copy button in share dialog
2020-07-16 10:47:10 +01:00
Swapnil Raj
4006ae6701
Fix copy button in share dialog 2020-07-16 10:30:31 +01:00