Commit graph

13500 commits

Author SHA1 Message Date
Weblate
e5bdb724c4 Merge branch 'origin/develop' into Weblate. 2023-02-01 09:42:00 +00:00
Michael Telatynski
a479f86952
Update build_develop.yml 2023-02-01 09:41:54 +00:00
Weblate
de2e0782d7 Merge branch 'origin/develop' into Weblate. 2023-01-31 15:04:03 +00:00
RiotRobot
934eb22d3a Merge branch 'master' into develop 2023-01-31 15:03:56 +00:00
RiotRobot
32d8db588f v1.11.22 2023-01-31 14:59:36 +00:00
RiotRobot
4a1a563daa Prepare changelog for v1.11.22 2023-01-31 14:59:36 +00:00
Weblate
ff6feb7bcd Merge branch 'origin/develop' into Weblate. 2023-01-31 11:17:05 +00:00
RiotRobot
4c19d2bd02 Reset matrix-react-sdk back to develop branch 2023-01-31 11:16:59 +00:00
RiotRobot
f868289959 Reset matrix-js-sdk back to develop branch 2023-01-31 11:16:44 +00:00
Weblate
dcdc8c6e10 Merge branch 'origin/develop' into Weblate. 2023-01-31 11:16:37 +00:00
RiotRobot
f3e1569ec2 Merge branch 'master' into develop 2023-01-31 11:16:30 +00:00
RiotRobot
43c0b67505 v1.11.21 2023-01-31 11:12:38 +00:00
RiotRobot
87650aaf84 Prepare changelog for v1.11.21 2023-01-31 11:12:38 +00:00
RiotRobot
8b0c530a99 Upgrade matrix-react-sdk to 3.65.0 2023-01-31 11:08:54 +00:00
RiotRobot
1803ae57c5 Upgrade matrix-js-sdk to 23.2.0 2023-01-31 11:06:37 +00:00
Weblate
f4cf3a27b3 Merge branch 'origin/develop' into Weblate. 2023-01-31 10:59:25 +00:00
maheichyk
583ac3de96
Jitsi requests 'requires_client' capability if auth token is provided (#24294)
* Jitsi requests 'io.element.requires_client' capability if auth token is provided

* Added a comment that Jitsi should request 'requires_client' capability to hide the popup icon in the Element if auth token is provided.

---------

Co-authored-by: Mikhail Aheichyk <mikhail.aheichyk@nordeck.net>
2023-01-31 10:59:17 +00:00
Weblate
40b4e82802 Merge branch 'origin/develop' into Weblate. 2023-01-30 14:08:19 +00:00
Michael Telatynski
50f2b532e9
Update build_develop.yml 2023-01-30 14:08:15 +00:00
Weblate
a92eb3ddce Merge branch 'origin/develop' into Weblate. 2023-01-30 14:01:34 +00:00
Johannes Marbach
9db99f6412
Merge pull request #24368 from vector-im/Johennes-patch-1
Include Janne in WAT assignment automation
2023-01-30 15:01:26 +01:00
Johannes Marbach
ee80d1b963
Include Janne in WAT assignment automation 2023-01-30 14:35:56 +01:00
theamazing0
2ef14d322b Translated using Weblate (English (United States))
Currently translated at 100.0% (30 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/en_US/
2023-01-29 17:33:28 +00:00
Weblate
f081b628f0 Merge branch 'origin/develop' into Weblate. 2023-01-26 15:43:07 +00:00
David Baker
1bb354e96d
Document the decoder ring (#24317)
* Document the decoder ring

Also a few little tidy-ups.

* Prettier
2023-01-26 15:43:02 +00:00
Weblate
5bdb1bc417 Merge branch 'origin/develop' into Weblate. 2023-01-25 12:35:14 +00:00
renovate[bot]
bd26775dcb
Update dependency ua-parser-js to v1.0.33 [SECURITY] (#24311)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-01-25 12:35:07 +00:00
RiotRobot
1ea3e2ea3a v1.11.21-rc.1 2023-01-24 11:41:48 +00:00
RiotRobot
a1680a0fa5 Prepare changelog for v1.11.21-rc.1 2023-01-24 11:41:47 +00:00
RiotRobot
f8ad575dfa Upgrade matrix-react-sdk to 3.65.0-rc.1 2023-01-24 11:39:39 +00:00
RiotRobot
22c0b4e4df Upgrade matrix-js-sdk to 23.2.0-rc.1 2023-01-24 11:39:20 +00:00
Weblate
b1c9bb02b2 Merge branch 'origin/develop' into Weblate. 2023-01-24 10:28:55 +00:00
Element Translate Bot
89564accb6
Translations update from Weblate (#24307)
* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (30 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/pt_BR/

* Translated using Weblate (Arabic)

Currently translated at 100.0% (30 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/ar/

* Translated using Weblate (Hungarian)

Currently translated at 100.0% (30 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/hu/

* Translated using Weblate (Icelandic)

Currently translated at 100.0% (30 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/is/

Co-authored-by: Feroli <feroli@tuta.io>
Co-authored-by: Weblate <translate@riot.im>
Co-authored-by: Ali-x98 <ahj696@hotmail.com>
Co-authored-by: Balázs Meskó <meskobalazs@gmail.com>
Co-authored-by: Sveinn í Felli <sv1@fellsnet.is>
2023-01-24 10:28:50 +00:00
Weblate
d4556045dd Merge branch 'origin/develop' into Weblate. 2023-01-23 13:24:08 +00:00
Sveinn í Felli
2e6ecc832e Translated using Weblate (Icelandic)
Currently translated at 100.0% (30 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/is/
2023-01-23 13:24:08 +00:00
Andy Balaam
53c98baa6d
Merge pull request #22993 from Johennes/feature/default-pin-drop
Move pin drop out of labs (PSG-664)
2023-01-23 13:24:00 +00:00
Johannes Marbach
c614c5bf13 Merge branch 'develop' into feature/default-pin-drop 2023-01-23 13:34:29 +01:00
Weblate
2084ef4bbc Merge branch 'origin/develop' into Weblate. 2023-01-20 13:03:37 +00:00
Richard van der Hoff
0990a0dcdd
Delete triage-priority-bugs.yml (#24266)
This was moving issues to a non-existent board
2023-01-20 13:03:32 +00:00
RiotRobot
022a269e99 Reset matrix-react-sdk back to develop branch 2023-01-20 13:02:45 +00:00
Weblate
665b5d05ae Merge branch 'origin/develop' into Weblate. 2023-01-20 12:59:18 +00:00
RiotRobot
138957dc4e Reset matrix-js-sdk back to develop branch 2023-01-20 12:58:38 +00:00
RiotRobot
bf515ea265 Reset matrix-react-sdk back to develop branch 2023-01-20 12:58:14 +00:00
RiotRobot
ae638d2643 Merge branch 'master' into develop 2023-01-20 12:56:49 +00:00
Weblate
31816f859b Merge branch 'origin/develop' into Weblate. 2023-01-20 12:55:22 +00:00
Weblate
b339ac565f Merge branch 'origin/develop' into Weblate. 2023-01-20 12:53:26 +00:00
RiotRobot
54e6faca7c v1.11.20 2023-01-20 12:52:01 +00:00
RiotRobot
0edd42b9fc Prepare changelog for v1.11.20 2023-01-20 12:52:01 +00:00
RiotRobot
5438709be3 Upgrade matrix-react-sdk to 3.64.2 2023-01-20 12:47:27 +00:00
RiotRobot
28b14c62ce Upgrade matrix-js-sdk to 23.1.1 2023-01-20 12:46:31 +00:00