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
Andy Balaam f563d8c4cd Bump matrix-web-i18n to 3.1.3 for KEY_SEPARATOR (#1259) 2023-10-03 15:03:02 +01:00
RiotRobot b45e72c227 v1.11.46-rc.2
Dockerhub / Docker Buildx (push) Failing after 42s
Details
v1.11.46-rc.2 		2023-10-03 14:52:36 +01:00
RiotRobot 5c36d20b48 Prepare changelog for v1.11.46-rc.2 2023-10-03 14:52:36 +01:00
Andy Balaam 24da65701c Bump matrix-web-i18n to 3.1.3 for KEY_SEPARATOR (#26287) 2023-10-03 14:44:55 +01:00
Florian Duros 067e338b4b Cypress: Check that the new verified device is connected to key backup (#11686) 
* Check that the new verified device is connected to key backup

* Review changes. Extract key backup verification in its own function and chang parameter order of bot `bootstrapSecretStorage` call.
 2023-10-03 12:44:15 +00:00
Hugh Nimmo-Smith 4fd8ab933a Use stable get_login_token and remove unstable MSC3882 support (#11001) 
* Support for stable MSC3882 get_login_token

* Fix unstable name type

* Remove tests for unstable MSC3882

* Fix up tests
 2023-10-03 12:15:41 +00:00
RiotRobot a2e800e301 v1.11.46-rc.1 2023-10-03 12:17:51 +01:00
RiotRobot 49b87dfb53 Prepare changelog for v1.11.46-rc.1 2023-10-03 12:17:50 +01:00
RiotRobot 796e60c284 v1.11.46-rc.1
Dockerhub / Docker Buildx (push) Failing after 47s
Details
v1.11.46-rc.1 		2023-10-03 12:10:40 +01:00
RiotRobot 5aa6d0bc6a Prepare changelog for v1.11.46-rc.1 2023-10-03 12:10:39 +01:00
RiotRobot 3b47b1b523 Upgrade matrix-react-sdk to 3.82.0-rc.1 2023-10-03 12:08:27 +01:00
RiotRobot fcb961d0ea Upgrade matrix-js-sdk to 29.0.0-rc.1 2023-10-03 12:08:01 +01:00
RiotRobot 07dfa76ee7 v3.82.0-rc.1 2023-10-03 11:49:49 +01:00
RiotRobot b32814f94c Prepare changelog for v3.82.0-rc.1 2023-10-03 11:49:47 +01:00
RiotRobot f0dff0b4ed Upgrade matrix-js-sdk to 29.0.0-rc.1 2023-10-03 11:46:07 +01:00
Michael Telatynski 0ab51bc59d Update AutoDiscoveryUtils.tsx 2023-10-03 11:05:35 +01:00
Andy Balaam d34ed6b66c Merge branch 'develop' into andybalaam/share-code-between-read-receipt-tests 2023-10-03 09:08:00 +01:00
Manan Sadana ab2aef3f3e Avatar image shrink fixed (#11698) 
Co-authored-by: Manan Sadana <manan.sadana@cnhteam.onmicrosoft.com>
 2023-10-03 07:55:31 +00:00
Kerry 66854039a3 OIDC: extract token persistence functions to utils (#11690) 
* extract token persistence functions to utils

* add sugar
 2023-10-02 22:09:13 +00:00
Richard van der Hoff e8890467fe Fix a flaky cypress crypto test (#11687) 
* Fix a flaky cypress crypto test

We need to be a bit proactive to get existing shields to update when a device
is deleted.

* Handle different text between rust and legacy crypto
 2023-10-02 20:07:42 +00:00
Richard van der Hoff 6e559266df Cypress test for incoming user verification (#11688) 
* Cypress test for incoming user verification

* Fix complaint from cypress about immediate values
 2023-10-02 19:08:41 +00:00
Andy Balaam ff1057fb0a Share code for room initialisation between read receipt tests 2023-10-02 16:59:38 +01:00
Andy Balaam 966d8bd695 Ensure the bot has joined the correct room before we start the test (#11693) 2023-10-02 12:51:56 +00:00
Michael Telatynski 41a2325a2a Migrate more strings to translation keys (#11683) 2023-10-02 13:52:27 +01:00
Michael Telatynski 632d8f4bc7 Update custom translations to support nested fields in structured JSON (#11685) 
* Update matrix-web-i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Fix custom translations for structured JSON nested fields

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Fix import

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Fix export

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update @matrix-org/react-sdk-module-api

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Delint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update matrix-web-i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update matrix-web-i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2023-10-02 10:44:25 +00:00
Michael Telatynski c6e1a3d59d Improve config.md docs on custom_translations_url (#26262) 2023-10-02 11:42:41 +01:00
Andy Balaam 1897962086 Fix expectations in edit tests: edits should not cause unread (#11682) 
* Fix expectations in edit tests: edits should not cause unread

* Skip flaky test
 2023-10-02 09:55:18 +00:00
R Midhun Suresh 9a76d6b9a3 Locallazy: Convert even more strings (#11679) 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2023-10-02 11:43:00 +01:00
Andy Balaam 8d289544b3 Merge pull request #11692 from matrix-org/andybalaam/downgrade-cypress-to-12 
Downgrade Cypress to v12.
 2023-10-02 10:54:07 +01:00
Andy Balaam 97d871cba9 Merge pull request #11674 from manancodes/manancodes/Edited_message_ux_fix 
Fix: Edited message remove button is hard to reach.
 2023-10-02 10:53:19 +01:00
Andy Balaam ea6cc0fde4 Downgrade Cypress to v12. 
(On the understanding that v12 will continue to allow us to use
the sorry-cypress service for balancing test parallelisation.)

Reverts "Update dependency cypress to v13 (#11570)"
This reverts commit 35a6595080.
 2023-10-02 10:11:31 +01:00
Johannes Marbach 2984c3bdfb Remove . since path is already relative 2023-09-30 21:50:52 +02:00
Johannes Marbach 9b8d6e7607 Set context manually in NormalModuleReplacementPlugin to fix relative import paths 2023-09-29 22:02:38 +02:00
RiotRobot 00c27c4475 Merge branch 'master' into develop 2023-09-29 11:45:30 +01:00
RiotRobot 0f268891cd v1.11.45 2023-09-29 11:45:16 +01:00
RiotRobot 7377787b2f Prepare changelog for v1.11.45 2023-09-29 11:45:15 +01:00
RiotRobot 260e0fc8ac Reset matrix-react-sdk back to develop branch 2023-09-29 11:31:48 +01:00
RiotRobot 6c305121f4 Reset matrix-js-sdk back to develop branch 2023-09-29 11:31:22 +01:00
RiotRobot b7cca93ceb Merge branch 'master' into develop 2023-09-29 11:30:11 +01:00
RiotRobot ae98e3a593 v1.11.45
Dockerhub / Docker Buildx (push) Failing after 42s
Details
v1.11.45 		2023-09-29 11:24:44 +01:00
RiotRobot e4ecf42a8c Prepare changelog for v1.11.45 2023-09-29 11:24:44 +01:00
RiotRobot c47c598c0b Upgrade matrix-react-sdk to 3.81.1 2023-09-29 11:20:23 +01:00
RiotRobot 695049729c Reset matrix-js-sdk back to develop branch 2023-09-29 11:14:46 +01:00
RiotRobot be315a4186 Resetting package fields for development 2023-09-29 11:14:24 +01:00
RiotRobot 5cb09c683a Merge branch 'master' into develop 2023-09-29 11:14:19 +01:00
RiotRobot ee8e9a1c9d v3.81.1 2023-09-29 11:14:03 +01:00
RiotRobot 837253b037 Prepare changelog for v3.81.1 2023-09-29 11:14:01 +01:00
ElementRobot 696e7d2652 Bump electron to 26.2.4 (#1254) (#1255) 
(cherry picked from commit 3eb32d9ff3)

Co-authored-by: Andy Balaam <andy.balaam@matrix.org>
 2023-09-29 11:06:58 +01:00
Andy Balaam 3eb32d9ff3 Bump electron to 26.2.4 (#1254) 2023-09-29 09:15:27 +00:00
Johannes Marbach c844d80217 Merge branch 'johannes/webpack-cli-4.10.0' into johannes/webpack-5 2023-09-29 11:00:03 +02:00