PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
34360 commits 1 branch 0 tags 338 MiB
Commit graph

34360 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
38c5972d3e Merge remote-tracking branch 'origin/develop' into dbkr/already_in_call 2021-06-15 19:20:29 +01:00
dependabot[bot]
6ee55bb03c
Bump postcss from 7.0.35 to 7.0.36 
Bumps [postcss](https://github.com/postcss/postcss) from 7.0.35 to 7.0.36.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/7.0.35...7.0.36)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-15 16:08:33 +00:00
David Baker
f1cd086ae2 Cache virtual/native room mappings when they're created 
Otherwise we look up the mapping immediately afterwards and the
remote echo of the account data hasn't come back yet, so we get
nothing.

Fixes "You're already in a call with this person" bug with virtual
rooms.
 2021-06-15 16:27:18 +01:00
RiotRobot
2eb7d35ea1 v3.24.0-rc.1 2021-06-15 16:22:34 +01:00
RiotRobot
cdb9d3a41b Prepare changelog for v3.24.0-rc.1 2021-06-15 16:22:33 +01:00
RiotRobot
b3912dc5b8 Upgrade matrix-js-sdk to 12.0.0-rc.1 2021-06-15 16:16:42 +01:00
J. Ryan Stinnett
416563d919
Merge pull request #6192 from RiotTranslateBot/weblate-element-web-matrix-react-sdk 
Translations update from Weblate
 2021-06-15 15:42:30 +01:00
Weblate
12f8e5b278 Merge branch 'origin/develop' into Weblate. 2021-06-15 14:40:39 +00:00
Besnik Bleta
6d56c9eab4 Translated using Weblate (Albanian) 
Currently translated at 99.7% (2972 of 2979 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-06-15 14:40:33 +00:00
m4sk1n
24bdcf48a9 Translated using Weblate (Polish) 
Currently translated at 73.2% (2181 of 2979 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pl/
 2021-06-15 14:40:31 +00:00
Victor Grousset
6adbc90127 Translated using Weblate (Esperanto) 
Currently translated at 99.9% (2978 of 2979 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/eo/
 2021-06-15 14:40:17 +00:00
lvre
5509fe455e Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 94.0% (2803 of 2979 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
 2021-06-15 14:40:16 +00:00
Balázs Meskó
7bc305f0d4 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2979 of 2979 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2021-06-15 14:40:13 +00:00
Germain Souquet
adc4bd14c0 Disable comment-on-alert 2021-06-15 15:19:47 +01:00
Germain
520763a045
Merge pull request #6189 from matrix-org/gsouquet/disable-comments-on-forks 
Disable comment-on-alert for PR coming from a fork
 2021-06-15 15:06:30 +01:00
Germain Souquet
19cae42161 Benchmark multiple common user scenario 2021-06-15 15:06:00 +01:00
Germain Souquet
8dbc5bddc0 Disable comment-on-alert for PR coming from a fork 2021-06-15 14:47:45 +01:00
Germain
bef20dde48
Merge pull request #6177 from matrix-org/gsouquet/benchmark-tracking 2021-06-15 14:17:59 +01:00
Michael Telatynski
a52dd57eb2 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17529 
 Conflicts:
	package.json
	yarn.lock
 2021-06-15 13:59:54 +01:00
Michael Telatynski
89221bde0f Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17128-1 
 Conflicts:
	src/dispatcher/actions.ts
 2021-06-15 13:58:13 +01:00
Germain
3eca1cbec3
Merge pull request #6187 from matrix-org/gsouquet/update-react-test-utils 
Upgrade matrix-react-test-utils for React 17 peer deps
 2021-06-15 12:45:09 +01:00
Michael Telatynski
5098a304c9 delint 2021-06-15 12:33:46 +01:00
Michael Telatynski
5130d5e111 Hide addresses section for private spaces 2021-06-15 12:26:09 +01:00
Michael Telatynski
83c30b2280 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244 
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
 2021-06-15 12:24:26 +01:00
Jaiwanth
bd75849e73 Enable option to set maximum file size 2021-06-15 16:41:31 +05:30
Germain Souquet
4a23ebae1e upgrade matrix-react-test-utils for react 17 peer deps 2021-06-15 12:00:44 +01:00
Germain Souquet
7310d35d7f Merge branch 'develop' into gsouquet/benchmark-tracking 2021-06-15 11:45:11 +01:00
Germain Souquet
011a2f2bb6 Remove test data for develop pipeline 2021-06-15 10:59:57 +01:00
Germain Souquet
d5f7f524e1 Slow down registration process 2021-06-15 10:24:07 +01:00
Germain Souquet
2b2e83b9e7 Fix github token 2021-06-15 10:10:22 +01:00
Germain Souquet
55a9915c55 Upgrade github-action-benchmark 2021-06-15 10:01:05 +01:00
Germain Souquet
6f6a128587 try auto push 2021-06-15 09:27:44 +01:00
Germain Souquet
646416c8ec try deployment to gh-pages 2021-06-15 08:59:51 +01:00
Michael Telatynski
a63d9220d2 Clear outstanding TODOs 2021-06-15 08:26:46 +01:00
Michael Telatynski
419baebde9
Merge pull request #6186 from SimonBrandner/fix/irc-layout-display-name/17645 
Fix display name overlaps on the IRC layout
 2021-06-15 08:10:38 +01:00
Šimon Brandner
d08495bde6
Fix display name overlap 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-15 06:30:22 +02:00
Germain
d3101b5ce4
Merge branch 'develop' into gsouquet/dialogs-ts-migration 2021-06-15 00:02:49 +01:00
Germain Souquet
2e6dab0bcd change parameter to use preset enum 2021-06-15 00:01:05 +01:00
Germain Souquet
07bdaeaf70 Fix mjolnir private chat enum 2021-06-14 23:55:14 +01:00
Germain Souquet
b2f20e052d remove unused import 2021-06-14 23:51:38 +01:00
Germain Souquet
75151b7a6c Migrate TermsDialog to TypeScript 2021-06-14 23:50:41 +01:00
Germain Souquet
de414cd0a6 Migrate UserSettingsDialog to TypeScript 2021-06-14 23:42:36 +01:00
Michael Telatynski
6b4f63df2a
Merge pull request #6184 from matrix-org/t3chguy/rs/5566 2021-06-14 23:27:51 +01:00
Michael Telatynski
2fd8cc414c
Merge pull request #6111 from matrix-org/t3chguy/fix/17365 2021-06-14 22:57:14 +01:00
Michael Telatynski
539465ecb4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 
 Conflicts:
	src/components/views/dialogs/InviteDialog.tsx
 2021-06-14 22:22:30 +01:00
Michael Telatynski
430ec8cecd Clear selected rooms after operation in manage space rooms 2021-06-14 22:18:18 +01:00
Michael Telatynski
f8eea2ae23 Fix word wrap in space descriptions 2021-06-14 22:18:02 +01:00
Michael Telatynski
b9f86d54c3 Update yarn.lock 2021-06-14 22:07:25 +01:00
Germain Souquet
a030c1270a Migrate ErrorDialog to TypeScript 2021-06-14 21:55:47 +01:00
Germain Souquet
cf822d4d4c Migrate DeactivateAccountDialog to TypeScript 2021-06-14 21:53:44 +01:00