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

[NEW] Upstream catchup #1389

Open
wants to merge 825 commits into
base: develop
Choose a base branch
from
Open

[NEW] Upstream catchup #1389

wants to merge 825 commits into from

Conversation

bhardwajaditya
Copy link

Proposed changes behind a paywall

  • Only one new department, old ones work fine
  • 3 custom app installation

Issue(s)

Steps to test or reproduce

Further comments

yash-rajpal and others added 30 commits February 7, 2023 20:25
…ketChat#27877)

Co-authored-by: Allan RIbeiro <35040806+AllanPazRibeiro@users.noreply.github.com>
Co-authored-by: Kevin Aleman <11577696+KevLehman@users.noreply.github.com>
Co-authored-by: Yash Rajpal <58601732+yash-rajpal@users.noreply.github.com>
Co-authored-by: Rodrigo Nascimento <234261+rodrigok@users.noreply.github.com>
Co-authored-by: gabriellsh <40830821+gabriellsh@users.noreply.github.com>
Co-authored-by: Tasso Evangelista <2263066+tassoevan@users.noreply.github.com>
)

Co-authored-by: Douglas Fabris <27704687+dougfabris@users.noreply.github.com>
Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>
)

Co-authored-by: Yash Rajpal <58601732+yash-rajpal@users.noreply.github.com>
Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>
…tChat#27644)

Co-authored-by: Hugo Costa <20212776+hugocostadev@users.noreply.github.com>
…hen running monolith to keep performance (RocketChat#27854)

Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>
Co-authored-by: Júlia Jaeger Foresti <60678893+juliajforesti@users.noreply.github.com>
Co-authored-by: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
* chore: add register button to kebab menu

* chore: change name section to registration

* chore: use new register section

* chore: add registered workspace modal

* chore: Add workspace registration modal

* chore: register workspace setup modal

* chore: add modal to register workspace with token

* chore: adding translations to workspace registration

* chore: open registered modal when user clicks manage

* chore: separate register workspace setup modals

* feat: Add deregister flow

* feat: register workspace connected with backend

* feat: register with token connected with backend service

* improve: Use workspace token when interacting with Marketplace (RocketChat#27875)

* add: use workspace token when interacting with Marketplace

* fix: formatting

---------

Co-authored-by: Thassio Victor <tvmcarvalho@gmail.com>
Co-authored-by: Aaron Ogle <geekgonecrazy@users.noreply.github.com>

* improve: Remove Cloud Login restrictions from Marketplace (RocketChat#27896)

* feat: remove login button

* feat: remove login button

* fix: add developmentModeButton

---------

Co-authored-by: Aaron Ogle <geekgonecrazy@users.noreply.github.com>

* Sync disconnect wishes

* correct boolean to pass inverse

If registerServer is true needs to pass false as they didn't chose not
to be

* added reconnect method

* added reconnect method

* add back the disconnect since the unregister code was reverted

* chore: move register setup to another modal

* chore: add connect workspace functionality

* chore: finishing workspace registration

* fix broken import

* fix: add missing translations

* fix: tests dependencies

* fix: small lint issue

* deregister / unregister -> disconnect in i18n

* remove un-necessary sync

* finish RocketChat#27896 remove login requirement from marketplace

* remove unused imports

* fix: administration model list tests

* deregister -> disconnect

* fix: duplied translation

* fix: iframe modal url token object error

* fix: translations error, CS-353, CS-340

---------

Co-authored-by: Pedro Berleze Rorato <41977327+PedroRorato@users.noreply.github.com>
Co-authored-by: Aaron Ogle <geekgonecrazy@users.noreply.github.com>
Co-authored-by: David Alen <davidalen.dev@gmail.com>
Co-authored-by: Thassio Victor <tvmcarvalho@gmail.com>
Co-authored-by: Aaron Ogle <aaron@geekgonecrazy.com>
Co-authored-by: PedroRorato <pedroberorato@gmail.com>
Co-authored-by: Hugo Costa <hugocarreiracosta@gmail.com>
Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>
…echnology and limit to Enterprise only (RocketChat#27969)

Co-authored-by: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
…chive (RocketChat#27753)

Co-authored-by: Diego Sampaio <8591547+sampaiodiego@users.noreply.github.com>
Co-authored-by: Kevin Aleman <11577696+KevLehman@users.noreply.github.com>
Co-authored-by: Tasso Evangelista <2263066+tassoevan@users.noreply.github.com>
rique223 and others added 29 commits March 8, 2023 00:29
…t#28312)

Co-authored-by: Douglas Fabris <27704687+dougfabris@users.noreply.github.com>
Co-authored-by: Rodrigo Nascimento <234261+rodrigok@users.noreply.github.com>
Co-authored-by: Guilherme Gazzo <5263975+ggazzo@users.noreply.github.com>
Co-authored-by: Douglas Gubert <1810309+d-gubert@users.noreply.github.com>
Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>
Co-authored-by: dougfabris <devfabris@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.