Commit graph

10629 commits

Author SHA1 Message Date
Michael Telatynski
a470c7dd1c
Merge pull request #17704 from vector-im/t3chguy/ts/5.1 2021-06-24 15:24:01 +01:00
Travis Ralston
0c1f0d5df6
Merge pull request #17478 from vector-im/dependabot/npm_and_yarn/dns-packet-1.3.4
Bump dns-packet from 1.3.1 to 1.3.4
2021-06-24 07:26:36 -06:00
Travis Ralston
bc98ae8f05
Merge pull request #17747 from vector-im/travis/fix-wapi-202106
Update matrix-widget-api to fix build issues
2021-06-23 11:31:42 -06:00
Travis Ralston
a6f4c6f28d Update matrix-widget-api to fix build issues 2021-06-23 11:25:19 -06:00
Travis Ralston
f28a37aba5
Merge pull request #17742 from vector-im/jaywink/tiny-whitespace-fix
Fix whitespace in Dockerfile
2021-06-23 08:00:03 -06:00
Michael Telatynski
e2a109667a Merge branch 'develop' of github.com:vector-im/element-web into t3chguy/ts/5.1
 Conflicts:
	src/vector/platform/ElectronPlatform.tsx
2021-06-23 14:54:06 +01:00
Jason Robinson
26380719a1 Fix whitespace in Dockerfile
Upstreamed whitespace fix from a fork, to be aligned with the other indented line :)
2021-06-23 15:42:30 +03:00
Michael Telatynski
54da2df8c0
Merge pull request #17723 from vector-im/t3chguy/types/react
Upgrade @types/react and @types/react-dom
2021-06-22 18:22:26 +01:00
Michael Telatynski
505eb13461 Merge branch 'develop' of github.com:vector-im/element-web into t3chguy/types/react 2021-06-22 18:03:33 +01:00
Michael Telatynski
c22b195bbd Remove pinned resolution for @types/react to 16.x 2021-06-22 17:56:52 +01:00
Michael Telatynski
1805a28d51
Merge pull request #17457 from vector-im/t3chguy/fix/17128-1 2021-06-22 14:21:46 +01:00
Michael Telatynski
c86d79b7a5 Upgrade @types/react and @types/react-dom 2021-06-22 08:15:27 +01:00
RiotRobot
c2dea5a19f Reset matrix-react-sdk back to develop branch 2021-06-21 17:05:37 +01:00
RiotRobot
fe39de5126 Reset matrix-js-sdk back to develop branch 2021-06-21 17:05:26 +01:00
RiotRobot
905273c90c Merge branch 'master' into develop 2021-06-21 17:05:14 +01:00
RiotRobot
e02d17a6cc v1.7.31 2021-06-21 17:01:00 +01:00
RiotRobot
01c84212f9 Prepare changelog for v1.7.31 2021-06-21 17:00:59 +01:00
RiotRobot
1b48f4857a Upgrade matrix-react-sdk to 3.24.0 2021-06-21 16:58:14 +01:00
RiotRobot
57090243e1 Upgrade matrix-js-sdk to 12.0.0 2021-06-21 16:57:52 +01:00
J. Ryan Stinnett
6fc14effb7
Merge pull request #17694 from vector-im/yoric/msc3215
Labs: feature_report_to_moderators
2021-06-21 10:16:29 +01:00
Michael Telatynski
f461c900cf Improve typing of Event Index Manager / Seshat 2021-06-19 15:37:06 +01:00
David Teller
92ae57df3f Labs: feature_report_to_moderators
Signed-off-by: David Teller <davidt@element.io>
2021-06-18 18:07:16 +02:00
Michael Telatynski
9e4eebed26 Change spaces shortcut to have 1 = space 1, 0 = home 2021-06-18 08:24:36 +01:00
RiotRobot
673a5ccc9e v1.7.31-rc.1 2021-06-15 17:29:00 +01:00
RiotRobot
446833d931 Prepare changelog for v1.7.31-rc.1 2021-06-15 17:29:00 +01:00
RiotRobot
e98a183978 Upgrade matrix-react-sdk to 3.24.0-rc.1 2021-06-15 17:26:25 +01:00
RiotRobot
d23b30023a Upgrade matrix-js-sdk to 12.0.0-rc.1 2021-06-15 16:24:37 +01:00
J. Ryan Stinnett
48ff90fe8b
Merge pull request #17655 from RiotTranslateBot/weblate-element-web-element-web
Translations update from Weblate
2021-06-15 15:40:04 +01:00
Weblate
79bd092697 Merge branch 'origin/develop' into Weblate. 2021-06-15 14:39:43 +00:00
waclaw66
9183cfdb01 Translated using Weblate (Czech)
Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/cs/
2021-06-15 14:39:41 +00:00
Germain
e999524e03
Merge pull request #17653 from vector-im/gsouquet/update-react-test-utils 2021-06-15 13:07:23 +01:00
Germain Souquet
4dcfd7c0dd fix lockfile dependencies for matrix-react-sdk 2021-06-15 12:51:10 +01:00
Germain Souquet
2ffb1a6015 upgrade matrix-react-test-utils for react 17 peer deps 2021-06-15 11:59:33 +01:00
Sanqui
1eea16ecdf Translated using Weblate (Czech)
Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/cs/
2021-06-15 05:54:16 +00:00
lvre
6c642b5f00 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/pt_BR/
2021-06-13 00:53:58 +00:00
lvre
46f8000b3d Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/pt_BR/
2021-06-12 21:59:39 +00:00
J. Ryan Stinnett
b96a1551e1 Shake yarn.lock 2021-06-11 16:35:08 +01:00
J. Ryan Stinnett
378919cbfb
Merge pull request #17626 from vector-im/jryans/webpack-lint
Fix lint errors in Webpack config
2021-06-11 16:30:39 +01:00
J. Ryan Stinnett
a1c53e59fb Fix lint errors in Webpack config 2021-06-10 15:19:38 +01:00
J. Ryan Stinnett
ef8e39050a
Merge pull request #17614 from vector-im/jryans/preload-woff2-only
Preload only `woff2` fonts
2021-06-10 14:42:38 +01:00
J. Ryan Stinnett
8d05d8481a Preload only woff2 fonts
All of our supported browsers understand `woff2`, so there's no need to make
everyone preload the older `woff` as well.
2021-06-10 13:02:21 +01:00
Ihor Hordiichuk
0667c69688 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/uk/
2021-06-10 09:34:40 +00:00
Germain
c57feada47
Merge pull request #17601 from vector-im/gsouquet/react-17
⚛️ Upgrade to React@17
2021-06-10 10:13:30 +01:00
Germain Souquet
4b8a05a667 Upgrade to React@17 2021-06-09 11:40:36 +01:00
RiotRobot
2784bc7916 Reset matrix-react-sdk back to develop branch 2021-06-07 17:52:34 +01:00
RiotRobot
8fc12bddd7 Reset matrix-js-sdk back to develop branch 2021-06-07 17:52:24 +01:00
RiotRobot
74d51a3ab5 v1.7.30 2021-06-07 17:48:13 +01:00
RiotRobot
f6349dd37d Prepare changelog for v1.7.30 2021-06-07 17:48:12 +01:00
RiotRobot
0a3eb467fc Upgrade matrix-react-sdk to 3.23.0 2021-06-07 17:46:00 +01:00
RiotRobot
5da849099f Upgrade matrix-js-sdk to 11.2.0 2021-06-07 17:45:33 +01:00