Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
69,131 Commits 1 Branch 646 Tags
develop
Commit Graph

69131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Telatynski 2aff06f56e Update typescript-eslint plugin & parser (#20163) 2021-12-14 00:56:21 +00:00
Weblate b88946fd7e Merge branch 'origin/develop' into Weblate. 2021-12-13 23:39:56 +00:00
LinAGKar 6ef3d65443 Translated using Weblate (Swedish) 
Currently translated at 96.8% (3247 of 3354 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/
 2021-12-13 23:39:55 +00:00
Michael Telatynski 132e19beb7 Update typescript-eslint plugin & parser (#7351) 2021-12-13 23:39:45 +00:00
Michael Telatynski 1cd299b98e Update typescript-eslint plugin & parser (#286) 2021-12-13 23:34:46 +00:00
David Baker 3c8650065c Use app-builder-lib to get electron version (#288) 
So we can get it the same way electron-builder does and not need
electronVersion in package.json
 2021-12-13 21:15:17 +00:00
Weblate 13674ef655 Merge branch 'origin/develop' into Weblate. 2021-12-13 19:30:11 +00:00
Denys Nykula 9e4e6c25ef Translated using Weblate (Ukrainian) 
Currently translated at 89.7% (3009 of 3354 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
 2021-12-13 19:30:10 +00:00
Travis Ralston 0bb7f3d3ee Fix conflict chunk in lockfile 2021-12-13 12:29:09 -07:00
David Baker e2bdedfec1 Put electronVersion back (#287) 
seems letting electron builder take it from the dependencies confuses
the keytar build process
 2021-12-13 17:04:03 +00:00
Weblate 7fad0ea98e Merge branch 'origin/develop' into Weblate. 2021-12-13 16:46:54 +00:00
Timo ed895f5881 Always unhide widgets on layout change (pinning a widget) (#7299) 2021-12-13 17:46:50 +01:00
Weblate d03a3ecf32 Merge branch 'origin/develop' into Weblate. 2021-12-13 16:46:49 +00:00
Denys Nykula ad4d746d70 Translated using Weblate (Ukrainian) 
Currently translated at 82.9% (2781 of 3354 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
 2021-12-13 16:46:49 +00:00
Timo f938bfaab9 Right panel chat style changes for read receipts and optimizations for smaller widths (#7297) 
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
 2021-12-13 17:46:32 +01:00
RiotRobot aa6e4d5ce2 Merge branch 'master' into develop 2021-12-13 15:45:09 +00:00
RiotRobot 846a8df9a6 v1.9.7 2021-12-13 15:44:56 +00:00
RiotRobot eb8429ae9d Prepare changelog for v1.9.7 2021-12-13 15:44:56 +00:00
RiotRobot e747380057 Merge branch 'master' into develop 2021-12-13 15:44:04 +00:00
RiotRobot eae38311b2 v1.9.7 v1.9.7 2021-12-13 15:36:54 +00:00
RiotRobot 1b6b1a8621 Prepare changelog for v1.9.7 2021-12-13 15:36:53 +00:00
Kat Gerasimova 46bcd13e05 Update trigger for PR workflow (#20159) 
pull_request doesn't pass permissions correctly for the action to work.
 2021-12-13 15:36:10 +00:00
David Baker 89b1e39b80 Merge pull request from GHSA-mjrg-9f8r-h3m7 
* Patch part 1: remove electronVersion

We no longer need to specify electronVersion at all since electron
is now in devDependencies. Removing it means electron can be updated
the same way as any other dependency.

* Only allow main app page to be opened via URL

We previously allowed any URL to be opened in the main electron
window. Allow only the main app page, as commented.

* use exact equals

* Make url logic clearer
 2021-12-13 15:35:27 +00:00
RiotRobot 80cf11135d Upgrade matrix-react-sdk to 3.36.1 2021-12-13 15:33:35 +00:00
RiotRobot 9eb5af53e2 Upgrade matrix-js-sdk to 15.2.1 2021-12-13 15:32:59 +00:00
Weblate 21a163d1dd Merge branch 'origin/develop' into Weblate. 2021-12-13 15:31:00 +00:00
RiotRobot 56dcce6bfc Merge branch 'master' into develop 2021-12-13 15:30:11 +00:00
RiotRobot b693ecffb8 v3.36.1 2021-12-13 15:27:02 +00:00
RiotRobot f94ec6dfbd Prepare changelog for v3.36.1 2021-12-13 15:27:01 +00:00
RiotRobot 72bdd61407 Upgrade matrix-js-sdk to 15.2.1 2021-12-13 15:25:24 +00:00
David Baker b9880e2463 Merge pull request from GHSA-mjrg-9f8r-h3m7 
* Patch part 1: remove electronVersion

We no longer need to specify electronVersion at all since electron
is now in devDependencies. Removing it means electron can be updated
the same way as any other dependency.

* Only allow main app page to be opened via URL

We previously allowed any URL to be opened in the main electron
window. Allow only the main app page, as commented.

* use exact equals

* Make url logic clearer
 2021-12-13 15:09:53 +00:00
Weblate d58bee3d0d Merge branch 'origin/develop' into Weblate. 2021-12-13 15:00:14 +00:00
Michael Telatynski 9c0868ce4f Fix upgraded rooms wrongly showing up in spotlight (#7341) 2021-12-13 15:00:09 +00:00
Weblate 7bd0f2e4b8 Merge branch 'origin/develop' into Weblate. 2021-12-13 15:00:06 +00:00
Denys Nykula dc884e4ece Translated using Weblate (Ukrainian) 
Currently translated at 81.7% (2743 of 3354 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
 2021-12-13 15:00:06 +00:00
Michael Telatynski 58e79d836d Iterate space panel toggle collapse interaction (#7335) 2021-12-13 14:59:50 +00:00
David Baker 2ceed006aa Fix CallPreview room is null (#7265) (#7348) 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-12-13 14:59:36 +00:00
David Baker 0637c2e74d update olm to 3.2.8 (#20160) 2021-12-13 14:59:21 +00:00
David Baker b54a6d570e update olm to 3.2.8 (#7347) 2021-12-13 14:59:13 +00:00
Weblate 4347335383 Merge branch 'origin/develop' into Weblate. 2021-12-13 14:05:48 +00:00
Germain ce570ab827 Hook threads notification state to UI (#7298) 2021-12-13 14:05:42 +00:00
Michael Telatynski 7f292b12ea Update Typescript to 4.5 (#285) 2021-12-13 13:39:24 +00:00
Michael Telatynski 1e386f7786 Update Typescript to 4.5 (#20157) 2021-12-13 13:38:56 +00:00
Weblate ba219fc35e Merge branch 'origin/develop' into Weblate. 2021-12-13 13:12:28 +00:00
Andy Balaam 55eda7314b Show votes in replied-to polls (pass in getRelationsForEvent) (#7345) 2021-12-13 13:12:22 +00:00
Weblate 4846a595d9 Merge branch 'origin/develop' into Weblate. 2021-12-13 12:44:08 +00:00
Šimon Brandner 43499b9244 Update status message in the member list and user info panel when it is changed (#7338) 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-12-13 12:44:03 +00:00
Weblate 75528469d6 Merge branch 'origin/develop' into Weblate. 2021-12-13 12:42:41 +00:00
Michael Telatynski a46de3b9b3 Improving typing around Message Edit History Dialog (#7342) 
* Improving typing around Message Edit History Dialog

* Update Typescript to 4.5

* Depend on TS4.5

* Update types for TS4.5
 2021-12-13 12:42:36 +00:00
Weblate df81377bf1 Merge branch 'origin/develop' into Weblate. 2021-12-13 11:22:57 +00:00