Skip to content

Commit b1ba2cb

Browse files
author
William Kray
committed
Merge tag 'v1.7.34-rc.1' into develop
[Full Changelog](element-hq/element-web@v1.7.33...v1.7.34-rc.1) * Translations update from Weblate [\element-hq#18260](element-hq#18260) * Update ESLint config [\element-hq#18236](element-hq#18236) * Update matrix-org-eslint-plugin and tighten max warning limit [\element-hq#18207](element-hq#18207) * Update webpack path for new voice message worker location [\element-hq#18187](element-hq#18187) * yarn upgrade [\element-hq#18150](element-hq#18150) * Conform to new typescript eslint rules [\element-hq#18065](element-hq#18065) * Add the Matrix Space to the translations guide [\element-hq#18102](element-hq#18102) * Update eslint-plugin-matrix-org [\element-hq#18058](element-hq#18058) * Fix browser history getting stuck looping back to the same room [\element-hq#18053](element-hq#18053) * Use URLSearchParams instead of transitive dependency `querystring` [\element-hq#13138](element-hq#13138) * Update PR template for new changelog generation [\element-hq#18003](element-hq#18003) * Fix space shortcuts on layouts with non-English keys in the places of numbers [\element-hq#17780](element-hq#17780) * Add comment around feature_spaces flag usage [\element-hq#18006](element-hq#18006) * Standardise casing of identity server [\element-hq#17980](element-hq#17980) * Convert CONTRIBUTING to markdown [\element-hq#18002](element-hq#18002) * Ignore workers for jest tests because it disagrees with worker-loader [\element-hq#17999](element-hq#17999) * Use webpack worker-loader instead of homegrown hack [\element-hq#17963](element-hq#17963) * Fix types to match Typescripted IndexedDB store [\element-hq#17962](element-hq#17962) * Improve and consolidate typing [\element-hq#17931](element-hq#17931)
2 parents 1b69ff9 + 37faa1c commit b1ba2cb

File tree

26 files changed

+2170
-1927
lines changed

26 files changed

+2170
-1927
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1-
<!-- Please read https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.rst before submitting your pull request -->
1+
<!-- Please read https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.md before submitting your pull request -->
22

3-
<!-- Include a Sign-Off as described in https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.rst#sign-off -->
3+
<!-- Include a Sign-Off as described in https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.md#sign-off -->
4+
5+
<!-- To specify text for the changelog entry (otherwise the PR title will be used):
6+
Notes:
7+
8+
Changelog entries will also appear in element-desktop. For PRs that *only* affect the desktop version:
9+
Notes: none
10+
element-desktop notes: <notes>
11+
-->

‎CHANGELOG.md‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,47 @@
1+
Changes in [1.7.34-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.34-rc.1) (2021-07-27)
2+
=========================================================================================================
3+
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.33...v1.7.34-rc.1)
4+
5+
* Translations update from Weblate
6+
[\#18260](https://github.com/vector-im/element-web/pull/18260)
7+
* Update ESLint config
8+
[\#18236](https://github.com/vector-im/element-web/pull/18236)
9+
* Update matrix-org-eslint-plugin and tighten max warning limit
10+
[\#18207](https://github.com/vector-im/element-web/pull/18207)
11+
* Update webpack path for new voice message worker location
12+
[\#18187](https://github.com/vector-im/element-web/pull/18187)
13+
* yarn upgrade
14+
[\#18150](https://github.com/vector-im/element-web/pull/18150)
15+
* Conform to new typescript eslint rules
16+
[\#18065](https://github.com/vector-im/element-web/pull/18065)
17+
* Add the Matrix Space to the translations guide
18+
[\#18102](https://github.com/vector-im/element-web/pull/18102)
19+
* Update eslint-plugin-matrix-org
20+
[\#18058](https://github.com/vector-im/element-web/pull/18058)
21+
* Fix browser history getting stuck looping back to the same room
22+
[\#18053](https://github.com/vector-im/element-web/pull/18053)
23+
* Use URLSearchParams instead of transitive dependency `querystring`
24+
[\#13138](https://github.com/vector-im/element-web/pull/13138)
25+
* Update PR template for new changelog generation
26+
[\#18003](https://github.com/vector-im/element-web/pull/18003)
27+
* Fix space shortcuts on layouts with non-English keys in the places of
28+
numbers
29+
[\#17780](https://github.com/vector-im/element-web/pull/17780)
30+
* Add comment around feature_spaces flag usage
31+
[\#18006](https://github.com/vector-im/element-web/pull/18006)
32+
* Standardise casing of identity server
33+
[\#17980](https://github.com/vector-im/element-web/pull/17980)
34+
* Convert CONTRIBUTING to markdown
35+
[\#18002](https://github.com/vector-im/element-web/pull/18002)
36+
* Ignore workers for jest tests because it disagrees with worker-loader
37+
[\#17999](https://github.com/vector-im/element-web/pull/17999)
38+
* Use webpack worker-loader instead of homegrown hack
39+
[\#17963](https://github.com/vector-im/element-web/pull/17963)
40+
* Fix types to match Typescripted IndexedDB store
41+
[\#17962](https://github.com/vector-im/element-web/pull/17962)
42+
* Improve and consolidate typing
43+
[\#17931](https://github.com/vector-im/element-web/pull/17931)
44+
145
Changes in [1.7.33](https://github.com/vector-im/element-web/releases/tag/v1.7.33) (2021-07-19)
246
===============================================================================================
347
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.33-rc.1...v1.7.33)

‎CONTRIBUTING.rst‎ renamed to ‎CONTRIBUTING.md‎

File renamed without changes.

‎docs/translating.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88

99
## Step 0: Join #element-translations:matrix.org
1010

11-
1. Come and join https://matrix.to/#/#element-translations:matrix.org
12-
2. Read scrollback and/or ask if anyone else is working on your language, and co-ordinate if needed. In general little-or-no coordination is needed though :)
11+
1. Come and join https://matrix.to/#/#element-translations:matrix.org for general discussion
12+
2. Join https://matrix.to/#/#element-translators:matrix.org for language-specific rooms
13+
3. Read scrollback and/or ask if anyone else is working on your language, and co-ordinate if needed. In general little-or-no coordination is needed though :)
1314

1415
## Step 1: Preparing your Weblate Profile
1516

‎package.json‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "element-web",
3-
"version": "1.7.33",
3+
"version": "1.7.34-rc.1",
44
"description": "A feature-rich client for Matrix.org",
55
"author": "New Vector Ltd.",
66
"repository": {
@@ -48,7 +48,8 @@
4848
"start:res": "yarn build:jitsi && node scripts/copy-res.js -w",
4949
"start:js": "webpack-dev-server --host=0.0.0.0 --output-filename=bundles/_dev_/[name].js --output-chunk-filename=bundles/_dev_/[name].js -w --progress --mode development --disable-host-check",
5050
"lint": "yarn lint:types && yarn lint:js && yarn lint:style",
51-
"lint:js": "eslint src",
51+
"lint:js": "eslint --max-warnings 0 src",
52+
"lint:js-fix": "eslint --fix src",
5253
"lint:types": "tsc --noEmit --jsx react",
5354
"lint:style": "stylelint 'res/css/**/*.scss'",
5455
"test": "jest"
@@ -60,8 +61,8 @@
6061
"highlight.js": "^10.5.0",
6162
"jsrsasign": "^10.2.0",
6263
"katex": "^0.12.0",
63-
"matrix-js-sdk": "12.1.0",
64-
"matrix-react-sdk": "3.26.0",
64+
"matrix-js-sdk": "12.2.0-rc.1",
65+
"matrix-react-sdk": "3.27.0-rc.1",
6566
"matrix-widget-api": "^0.1.0-beta.15",
6667
"prop-types": "^15.7.2",
6768
"react": "^17.0.2",
@@ -141,16 +142,19 @@
141142
"shell-escape": "^0.2.0",
142143
"simple-proxy-agent": "^1.1.0",
143144
"stylelint": "^13.9.0",
145+
"stylelint-config-standard": "^20.0.0",
146+
"stylelint-scss": "^3.18.0",
144147
"terser-webpack-plugin": "^2.3.8",
145148
"typescript": "^4.1.3",
146149
"webpack": "^4.46.0",
147150
"webpack-cli": "^3.3.12",
148-
"webpack-dev-server": "^3.11.2"
151+
"webpack-dev-server": "^3.11.2",
152+
"worker-loader": "^2.0.0"
149153
},
150154
"jest": {
151155
"testEnvironment": "jest-environment-jsdom-sixteen",
152156
"testMatch": [
153-
"<rootDir>/test/**/*-test.js"
157+
"<rootDir>/test/**/*-test.[tj]s"
154158
],
155159
"setupFilesAfterEnv": [
156160
"<rootDir>/node_modules/matrix-react-sdk/test/setupTests.js"
@@ -168,7 +172,8 @@
168172
"decoderWorker\\.min\\.wasm": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
169173
"waveWorker\\.min\\.js": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
170174
"context-filter-polyfill": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
171-
"FontManager.ts": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/FontManager.js"
175+
"FontManager.ts": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/FontManager.js",
176+
"workers/(.+)\\.worker\\.ts": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/workerMock.js"
172177
},
173178
"transformIgnorePatterns": [
174179
"/node_modules/(?!matrix-js-sdk).+$",

‎src/async-components/structures/CompatibilityView.tsx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
7171
android = [];
7272
}
7373

74-
let mobileHeader = <h2 id="step2_heading">{_t("Use %(brand)s on mobile", { brand })}</h2>;
74+
let mobileHeader = <h2 id="step2_heading">{ _t("Use %(brand)s on mobile", { brand }) }</h2>;
7575
if (!android.length && !ios) {
7676
mobileHeader = null;
7777
}
@@ -102,11 +102,11 @@ const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
102102
'or <safariLink>Safari</safariLink> for the best experience.',
103103
{},
104104
{
105-
'chromeLink': (sub) => <a href="https://www.google.com/chrome">{sub}</a>,
106-
'firefoxLink': (sub) => <a href="https://firefox.com">{sub}</a>,
107-
'safariLink': (sub) => <a href="https://apple.com/safari">{sub}</a>,
105+
'chromeLink': (sub) => <a href="https://www.google.com/chrome">{ sub }</a>,
106+
'firefoxLink': (sub) => <a href="https://firefox.com">{ sub }</a>,
107+
'safariLink': (sub) => <a href="https://apple.com/safari">{ sub }</a>,
108108
},
109-
)}
109+
) }
110110
</p>
111111
<p>
112112
{ _t(
@@ -124,9 +124,9 @@ const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
124124
<div className="mx_HomePage_col">
125125
<div className="mx_HomePage_row">
126126
<div>
127-
{mobileHeader}
128-
{ios}
129-
{android}
127+
{ mobileHeader }
128+
{ ios }
129+
{ android }
130130
</div>
131131
</div>
132132
</div>

‎src/async-components/structures/ErrorView.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ const ErrorView: React.FC<IProps> = ({ title, messages }) => {
4040
<div className="mx_HomePage_row">
4141
<div>
4242
<h2 id="step1_heading">{ title }</h2>
43-
{messages && messages.map(msg => <p key={msg}>
43+
{ messages && messages.map(msg => <p key={msg}>
4444
{ msg }
45-
</p>)}
45+
</p>) }
4646
</div>
4747
</div>
4848
</div>

‎src/components/views/auth/VectorAuthFooter.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ const VectorAuthFooter = () => {
3535
for (const linkEntry of links) {
3636
authFooterLinks.push(
3737
<a href={linkEntry.url} key={linkEntry.text} target="_blank" rel="noreferrer noopener">
38-
{linkEntry.text}
38+
{ linkEntry.text }
3939
</a>,
4040
);
4141
}
4242

4343
return (
4444
<div className="mx_AuthFooter">
45-
{authFooterLinks}
45+
{ authFooterLinks }
4646
<a href="https://matrix.org" target="_blank" rel="noreferrer noopener">{ _t('Powered by Matrix') }</a>
4747
</div>
4848
);

‎src/i18n/strings/ca.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,7 @@
3232
"I understand the risks and wish to continue": "Entenc els riscos i vull continuar",
3333
"Go to element.io": "Vés a element.io",
3434
"Failed to start": "Ha fallat l'inici",
35-
"Missing indexeddb worker script!": "Falta l'script del treballador indexeddb!"
35+
"Missing indexeddb worker script!": "Falta l'script del treballador indexeddb!",
36+
"Use %(brand)s on mobile": "Utilitza %(brand)s al mòbil",
37+
"Switch to space by number": "Canvia d'espai per número"
3638
}

‎src/i18n/strings/en_EN.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Missing indexeddb worker script!": "Missing indexeddb worker script!",
32
"Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.",
43
"Invalid configuration: no default server specified.": "Invalid configuration: no default server specified.",
54
"Your Element is misconfigured": "Your Element is misconfigured",

0 commit comments

Comments
 (0)