Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Pinned widgets work #5266

Merged
merged 42 commits into from
Oct 21, 2020
Merged

Pinned widgets work #5266

merged 42 commits into from
Oct 21, 2020

Conversation

t3chguy
Copy link
Member

@t3chguy t3chguy commented Sep 30, 2020

Signed-off-by: Michael Telatynski <[email protected]>
Signed-off-by: Michael Telatynski <[email protected]>
… t3chguy/feat/widgets

� Conflicts:
�	src/components/views/right_panel/WidgetCard.tsx
�	src/stores/WidgetStore.ts
Signed-off-by: Michael Telatynski <[email protected]>
Signed-off-by: Michael Telatynski <[email protected]>
… t3chguy/feat/widgets

� Conflicts:
�	src/components/views/elements/AppTile.js
Signed-off-by: Michael Telatynski <[email protected]>
Signed-off-by: Michael Telatynski <[email protected]>
Signed-off-by: Michael Telatynski <[email protected]>
Signed-off-by: Michael Telatynski <[email protected]>
Signed-off-by: Michael Telatynski <[email protected]>
Signed-off-by: Michael Telatynski <[email protected]>
Signed-off-by: Michael Telatynski <[email protected]>
Signed-off-by: Michael Telatynski <[email protected]>
Signed-off-by: Michael Telatynski <[email protected]>
… t3chguy/feat/widgets

� Conflicts:
�	src/components/structures/RoomView.tsx
Signed-off-by: Michael Telatynski <[email protected]>
… t3chguy/feat/widgets

� Conflicts:
�	res/css/views/rooms/_AppsDrawer.scss
�	src/components/views/elements/AppTile.js
�	src/components/views/rooms/AppsDrawer.js
Signed-off-by: Michael Telatynski <[email protected]>
Signed-off-by: Michael Telatynski <[email protected]>
Signed-off-by: Michael Telatynski <[email protected]>
@t3chguy t3chguy marked this pull request as ready for review October 19, 2020 20:48
@t3chguy t3chguy requested review from a team October 19, 2020 20:48
Signed-off-by: Michael Telatynski <[email protected]>
Signed-off-by: Michael Telatynski <[email protected]>
Signed-off-by: Michael Telatynski <[email protected]>
@turt2live turt2live requested review from turt2live and removed request for a team October 20, 2020 15:14
Signed-off-by: Michael Telatynski <[email protected]>
Signed-off-by: Michael Telatynski <[email protected]>
… 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
Copy link
Contributor

@nadonomy nadonomy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@t3chguy t3chguy merged commit fb3b5d2 into develop Oct 21, 2020
@t3chguy t3chguy deleted the t3chguy/feat/widgets branch October 21, 2020 14:10
@luixxiul luixxiul mentioned this pull request May 1, 2023
3 tasks
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unpin option on stickerpicker
3 participants