Skip to content

Globals/main module custom oauth#13037

Merged
rodrigok merged 24 commits intodevelopfrom
globals/main-module-custom-oauth
Jan 10, 2019
Merged

Globals/main module custom oauth#13037
rodrigok merged 24 commits intodevelopfrom
globals/main-module-custom-oauth

Conversation

@MarcosSpessatto
Copy link
Contributor

Part of #12369
Depends of: #13036

@MarcosSpessatto MarcosSpessatto added this to the 0.74.0 milestone Dec 27, 2018
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-13037 December 27, 2018 17:54 Inactive
@rodrigok rodrigok mentioned this pull request Dec 27, 2018
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-13037 January 3, 2019 00:21 Inactive
…e-custom-oauth

# Conflicts:
#	.meteor/packages
#	packages/rocketchat-lib/client/models/Avatars.js
#	packages/rocketchat-lib/client/models/Uploads.js
#	packages/rocketchat-lib/client/models/UserDataFiles.js
#	packages/rocketchat-lib/package.js
#	packages/rocketchat-lib/server/lib/metrics.js
@rodrigok rodrigok merged commit afb439f into develop Jan 10, 2019
@rodrigok rodrigok deleted the globals/main-module-custom-oauth branch January 10, 2019 22:41
alansikora pushed a commit that referenced this pull request Jan 23, 2019
* Move rocketchat settings to specific package

* WIP: Move models from rocketchat-lib to a specific package (server)

* Move function from rocketchat:lib to rocketchat:utils to use it in rocketchat:models

* Move client models from rocketchat:lib to rocketchat:models

* Fix lint

* Move rocketchat.info from lib to utils

* Remove directly dependency between lib and migrations

* Move statistics Model to rocketchat:models

* Create rocketchat:metrics to be able to depacking rocketchat callbacks

* Move  callbacks to specific package

* Remove unused dependency

* Move rocketchat-notifications to a specific package

* Remove dependency between mailer and lib

* Convert rocketchat-custom-oauth to main module structure
@sampaiodiego sampaiodiego mentioned this pull request Jan 28, 2019
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.

3 participants

Comments