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

[Upstream Catchup] Merge RC:master to master v1.29.2 #46

Merged
merged 31 commits into from
Jan 24, 2022

Conversation

github-actions[bot]
Copy link

@github-actions github-actions bot commented Jan 17, 2022

Weekly Catchup PR to merge RC:master in master.

PArt of WideChat/Rocket.Chat#1055

aditya-mitra and others added 27 commits May 12, 2021 20:06
RocketChat#452)

Signed-off-by: Debdut Chakraborty <debdut.chakraborty@rocket.chat>
…embertypo

[FIX] Typo `addMemberToBeAddedByUsername` instead of `addMemberByUsername`
Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.5 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Fix app status not updated correctly

* Use app logger for warning

* Fix linting issue

* Change up the error message when an app disables itself

Co-authored-by: Bradley Hilton <graywolf336@craftyn.com>
…#363)

* Add custom fields to messageBuilder

* Add tests to the addCustomField method and catch error when key contains a period
Co-authored-by: Douglas Gubert <douglas.gubert@gmail.com>
Co-authored-by: Douglas Gubert <douglas.gubert@gmail.com>
* Create manager for button registry

* Refactor definitions

* Add the configuration extend

* Add regiter buttons permission

* Fix styles and add appId prop to button interface

* Add activation bridge method for new buttons

* New types

* Refactor gulpfile

* Add new interaction event

* Fix gulpfile

* Fix error when app doesn't exist

* A few refactors

* Rename label property and remove icon
* Create manager for button registry

* Refactor definitions

* Add the configuration extend

* Add regiter buttons permission

* Fix styles and add appId prop to button interface

* Add activation bridge method for new buttons

* New types

* Refactor gulpfile

* Add new interaction event

* Fix gulpfile

* Fix error when app doesn't exist

* A few refactors

* Rename label property and remove icon
* [FIX] Apps not being enabled in framework load time (RocketChat#473)

* fix: adding the necessary information about the api when update

Co-authored-by: Allan Ribeiro <allan_paz_ribeiro@hotmail.com>
@Shailesh351 Shailesh351 marked this pull request as ready for review January 18, 2022 08:11
Copy link
Collaborator

@Shailesh351 Shailesh351 left a comment

Choose a reason for hiding this comment

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

Looks good to me

@Shailesh351 Shailesh351 merged commit 3e5da1c into master Jan 24, 2022
@Shailesh351 Shailesh351 changed the title [Upstream Catchup] Merge RC:master to master [Upstream Catchup] Merge RC:master to master v1.29.2 Jan 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet