sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity
35,918 Commits 4 Branches 19 Tags
e2ef5d1737acda03c186560182fa7daddff8479b
Commit Graph
35918 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Germain Souquet e2688cd5e0 Left align unbubbled events 2021-07-26 16:53:37 +02:00
Germain Souquet 486d576b23 Merge branch 'develop' into gsouquet/fix-18132 2021-07-26 15:49:55 +02:00
Germain Souquet 88bd22ded3 Make new reply UI clickable 2021-07-26 13:50:04 +02:00
Michael Telatynski 737aa1c55d delint 2021-07-26 12:41:52 +01:00
Michael Telatynski 2114e854f9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091 
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
 2021-07-26 12:36:00 +01:00
Germain Souquet 46a370a818 Fix deleted message left offset in the timeline 2021-07-26 11:01:37 +02:00
Weblate 62d16c9adf Merge branch 'origin/develop' into Weblate. 2021-07-26 08:27:35 +00:00
Michael TelatynskiandGitHub 405fe436a6 Merge pull request #6469 from matrix-org/t3chguy/fix/18211 
Fix editing of <sub> & <sup> & <u>
 2021-07-26 09:27:30 +01:00
Germain Souquet 2577211855 Make CallEvent tiles the same width all the time 2021-07-26 09:42:17 +02:00
Germain Souquet 468887415a Merge branch 'develop' into gsouquet/fix-18144 2021-07-26 09:25:31 +02:00
GermainandGitHub 774e743741 Update res/css/views/rooms/_EventBubbleTile.scss 2021-07-26 08:16:13 +01:00
Weblate 8b33616aef Merge branch 'origin/develop' into Weblate. 2021-07-26 06:46:56 +00:00
GermainandGitHub dbe24fab70 Merge pull request #6461 from matrix-org/gsouquet/fix-18128 2021-07-26 07:46:52 +01:00
GermainandGitHub c7bbb497f9 Merge branch 'develop' into gsouquet/fix-18128 2021-07-26 07:41:42 +01:00
Weblate ae0078c7ba Merge branch 'origin/develop' into Weblate. 2021-07-26 06:41:04 +00:00
Priit JõerüütandWeblate 418aee4c4c Translated using Weblate (Estonian) 
Currently translated at 98.7% (3043 of 3080 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-07-26 06:41:04 +00:00
jelvandWeblate 92394ac996 Translated using Weblate (Dutch) 
Currently translated at 99.0% (3052 of 3080 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-07-26 06:41:00 +00:00
a5r0nandWeblate ee92c09927 Translated using Weblate (Hebrew) 
Currently translated at 83.7% (2581 of 3080 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/he/
 2021-07-26 06:40:57 +00:00
NetanelHarrisandWeblate 2c2031a07b Translated using Weblate (Hebrew) 
Currently translated at 83.7% (2581 of 3080 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/he/
 2021-07-26 06:40:57 +00:00
GermainandGitHub 93ae5c20d6 Merge pull request #6464 from matrix-org/gsouquet/fix-18172 
Fix reactions row pushing content on IRC layout
 2021-07-26 07:40:49 +01:00
Šimon Brandner 3ef20174f3 Fix issues with the controls disappearing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-25 18:11:29 +02:00
Šimon Brandner 1754602613 Increase CONTROLS_HIDE_DELAY 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-25 17:30:59 +02:00
Šimon Brandner 03a8308ae8 Fix call type icon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-25 17:24:18 +02:00
Šimon Brandner a8d27746b4 Show dialpad only when PSTN supported 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-25 17:07:18 +02:00
Šimon Brandner 8c635884d9 Add comment 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-25 11:05:52 +02:00
Šimon Brandner 456800af21 i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-25 10:57:51 +02:00
Šimon Brandner a2c7035163 Tweak copy 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-25 10:57:46 +02:00
Šimon Brandner 7c805501bc Cleanup hangup dialogs 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-25 10:56:04 +02:00
Šimon Brandner f7087d5148 Add declined state 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-25 10:30:53 +02:00
Šimon Brandner f63b6fc0a9 Support for getting reject info 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-25 10:28:27 +02:00
Šimon Brandner 4784ddc175 Add state for when the remote doesn't pick up 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-25 08:57:29 +02:00
Šimon Brandner aedd535c92 Correct iconography for missed calls 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-25 08:37:25 +02:00
Šimon Brandner 4aa8d8ff21 Add missed call icons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-25 08:36:41 +02:00
Šimon Brandner 50c27ebed7 Add myself to the license header as I need to re-run the CI 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-25 08:16:55 +02:00
Šimon Brandner b762303102 Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-25 08:10:01 +02:00
Priit JõerüütandWeblate 02d8a82f99 Translated using Weblate (Estonian) 
Currently translated at 98.4% (3032 of 3080 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-07-25 02:25:19 +00:00
Jeff HuangandWeblate 571948d24a Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3080 of 3080 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-07-25 02:25:16 +00:00
Michael Telatynski fa550a65af Fix editing of <sub> & <sup> & <u> 2021-07-23 19:01:12 +01:00
Michael Telatynski 64e3c72f65 Fix bad import due to naming clash 2021-07-23 18:51:27 +01:00
Michael Telatynski 70d8378a66 delint 2021-07-23 18:50:25 +01:00
Michael Telatynski c8d9294350 Discard unused utility now that we use Object.fromEntries 2021-07-23 18:40:22 +01:00
Michael Telatynski 05a9023bac delint and tidy code 2021-07-23 18:31:31 +01:00
Michael Telatynski 1ba601ba22 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096 
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/components/views/dialogs/BetaFeedbackDialog.tsx
 2021-07-23 18:28:21 +01:00
Weblate 13e6aabb48 Merge branch 'origin/develop' into Weblate. 2021-07-23 17:21:52 +00:00
Priit JõerüütandWeblate c87615c6a7 Translated using Weblate (Estonian) 
Currently translated at 98.2% (3026 of 3080 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-07-23 17:21:52 +00:00
Michael TelatynskiandGitHub 869a5fb5c7 Merge pull request #6467 from matrix-org/t3chguy/fix/18110 2021-07-23 18:21:43 +01:00
Šimon Brandner d206a0b8d3 Merge remote-tracking branch 'upstream/develop' into fix/quotes/18199 2021-07-23 18:39:42 +02:00
Šimon Brandner c6df7e4e41 Style markdown quotes 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-23 17:46:49 +02:00
Weblate 12aeab41d3 Merge branch 'origin/develop' into Weblate. 2021-07-23 15:23:43 +00:00
Michael TelatynskiandGitHub e78a1adb6f Merge pull request #6459 from matrix-org/t3chguy/eslint1 2021-07-23 16:23:38 +01:00