Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] develop from matrix-org:develop #184

Merged
merged 3,250 commits into from
Aug 27, 2021
Merged

Conversation

pull[bot]
Copy link

@pull pull bot commented Jun 14, 2021

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

@pull pull bot added the ⤵️ pull label Jun 14, 2021
dbkr and others added 29 commits August 18, 2021 11:54
Currently translated at 47.4% (1492 of 3142 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
Currently translated at 95.0% (2988 of 3142 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/eo/
Currently translated at 100.0% (3142 of 3142 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
Currently translated at 97.2% (3056 of 3142 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
Currently translated at 97.4% (3061 of 3142 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
Currently translated at 97.4% (3062 of 3142 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
…undefined

Fix error on accessing encrypted media without keys
Currently translated at 98.5% (3097 of 3142 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
…ion/18415

Fix FilePanel pagination in E2EE rooms
Currently translated at 100.0% (3142 of 3142 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
Currently translated at 96.4% (3032 of 3142 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
turt2live and others added 29 commits August 25, 2021 13:34
Fix codeblock formatting with syntax highlighting on
Don't re-sort the room-list based on profile/status changes
Add ESLint shared settings to detect React version
Fixes element-hq/element-web#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.
Fixes element-hq/element-web#17803

The `setExpanded` function takes a boolean, not a function.
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
#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 element-hq/element-web#18726
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
Fix left panel widgets not remembering collapsed state
Fix client forgetting which capabilities a widget was approved for
Special case redaction event sending from widgets per MSC2762
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
Always trigger the first amplitude capture from the worklet
Set the new layout setting when reading it
@skolmer skolmer merged commit 9d9f590 into nordeck:develop Aug 27, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.