Commit Graph

10714 Commits

Author SHA1 Message Date
sploenix
6c6ee98eb9
Add docker workflow 2021-07-09 04:26:15 +02:00
su-ex
13ccfd21b9
Explain better what the different repos are for 2021-07-08 11:30:58 +02:00
su-ex
db806391dc
Automatic i18n adjustment 2021-07-07 18:05:48 +02:00
su-ex
155e1f9270
Automatic i18n adjustment 2021-07-05 19:26:45 +02:00
su-ex
03e4fb4354
Merge remote-tracking branch 'upstream/master' into sc 2021-07-05 19:16:26 +02:00
su-ex
c12823976a
Automatic i18n reversion 2021-07-05 19:15:53 +02:00
su-ex
8124635fdd
Automatic i18n reversion 2021-07-05 18:58:48 +02:00
RiotRobot
6d46ed8082 v1.7.32 2021-07-05 16:33:39 +01:00
RiotRobot
682247241f Prepare changelog for v1.7.32 2021-07-05 16:33:38 +01:00
RiotRobot
538837decf Upgrade matrix-react-sdk to 3.25.0 2021-07-05 16:30:38 +01:00
RiotRobot
56fbfc1648 Upgrade matrix-js-sdk to 12.0.1 2021-07-05 16:30:20 +01:00
RiotRobot
8f8202494a v1.7.32-rc.1 2021-06-29 14:50:34 +01:00
RiotRobot
27c7030034 Prepare changelog for v1.7.32-rc.1 2021-06-29 14:50:33 +01:00
RiotRobot
3326242915 Upgrade matrix-react-sdk to 3.25.0-rc.1 2021-06-29 14:47:35 +01:00
RiotRobot
c4ba5ce02a Upgrade matrix-js-sdk to 12.0.1-rc.1 2021-06-29 14:47:16 +01:00
David Baker
6110e3df14
Merge pull request #17832 from RiotTranslateBot/weblate-element-web-element-web
Translations update from Weblate
2021-06-29 14:14:51 +01:00
Weblate
d626f16da4 Merge branch 'origin/develop' into Weblate. 2021-06-29 13:00:57 +00:00
Germain
334ddd8cba
Merge pull request #17785 from vector-im/gsouquet/dependency-mock 2021-06-27 12:41:20 +01:00
Germain Souquet
98f3edf160 Fix canvas-filter-polyfill mock path 2021-06-25 17:04:06 +01:00
Germain
62a5f41ee4
Merge pull request #17774 from vector-im/gsouquet/dependency-mock 2021-06-25 16:40:27 +01:00
Germain Souquet
50a9287107 Merge branch 'develop' into gsouquet/dependency-mock 2021-06-25 12:04:13 +01:00
Germain Souquet
1c168bb361 Mock context-filter-polyfill for app-tests 2021-06-25 11:44:49 +01:00
Travis Ralston
0bf78cd531
Merge pull request #17772 from aaronraimist/libera
Add libera.chat to default room directory
2021-06-25 00:23:07 -06:00
Aaron Raimist
d400bfeaeb
Add libera.chat to default room directory
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-06-25 01:11:59 -05:00
su-ex
439f4e094f
Automatic i18n adjustment 2021-06-24 16:53:12 +02:00
su-ex
12595d777e
Merge remote-tracking branch 'upstream/master' into sc 2021-06-24 16:51:47 +02:00
su-ex
7c12bc0b86
Automatic i18n reversion 2021-06-24 16:51:04 +02:00
Michael Telatynski
a470c7dd1c
Merge pull request #17704 from vector-im/t3chguy/ts/5.1 2021-06-24 15:24:01 +01:00
su-ex
e4770c193c
Automatic i18n reversion 2021-06-24 16:16:01 +02: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
Ridhubharan
67b8d769d9 Translated using Weblate (Tamil)
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/ta/
2021-06-23 18:34:45 +00: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