Commit Graph

37525 Commits (48b3009c7318d323c3a4946c55a36d57ab583276)

Author SHA1 Message Date
David Baker 45beed43cb
Merge pull request #6690 from matrix-org/palid/releasefix/edit-message-history
[Release] Fix commit edit history
2021-08-26 14:17:10 +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
Dariusz Niemczyk 9299c5b1a5
Fix commit edit history
Fix https://github.com/vector-im/element-web/issues/18742
2021-08-26 15:04:30 +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
J. Ryan Stinnett d013ae79b7 Fix changelog link colour back to blue
https://github.com/matrix-org/matrix-react-sdk/pull/5698 changed all dialog
links to green, which is not expected. In general, we use blue links for
information and green links for actions.

This resolves the regression by removing the general change and adjusting the
new links added by the above PR to be green as desired there.

Fixes https://github.com/vector-im/element-web/issues/18726
2021-08-26 13:59:12 +01:00
Šimon Brandner f54c6d75ac
Fix areAnyCallsUnsilenced()
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-26 14:59:06 +02:00
Dariusz Niemczyk e2419dc75b
Make stronger background blur for light theme
Fixes https://github.com/vector-im/element-web/issues/18708
2021-08-26 12:41:29 +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
Germain Souquet f0a4225bf7 Remove unused renderEventTile method 2021-08-26 08:45:00 +01:00
Germain Souquet bd1aa01b67 Update copyright and method accessors 2021-08-26 08:19:44 +01:00
Germain Souquet 4e0f52118d Update VoiceRecordComposerTile to only end recording 2021-08-26 08:07:51 +01:00
Germain Souquet cb8e62c0b2 human linter and copyright fixer 2021-08-26 08:02:36 +01:00
Travis Ralston 4415a7037c Fix left panel widgets not remembering collapsed state
Fixes https://github.com/vector-im/element-web/issues/17803

The `setExpanded` function takes a boolean, not a function.
2021-08-25 23:10:19 -06:00
Travis Ralston cafa52c466 Special case redaction event sending from widgets per MSC2762
Fixes https://github.com/vector-im/element-web/issues/18573
See 853bed2157
2021-08-25 22:40:51 -06:00
Travis Ralston 76cc5bfb7d Remember all capabilities given to a widget
Fixes https://github.com/vector-im/element-web/issues/18786

Instead of replacing the remembered set, we now add to it. This should be safe as the user expectation was previously to remember the capabilities, so we can keep appending to that list.

This commit also moves the utility functions closer to the widget driver as they aren't needed in the dialog anymore.
2021-08-25 22:30:57 -06:00
Travis Ralston f912d9d1b4 Appease the linter 2021-08-25 18:25:20 -06:00
Travis Ralston 289ac34764 Add support for MSC2762's timeline functionality
See https://github.com/matrix-org/matrix-widget-api/pull/41
2021-08-25 18:16:40 -06: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
Germain 2e2ada09cd
Merge branch 'develop' into gsouquet/compact-composer-18533 2021-08-25 19:24:05 +01: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
Germain Souquet 0208d80695 Add missing i18n 2021-08-25 18:11:34 +01:00
Germain Souquet 2d14be9cef Merge branch 'develop' into gsouquet/compact-composer-18533 2021-08-25 18:07:36 +01:00
Germain Souquet 9018973f15 Position sticker picker correctly 2021-08-25 17:59:06 +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