Commit Graph

37074 Commits (fa758764e6fa53060f5ae6d1a64cf56e0903f114)

Author SHA1 Message Date
Weblate fa758764e6 Merge branch 'origin/develop' into Weblate. 2021-08-26 13:23:53 +00:00
David Baker 9aadb7c487
Merge pull request #6564 from SimonBrandner/fix/codeblock-border/18367
Soften codeblock border color
2021-08-26 14:23:48 +01:00
Weblate 5e4c123ab2 Merge branch 'origin/develop' into Weblate. 2021-08-26 13:15:38 +00:00
David Baker c13b3be600
Merge pull request #6691 from SimonBrandner/fix/agressive-pausing/18588
Pause ringing more aggressively
2021-08-26 14:15:33 +01:00
Šimon Brandner 6003e12e48
Fix color name
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-26 15:12:26 +02:00
Šimon Brandner 408c327943
Merge remote-tracking branch 'upstream/develop' into fix/codeblock-border/18367 2021-08-26 15:11:46 +02:00
Weblate 310a02b7c8 Merge branch 'origin/develop' into Weblate. 2021-08-26 13:11:23 +00:00
sr093906 8297264c73 Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (3143 of 3143 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
2021-08-26 13:11:23 +00:00
Dariusz Niemczyk 762fad08c4
Merge pull request #6689 from matrix-org/palid/fix/message-edit-history
Fix commit edit history
2021-08-26 15:11:13 +02:00
Dariusz Niemczyk fc1dd51046
Fix commit edit history
Fix https://github.com/vector-im/element-web/issues/18742
2021-08-26 15:05:35 +02:00
Šimon Brandner 242b4e73b9
Pause ringing more aggressively
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-26 15:00:56 +02:00
Šimon Brandner e4f8c795bc
Add stopRingingIfPossible()
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-26 15:00:36 +02:00
Šimon Brandner f54c6d75ac
Fix areAnyCallsUnsilenced()
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-26 14:59:06 +02:00
Weblate 45af2259c3 Merge branch 'origin/develop' into Weblate. 2021-08-26 08:42:35 +00:00
Szimszon 7450effc10 Translated using Weblate (Hungarian)
Currently translated at 100.0% (3143 of 3143 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
2021-08-26 08:42:35 +00:00
David Baker e79ac4b63f
Merge pull request #6679 from matrix-org/dbkr/allchange102
Update changelog generator
2021-08-26 09:42:26 +01:00
Weblate e0f55f8849 Merge branch 'origin/develop' into Weblate. 2021-08-25 19:53:42 +00:00
Szimszon a09ee0246f Translated using Weblate (Hungarian)
Currently translated at 99.7% (3134 of 3143 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
2021-08-25 19:53:42 +00:00
Germain ee95e36a7c
Merge pull request #6675 from matrix-org/gsouquet/remove-linter-warning
Add ESLint shared settings to detect React version
2021-08-25 20:53:35 +01:00
Weblate 6997b58dff Merge branch 'origin/develop' into Weblate. 2021-08-25 19:37:57 +00:00
Travis Ralston 8fd44f0b5e
Merge pull request #6595 from SimonBrandner/fix/rl-resort/110
Don't re-sort the room-list based on profile/status changes
2021-08-25 13:37:53 -06:00
Weblate e14cc907d8 Merge branch 'origin/develop' into Weblate. 2021-08-25 19:36:52 +00:00
Travis Ralston aa0a753105
Merge pull request #6681 from SimonBrandner/fix/codeblock-formatting
Fix codeblock formatting with syntax highlighting on
2021-08-25 13:36:47 -06:00
Weblate a0d9d44286 Merge branch 'origin/develop' into Weblate. 2021-08-25 19:34:17 +00:00
Travis Ralston d442845cb9
Merge pull request #6680 from SimonBrandner/fix/commands/18670
Fix command autocomplete
2021-08-25 13:34:13 -06:00
Weblate 153f692431 Merge branch 'origin/develop' into Weblate. 2021-08-25 18:20:01 +00:00
aethralis 0cbeb7a0c1 Translated using Weblate (Estonian)
Currently translated at 98.9% (3110 of 3143 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
2021-08-25 18:20:01 +00:00
Germain 7951c8dabc
Merge pull request #6677 from matrix-org/gsouquet/migrate-sticker-picker 2021-08-25 19:19:52 +01:00
Šimon Brandner 9f791031a8
Fix codeblock formatting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-25 18:54:52 +02:00
Šimon Brandner ecd45f7a81
Use min-height instead of height
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-25 18:38:36 +02:00
Šimon Brandner 6b6fefa73d
Fix class
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-25 18:38:20 +02:00
David Baker 59833d1306 Update changelog generator 2021-08-25 17:21:48 +01:00
Weblate 0646b7d59d Merge branch 'origin/develop' into Weblate. 2021-08-25 15:40:05 +00:00
David Baker e4f8971c67
Merge pull request #6676 from matrix-org/dbkr/yarn_upgrade_20210824
yarn upgrade
2021-08-25 16:39:59 +01:00
Weblate 6d61867e5a Merge branch 'origin/develop' into Weblate. 2021-08-25 15:16:43 +00:00
Travis Ralston dc32df1ba5
Merge pull request #6639 from SimonBrandner/feature/voice-activity
Add active speaker indicators
2021-08-25 09:16:37 -06:00
Germain Souquet 6105e046fb Remove sdk.getComponent 2021-08-25 14:38:47 +01:00
Germain Souquet f712186e64 Migrate StickerPicker to TypeScript 2021-08-25 14:26:21 +01:00
David Baker 586810d288 Not @types/react because it breaks stuff 2021-08-25 11:23:41 +01:00
David Baker b53e0eee67 yarn upgrade 2021-08-25 10:57:03 +01:00
Germain Souquet 237212b082 Add ESLint shared settings to detect React version 2021-08-25 09:36:35 +01:00
Weblate 986236ec72 Merge branch 'origin/develop' into Weblate. 2021-08-25 07:12:52 +00:00
Travis Ralston 9444995305
Merge pull request #6662 from matrix-org/travis/safe-labs
Flag a couple features as having dependencies
2021-08-25 01:12:48 -06:00
Weblate d388593173 Merge branch 'origin/develop' into Weblate. 2021-08-25 07:11:56 +00:00
waclaw66 1a4b8afa9f Translated using Weblate (Czech)
Currently translated at 100.0% (3146 of 3146 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
2021-08-25 07:11:56 +00:00
jelv e6b1f5bc56 Translated using Weblate (Dutch)
Currently translated at 100.0% (3146 of 3146 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
2021-08-25 07:11:53 +00:00
Lizzy 9207d193cb Translated using Weblate (Spanish)
Currently translated at 100.0% (3146 of 3146 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/es/
2021-08-25 07:11:50 +00:00
iaiz cfa79b9bf0 Translated using Weblate (Spanish)
Currently translated at 100.0% (3146 of 3146 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/es/
2021-08-25 07:11:50 +00:00
Travis Ralston 44543fe4ea
Merge pull request #6673 from matrix-org/travis/rm-room-list-logging
Remove advanced room logging setting
2021-08-25 01:11:39 -06:00
Šimon Brandner 78562685bb
Ignore avatar changes
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-25 08:59:42 +02:00