mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-11-30 15:19:39 +03:00
Code Issues Projects Releases Packages Wiki Activity
29296 commits 217 branches 561 tags 443 MiB
Commit graph

29296 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
568e147053 Merge copyrights 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-21 12:44:16 +01:00
Weblate
810f579e56 Merge branch 'origin/develop' into Weblate. 2020-10-21 11:41:32 +00:00
call_xz
2ba1805f74 Translated using Weblate (Japanese) 
Currently translated at 57.1% (1354 of 2368 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ja/
 2020-10-21 11:41:31 +00:00
Michael Telatynski
fb3b5d2f5d
Merge pull request #5266 from matrix-org/t3chguy/feat/widgets 
Pinned widgets work
 2020-10-21 12:41:20 +01:00
David Baker
765fdf93e6 Support 'answered elsewhere' 
Show a dialog for now, telling the user someone beat them to it.

Only useful with https://github.com/matrix-org/matrix-js-sdk/pull/1522
(but can be merged safely without).
 2020-10-21 11:54:48 +01:00
Michael Telatynski
a5468c918e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 
 Conflicts:
	src/resizer/distributors/collapse.ts
	src/resizer/distributors/fixed.ts
	src/resizer/index.ts
	src/resizer/item.ts
	src/resizer/resizer.ts
	src/resizer/sizer.ts
 2020-10-21 09:56:22 +01:00
Michael Telatynski
5a9bac68c6 iterate PR based on feedback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-21 09:48:02 +01:00
Michael Telatynski
9cd146aa33 remove debug lines 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-21 09:46:37 +01:00
Weblate
356a1916a9 Merge branch 'origin/develop' into Weblate. 2020-10-20 22:54:29 +00:00
Nikolay Boyadzhiev
6d0dc00d4a Translated using Weblate (Bulgarian) 
Currently translated at 92.5% (2191 of 2368 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/bg/
 2020-10-20 22:54:29 +00:00
Michael Telatynski
42228719b9
Merge pull request #5343 from matrix-org/t3chguy/ts/resizer 
Convert resizer to Typescript
 2020-10-20 23:54:17 +01:00
Michael Telatynski
01498653d8 update copyrights 2020-10-20 23:42:12 +01:00
Michael Telatynski
9348c8a23b Fix some widget auto tiling issues 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-20 16:07:47 +01:00
Michael Telatynski
2b9c2daaf4 Fix auto-pinned widget ordering 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-20 16:07:21 +01:00
Michael Telatynski
334ab12c47 Tidy up widget colouring 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-20 16:06:35 +01:00
Weblate
637982d12c Merge branch 'origin/develop' into Weblate. 2020-10-20 14:21:51 +00:00
Michael Telatynski
9181e3e89a
Merge pull request #5338 from matrix-org/t3chguy/fix/15166 
Hide filtering microcopy when left panel is minimized
 2020-10-20 15:21:43 +01:00
Weblate
8a7c8eea78 Merge branch 'origin/develop' into Weblate. 2020-10-20 14:11:24 +00:00
J. Ryan Stinnett
350c536cc7
Merge pull request #5344 from matrix-org/jryans/release-disable-editor 
Skip editor confirmation of upgrades
 2020-10-20 15:11:13 +01:00
Michael Telatynski
24c4a3876c Increase Border Radius of Accessible Buttons to 8px 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-20 15:05:38 +01:00
Michael Telatynski
b6fd2a0691 Iterate the Modal Widget Dialog paddings and phishing warning 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-20 15:05:22 +01:00
J. Ryan Stinnett
31cc3765e3 Skip editor confirmation of upgrades 
In practice, the upgrades are always fine, and this editor prompt just adds
delays.
 2020-10-20 11:55:48 +01:00
Weblate
9bf6281a53 Merge branch 'origin/develop' into Weblate. 2020-10-20 10:36:44 +00:00
Michael Telatynski
5caad82f9f
Merge pull request #5337 from matrix-org/t3chguy/fix/15484 
Spec compliance, /search doesn't have to return results
 2020-10-20 11:36:37 +01:00
Weblate
baa2db227f Merge branch 'origin/develop' into Weblate. 2020-10-20 10:29:23 +00:00
Michael Telatynski
7752f92533
Merge pull request #5336 from matrix-org/t3chguy/fix/15488 
Fix excessive hosting link padding
 2020-10-20 11:29:13 +01:00
Weblate
ce2392750a Merge branch 'origin/develop' into Weblate. 2020-10-20 10:28:38 +00:00
Priit Jõerüüt
ab6cee3fba Translated using Weblate (Estonian) 
Currently translated at 100.0% (2368 of 2368 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2020-10-20 10:28:38 +00:00
XoseM
6217978378 Translated using Weblate (Galician) 
Currently translated at 99.9% (2367 of 2368 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2020-10-20 10:28:35 +00:00
LinAGKar
d0610c3a1b Translated using Weblate (Swedish) 
Currently translated at 100.0% (2368 of 2368 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/
 2020-10-20 10:28:33 +00:00
Marcelo Filho
76951ce1be Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2368 of 2368 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
 2020-10-20 10:28:31 +00:00
RiotRobot
bd1276c56b Reset matrix-js-sdk back to develop branch 2020-10-20 11:27:33 +01:00
RiotRobot
2d5528fccd Merge branch 'master' into develop 2020-10-20 11:26:23 +01:00
RiotRobot
3b90ed0664 v3.6.1 2020-10-20 11:23:48 +01:00
RiotRobot
10fbdef6d6 Prepare changelog for v3.6.1 2020-10-20 11:23:48 +01:00
Michael Telatynski
329ded92c1 Convert resizer to Typescript 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-20 11:03:03 +01:00
Michael Telatynski
b0acae6e77 fix remaining type mismatches 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 21:13:31 +01:00
Michael Telatynski
4dd8b8d8c6 fix WidgetUtils setRoomWidget signature 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 21:02:48 +01:00
Michael Telatynski
5ee0262da2 Post-merge tidy up 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 20:56:41 +01:00
Michael Telatynski
bec1d718e0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets 
 Conflicts:
	src/components/views/elements/AppTile.js
	src/utils/WidgetUtils.ts
 2020-10-19 20:50:16 +01:00
Michael Telatynski
16362440b3 Iterate Modal Widgets 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 20:39:43 +01:00
Michael Telatynski
00b1a03a3e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets 
 Conflicts:
	src/@types/global.d.ts
	src/FromWidgetPostMessageApi.js
	src/WidgetMessaging.js
	src/widgets/WidgetApi.ts
 2020-10-19 19:46:07 +01:00
Michael Telatynski
5fcdaf66cc Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 2020-10-19 18:50:02 +01:00
Michael Telatynski
4184923e5e fix default widget icons 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 18:49:56 +01:00
Michael Telatynski
1fe2eea43f Pass theme to Jitsi 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 18:47:27 +01:00
Michael Telatynski
06009df05b Update Widget paddings and background colours 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 18:47:15 +01:00
J. Ryan Stinnett
bdd6287fcc
Merge pull request #5342 from matrix-org/jryans/event-lib-release 
[Release] Adjust for new widget messaging APIs
 2020-10-19 17:53:29 +01:00
J. Ryan Stinnett
2219419f52 Upgrade widget API 2020-10-19 17:41:04 +01:00
J. Ryan Stinnett
11199f89f4 Adjust for new widget messaging APIs 
As part of changing to the `events` package, the API surface changed slightly.

Related to https://github.com/vector-im/element-web/issues/15493
 2020-10-19 17:38:28 +01:00
Weblate
762044b526 Merge branch 'origin/develop' into Weblate. 2020-10-19 16:31:10 +00:00