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.

Sign up for GitHub

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

Jump to bottom

Convert rocketchat-analytics to main module structure #12506

Merged
merged 77 commits into from
Nov 1, 2018
Merged

Convert rocketchat-analytics to main module structure #12506

merged 77 commits into from
Nov 1, 2018

Commits on Oct 19, 2018

  1. First wave of removal of Meteor global

    @rodrigok
    rodrigok committed Oct 19, 2018
    Configuration menu
    Copy the full SHA
    ad2cd8c View commit details
    Browse the repository at this point in the history

  2. Second wave of removal of Meteor global

    @rodrigok
    rodrigok committed Oct 19, 2018
    Configuration menu
    Copy the full SHA
    51095cb View commit details
    Browse the repository at this point in the history

  3. Third wave of removal of Meteor global

    @rodrigok
    rodrigok committed Oct 19, 2018
    Configuration menu
    Copy the full SHA
    3f0c9f7 View commit details
    Browse the repository at this point in the history

  4. Fix tests

    @rodrigok
    rodrigok committed Oct 19, 2018
    Configuration menu
    Copy the full SHA
    e6dfe65 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/develop' into imports/meteor-1

    @rodrigok
    rodrigok committed Oct 19, 2018
    Configuration menu
    Copy the full SHA
    6c46cd2 View commit details
    Browse the repository at this point in the history

  6. Remove global variable SHA256

    @rodrigok
    rodrigok committed Oct 19, 2018
    Configuration menu
    Copy the full SHA
    2ac4a38 View commit details
    Browse the repository at this point in the history

  7. Remove global variable WebApp

    @rodrigok
    rodrigok committed Oct 19, 2018
    Configuration menu
    Copy the full SHA
    0ebaa95 View commit details
    Browse the repository at this point in the history

  8. Remove global variable EJSON

    @rodrigok
    rodrigok committed Oct 19, 2018
    Configuration menu
    Copy the full SHA
    7db5aa9 View commit details
    Browse the repository at this point in the history

  9. Remove global variable Email

    @rodrigok
    rodrigok committed Oct 19, 2018
    Configuration menu
    Copy the full SHA
    bff9b31 View commit details
    Browse the repository at this point in the history

  10. Remove global variable HTTP

    @rodrigok
    rodrigok committed Oct 19, 2018
    Configuration menu
    Copy the full SHA
    4aafc1b View commit details
    Browse the repository at this point in the history

  11. Remove global variable Random

    @rodrigok
    rodrigok committed Oct 19, 2018
    Configuration menu
    Copy the full SHA
    4551e92 View commit details
    Browse the repository at this point in the history

  12. Remove global variable ReactiveDict

    @rodrigok
    rodrigok committed Oct 19, 2018
    Configuration menu
    Copy the full SHA
    501fec5 View commit details
    Browse the repository at this point in the history

  13. Remove global variable ReactiveVar

    @rodrigok
    rodrigok committed Oct 19, 2018
    Configuration menu
    Copy the full SHA
    963b5af View commit details
    Browse the repository at this point in the history

  14. Remove global variable Accounts

    @rodrigok
    rodrigok committed Oct 19, 2018
    Configuration menu
    Copy the full SHA
    103d8c5 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2018

  1. Remove globals variables Match and check

    @MarcosSpessatto
    MarcosSpessatto committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    7c99760 View commit details
    Browse the repository at this point in the history

  2. Remove global variable Mongo

    @MarcosSpessatto
    MarcosSpessatto committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    b4dc88d View commit details
    Browse the repository at this point in the history

  3. Remove global variable moment

    @MarcosSpessatto
    MarcosSpessatto committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    c813f5e View commit details
    Browse the repository at this point in the history

  4. Remove global variable Tracker

    @MarcosSpessatto
    MarcosSpessatto committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    c3b9886 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2018

  1. Remove global variable Blaze

    @MarcosSpessatto
    MarcosSpessatto committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    a3e965f View commit details
    Browse the repository at this point in the history

  2. Remove global variables FlowRouter and BlazeLayout

    @MarcosSpessatto
    MarcosSpessatto committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    577acf7 View commit details
    Browse the repository at this point in the history

  3. Add FlowRouter to eslint global in tests file

    @MarcosSpessatto
    MarcosSpessatto committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    2b82e3c View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2018

  1. Remove global variable DDPRateLimiter

    @MarcosSpessatto
    MarcosSpessatto committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    be79f54 View commit details
    Browse the repository at this point in the history

  2. Remove global variable Session

    @MarcosSpessatto
    MarcosSpessatto committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    70adda6 View commit details
    Browse the repository at this point in the history

  3. Remove global variable UAParser

    @MarcosSpessatto
    MarcosSpessatto committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    a9c962e View commit details
    Browse the repository at this point in the history

  4. Remove global variable Promise

    @MarcosSpessatto
    MarcosSpessatto committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    dbb0f28 View commit details
    Browse the repository at this point in the history

  5. Remove global variable Reload

    @MarcosSpessatto
    MarcosSpessatto committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    e3b4dc8 View commit details
    Browse the repository at this point in the history

  6. Remove global variable CryptoJS

    @MarcosSpessatto
    MarcosSpessatto committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    7346aa3 View commit details
    Browse the repository at this point in the history

  7. Remove global variable Template

    @MarcosSpessatto
    MarcosSpessatto committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    5f9a3d4 View commit details
    Browse the repository at this point in the history

  8. Remove global variable TAPi18n

    @MarcosSpessatto
    MarcosSpessatto committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    39e7721 View commit details
    Browse the repository at this point in the history

  9. Remove global variable TAPi18next

    @MarcosSpessatto
    MarcosSpessatto committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    f1fa949 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2018

  1. Exposing t function from rocketchat:ui package

    @MarcosSpessatto
    MarcosSpessatto committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    2d8544a View commit details
    Browse the repository at this point in the history

  2. Convert chatpal search to main module structure

    @MarcosSpessatto
    MarcosSpessatto committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    011bd15 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into imports/meteor-1

    @rodrigok
    rodrigok committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    8fbd297 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/imports/meteor-1' into imports/w… 

    …ave-2
    @rodrigok
    rodrigok committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    9f53fab View commit details
    Browse the repository at this point in the history

  5. Fix ESLint

    @rodrigok
    rodrigok committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    b844ba1 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/imports/meteor-1' into imports/w… 

    …ave-2
    @rodrigok
    rodrigok committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    a6b81b2 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/imports/wave-2' into imports/wave-3 

    # Conflicts:
#	server/methods/loadNextMessages.js
#	server/methods/loadSurroundingMessages.js
#	server/publications/messages.js
    @rodrigok
    rodrigok committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    d7a0eeb View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'origin/imports/wave-3' into imports/wave-4 

    # Conflicts:
#	packages/rocketchat-message-star/client/actionButton.js
    @rodrigok
    rodrigok committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    d119435 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'origin/imports/wave-4' into imports/wave-5 

    # Conflicts:
#	packages/rocketchat-message-star/client/actionButton.js
    @rodrigok
    rodrigok committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    8f50571 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'imports/wave-5' into imports/wave-6-main-module-chatpal… 

    …-search
    @MarcosSpessatto
    MarcosSpessatto committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    37eb898 View commit details
    Browse the repository at this point in the history

  11. Convert meteor-accounts-saml to main module structure

    @MarcosSpessatto
    MarcosSpessatto committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    ac5bfe1 View commit details
    Browse the repository at this point in the history

  12. Convert meteor-autocomplete to main module structure

    @MarcosSpessatto
    MarcosSpessatto committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    d1b3921 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2018

  1. Convert meteor-timesync package to modular structure

    @MarcosSpessatto
    MarcosSpessatto committed Oct 31, 2018
    Configuration menu
    Copy the full SHA
    0041103 View commit details
    Browse the repository at this point in the history

  2. exposing modal global variable

    @MarcosSpessatto
    MarcosSpessatto committed Oct 31, 2018
    Configuration menu
    Copy the full SHA
    eceb9c2 View commit details
    Browse the repository at this point in the history

  3. Convert rocketchat-2fa to main module structure

    @MarcosSpessatto
    MarcosSpessatto committed Oct 31, 2018
    Configuration menu
    Copy the full SHA
    00a03bf View commit details
    Browse the repository at this point in the history

  4. Change exposing of fireGlobalEvent function from window to package

    @MarcosSpessatto
    MarcosSpessatto committed Oct 31, 2018
    Configuration menu
    Copy the full SHA
    d80d71d View commit details
    Browse the repository at this point in the history

  5. Moved handleError function from client to rocketchat:lib package

    @MarcosSpessatto
    MarcosSpessatto committed Oct 31, 2018
    Configuration menu
    Copy the full SHA
    79fd68c View commit details
    Browse the repository at this point in the history

  6. Convert rocketchat:action-linsk package to main module structure

    @MarcosSpessatto
    MarcosSpessatto committed Oct 31, 2018
    Configuration menu
    Copy the full SHA
    bc1e84c View commit details
    Browse the repository at this point in the history

  7. make ChatRoom exportable by package

    @MarcosSpessatto
    MarcosSpessatto committed Oct 31, 2018
    Configuration menu
    Copy the full SHA
    c366c56 View commit details
    Browse the repository at this point in the history

  8. Convert rocketchat-analytics to main module structure

    @MarcosSpessatto
    MarcosSpessatto committed Oct 31, 2018
    Configuration menu
    Copy the full SHA
    542cc30 View commit details
    Browse the repository at this point in the history

  9. disable eslint no-undef in fireGlobalEvent

    @MarcosSpessatto
    MarcosSpessatto committed Oct 31, 2018
    Configuration menu
    Copy the full SHA
    4cd4da5 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'imports/wave-11-main-module-action-links' into imports/… 

    …wave-12-main-module-analytics
    @MarcosSpessatto
    MarcosSpessatto committed Oct 31, 2018
    Configuration menu
    Copy the full SHA
    4ac400a View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2018

  1. Merge remote-tracking branch 'origin/develop' into imports/meteor-1

    @rodrigok
    rodrigok committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    05b9956 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/imports/meteor-1' into imports/w… 

    …ave-2

# Conflicts:
#	packages/rocketchat-ui/client/views/cmsPage.js
    @rodrigok
    rodrigok committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    827f366 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/develop' into imports/wave-2 

    # Conflicts:
#	client/routes/router.js
#	client/startup/i18n.js
#	packages/chatpal-search/client/template/admin.js
#	packages/chatpal-search/server/provider/index.js
#	packages/chatpal-search/server/utils/utils.js
#	packages/meteor-accounts-saml/saml_client.js
#	packages/meteor-accounts-saml/saml_rocketchat.js
#	packages/meteor-accounts-saml/saml_server.js
#	packages/rocketchat-2fa/client/TOTPPassword.js
#	packages/rocketchat-2fa/client/accountSecurity.js
#	packages/rocketchat-2fa/server/loginHandler.js
#	packages/rocketchat-api/server/api.js
#	packages/rocketchat-api/server/v1/commands.js
#	packages/rocketchat-api/server/v1/push.js
#	packages/rocketchat-apps/client/admin/appManage.js
#	packages/rocketchat-apps/client/admin/appWhatIsIt.js
#	packages/rocketchat-apps/server/bridges/messages.js
#	packages/rocketchat-apps/server/communication/rest.js
#	packages/rocketchat-assets/server/assets.js
#	packages/rocketchat-authorization/client/views/permissions.js
#	packages/rocketchat-authorization/client/views/permissionsRole.js
#	packages/rocketchat-autotranslate/client/views/autoTranslateFlexTab.js
#	packages/rocketchat-autotranslate/server/autotranslate.js
#	packages/rocketchat-cas/client/cas_client.js
#	packages/rocketchat-cas/server/cas_server.js
#	packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.js
#	packages/rocketchat-channel-settings/client/views/channelSettings.js
#	packages/rocketchat-cors/cors.js
#	packages/rocketchat-crowd/client/loginHelper.js
#	packages/rocketchat-crowd/server/crowd.js
#	packages/rocketchat-custom-oauth/client/custom_oauth_client.js
#	packages/rocketchat-custom-oauth/server/custom_oauth_server.js
#	packages/rocketchat-custom-sounds/client/admin/soundInfo.js
#	packages/rocketchat-custom-sounds/client/lib/CustomSounds.js
#	packages/rocketchat-custom-sounds/server/startup/custom-sounds.js
#	packages/rocketchat-emoji-custom/admin/emojiInfo.js
#	packages/rocketchat-emoji-custom/server/startup/emoji-custom.js
#	packages/rocketchat-file-upload/client/lib/fileUploadHandler.js
#	packages/rocketchat-file-upload/lib/FileUploadBase.js
#	packages/rocketchat-file-upload/server/lib/proxy.js
#	packages/rocketchat-file-upload/server/methods/sendFileMessage.js
#	packages/rocketchat-google-vision/server/googlevision.js
#	packages/rocketchat-importer-csv/server/importer.js
#	packages/rocketchat-importer-hipchat-enterprise/server/importer.js
#	packages/rocketchat-importer-hipchat/server/importer.js
#	packages/rocketchat-importer-slack-users/server/importer.js
#	packages/rocketchat-importer-slack/server/importer.js
#	packages/rocketchat-importer/client/admin/adminImportPrepare.js
#	packages/rocketchat-importer/client/admin/adminImportProgress.js
#	packages/rocketchat-integrations/client/views/integrationsIncoming.js
#	packages/rocketchat-integrations/client/views/integrationsOutgoing.js
#	packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.js
#	packages/rocketchat-integrations/server/lib/triggerHandler.js
#	packages/rocketchat-integrations/server/methods/incoming/addIncomingIntegration.js
#	packages/rocketchat-katex/katex.js
#	packages/rocketchat-ldap/client/loginHelper.js
#	packages/rocketchat-ldap/server/loginHandler.js
#	packages/rocketchat-ldap/server/sync.js
#	packages/rocketchat-lib/client/MessageAction.js
#	packages/rocketchat-lib/client/lib/RocketChatAnnouncement.js
#	packages/rocketchat-lib/client/lib/cachedCollection.js
#	packages/rocketchat-lib/lib/RoomTypeConfig.js
#	packages/rocketchat-lib/lib/callbacks.js
#	packages/rocketchat-lib/lib/promises.js
#	packages/rocketchat-lib/server/functions/saveUser.js
#	packages/rocketchat-lib/server/functions/setUserAvatar.js
#	packages/rocketchat-lib/server/lib/debug.js
#	packages/rocketchat-lib/server/lib/loginErrorMessageOverride.js
#	packages/rocketchat-lib/server/methods/createToken.js
#	packages/rocketchat-lib/server/methods/deleteUserOwnAccount.js
#	packages/rocketchat-lib/server/methods/filterATAllTag.js
#	packages/rocketchat-lib/server/methods/filterATHereTag.js
#	packages/rocketchat-lib/server/methods/sendMessage.js
#	packages/rocketchat-lib/server/models/Users.js
#	packages/rocketchat-lib/server/oauth/oauth.js
#	packages/rocketchat-livechat/.app/client/lib/LivechatVideoCall.js
#	packages/rocketchat-livechat/.app/client/lib/_livechat.js
#	packages/rocketchat-livechat/.app/client/lib/chatMessages.js
#	packages/rocketchat-livechat/.app/client/lib/fromApp/RoomHistoryManager.js
#	packages/rocketchat-livechat/.app/client/lib/hooks.js
#	packages/rocketchat-livechat/.app/client/lib/msgTyping.js
#	packages/rocketchat-livechat/.app/client/lib/triggers.js
#	packages/rocketchat-livechat/.app/client/startup/visitor.js
#	packages/rocketchat-livechat/.app/client/views/messages.js
#	packages/rocketchat-livechat/.app/client/views/offlineForm.js
#	packages/rocketchat-livechat/.app/client/views/register.js
#	packages/rocketchat-livechat/.app/client/views/switchDepartment.js
#	packages/rocketchat-livechat/.app/imports/client/visitor.js
#	packages/rocketchat-livechat/client/views/app/analytics/livechatAnalytics.js
#	packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.js
#	packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationWebhook.js
#	packages/rocketchat-livechat/client/views/app/livechatAppearance.js
#	packages/rocketchat-livechat/client/views/app/livechatCurrentChats.js
#	packages/rocketchat-livechat/client/views/app/livechatCustomFieldForm.js
#	packages/rocketchat-livechat/client/views/app/livechatDepartmentForm.js
#	packages/rocketchat-livechat/client/views/app/livechatOfficeHours.js
#	packages/rocketchat-livechat/client/views/app/livechatQueue.js
#	packages/rocketchat-livechat/client/views/app/tabbar/visitorEdit.js
#	packages/rocketchat-livechat/client/views/app/tabbar/visitorForward.js
#	packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.js
#	packages/rocketchat-livechat/client/views/sideNav/livechat.js
#	packages/rocketchat-livechat/imports/server/rest/sms.js
#	packages/rocketchat-livechat/livechat.js
#	packages/rocketchat-livechat/server/api/v1/message.js
#	packages/rocketchat-livechat/server/api/v1/room.js
#	packages/rocketchat-livechat/server/api/v1/videoCall.js
#	packages/rocketchat-livechat/server/lib/Livechat.js
#	packages/rocketchat-livechat/server/methods/sendFileLivechatMessage.js
#	packages/rocketchat-livechat/server/methods/startFileUploadRoom.js
#	packages/rocketchat-livechat/server/methods/startVideoCall.js
#	packages/rocketchat-livestream/client/views/broadcastView.js
#	packages/rocketchat-livestream/client/views/liveStreamTab.js
#	packages/rocketchat-logger/server/server.js
#	packages/rocketchat-mail-messages/server/functions/sendMail.js
#	packages/rocketchat-mailer/server/api.js
#	packages/rocketchat-mentions/server/server.js
#	packages/rocketchat-oauth2-server-config/admin/client/views/oauthApp.js
#	packages/rocketchat-oauth2-server-config/admin/server/methods/addOAuthApp.js
#	packages/rocketchat-oauth2-server-config/oauth/server/oauth2-server.js
#	packages/rocketchat-otr/client/rocketchat.otr.js
#	packages/rocketchat-otr/client/rocketchat.otr.room.js
#	packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.js
#	packages/rocketchat-reactions/setReaction.js
#	packages/rocketchat-search/client/provider/result.js
#	packages/rocketchat-setup-wizard/client/setupWizard.js
#	packages/rocketchat-slackbridge/server/RocketAdapter.js
#	packages/rocketchat-slackbridge/server/SlackAdapter.js
#	packages/rocketchat-slackbridge/server/slackbridge_import.server.js
#	packages/rocketchat-slashcommands-archiveroom/server/server.js
#	packages/rocketchat-slashcommands-create/server/server.js
#	packages/rocketchat-slashcommands-help/server.js
#	packages/rocketchat-slashcommands-hide/server/hide.js
#	packages/rocketchat-slashcommands-invite/server/server.js
#	packages/rocketchat-slashcommands-inviteall/server/server.js
#	packages/rocketchat-slashcommands-join/server/server.js
#	packages/rocketchat-slashcommands-kick/server/server.js
#	packages/rocketchat-slashcommands-leave/leave.js
#	packages/rocketchat-slashcommands-msg/server.js
#	packages/rocketchat-slashcommands-mute/server/mute.js
#	packages/rocketchat-slashcommands-mute/server/unmute.js
#	packages/rocketchat-slashcommands-unarchiveroom/server/server.js
#	packages/rocketchat-token-login/client/login_token_client.js
#	packages/rocketchat-tokenpass/client/tokenChannelsList.js
#	packages/rocketchat-tokenpass/client/tokenpassChannelSettings.js
#	packages/rocketchat-tokenpass/server/functions/getProtectedTokenpassBalances.js
#	packages/rocketchat-tokenpass/server/functions/getPublicTokenpassBalances.js
#	packages/rocketchat-tokenpass/server/startup.js
#	packages/rocketchat-ui-account/client/accountPreferences.js
#	packages/rocketchat-ui-account/client/accountProfile.js
#	packages/rocketchat-ui-account/client/avatar/prompt.js
#	packages/rocketchat-ui-admin/client/admin.js
#	packages/rocketchat-ui-admin/client/adminInfo.js
#	packages/rocketchat-ui-admin/client/rooms/adminRoomInfo.js
#	packages/rocketchat-ui-admin/client/rooms/channelSettingsDefault.js
#	packages/rocketchat-ui-admin/client/users/adminInviteUser.js
#	packages/rocketchat-ui-admin/client/users/adminUsers.js
#	packages/rocketchat-ui-flextab/client/flexTabBar.js
#	packages/rocketchat-ui-flextab/client/tabs/inviteUsers.js
#	packages/rocketchat-ui-flextab/client/tabs/membersList.js
#	packages/rocketchat-ui-flextab/client/tabs/userEdit.js
#	packages/rocketchat-ui-flextab/client/tabs/userInfo.js
#	packages/rocketchat-ui-login/client/login/form.js
#	packages/rocketchat-ui-login/client/reset-password/resetPassword.js
#	packages/rocketchat-ui-login/client/username/username.js
#	packages/rocketchat-ui-master/client/main.js
#	packages/rocketchat-ui-message/client/messageBox.js
#	packages/rocketchat-ui-message/client/popup/messagePopup.js
#	packages/rocketchat-ui-message/client/popup/messagePopupSlashCommandPreview.js
#	packages/rocketchat-ui-message/startup/messageBoxActions.js
#	packages/rocketchat-ui-sidenav/client/createCombinedFlex.js
#	packages/rocketchat-ui-sidenav/client/listChannelsFlex.js
#	packages/rocketchat-ui-sidenav/client/listCombinedFlex.js
#	packages/rocketchat-ui-sidenav/client/sideNav.js
#	packages/rocketchat-ui-sidenav/client/sidebarItem.js
#	packages/rocketchat-ui-sidenav/client/toolbar.js
#	packages/rocketchat-ui/client/lib/RoomHistoryManager.js
#	packages/rocketchat-ui/client/lib/RoomManager.js
#	packages/rocketchat-ui/client/lib/accountBox.js
#	packages/rocketchat-ui/client/lib/accounts.js
#	packages/rocketchat-ui/client/lib/chatMessages.js
#	packages/rocketchat-ui/client/lib/cordova/facebook-login.js
#	packages/rocketchat-ui/client/lib/msgTyping.js
#	packages/rocketchat-ui/client/lib/notification.js
#	packages/rocketchat-ui/client/views/app/createChannel.js
#	packages/rocketchat-ui/client/views/app/directory.js
#	packages/rocketchat-ui/client/views/app/room.js
#	packages/rocketchat-ui/client/views/app/secretURL.js
#	packages/rocketchat-ui/client/views/app/videoCall/videoCall.js
#	packages/rocketchat-webdav/client/addWebdavAccount.js
#	packages/rocketchat-webrtc/client/WebRTCClass.js
#	packages/rocketchat_theme/server/server.js
#	server/lib/accounts.js
#	server/lib/cordova.js
#	server/methods/getAvatarSuggestion.js
#	server/methods/registerUser.js
#	server/methods/saveUserProfile.js
#	server/methods/sendConfirmationEmail.js
#	server/methods/sendForgotPasswordEmail.js
#	server/methods/setUserActiveStatus.js
#	server/methods/setUserPassword.js
#	server/startup/avatar.js
#	server/startup/cron.js
#	server/startup/initialData.js
#	server/startup/migrations/v036.js
    @rodrigok
    rodrigok committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    8933394 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/imports/wave-2' into imports/wave-3

    @rodrigok
    rodrigok committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    5d83610 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/develop' into imports/wave-3 

    # Conflicts:
#	client/routes/router.js
#	client/startup/i18n.js
#	packages/rocketchat-authorization/client/views/permissions.js
#	packages/rocketchat-channel-settings/client/lib/ChannelSettings.js
#	packages/rocketchat-custom-oauth/client/custom_oauth_client.js
#	packages/rocketchat-custom-oauth/server/custom_oauth_server.js
#	packages/rocketchat-custom-sounds/client/admin/adminSounds.js
#	packages/rocketchat-file-upload/client/lib/fileUploadHandler.js
#	packages/rocketchat-file-upload/server/methods/sendFileMessage.js
#	packages/rocketchat-lib/client/AdminBox.js
#	packages/rocketchat-lib/client/MessageAction.js
#	packages/rocketchat-lib/client/lib/RocketChatTabBar.js
#	packages/rocketchat-lib/client/lib/cachedCollection.js
#	packages/rocketchat-lib/client/views/customFieldsForm.js
#	packages/rocketchat-lib/server/methods/deleteUserOwnAccount.js
#	packages/rocketchat-lib/server/methods/sendMessage.js
#	packages/rocketchat-lib/server/oauth/oauth.js
#	packages/rocketchat-livechat/.app/client/lib/_livechat.js
#	packages/rocketchat-livechat/.app/client/lib/hooks.js
#	packages/rocketchat-livechat/.app/client/lib/msgTyping.js
#	packages/rocketchat-livechat/.app/client/startup/visitor.js
#	packages/rocketchat-livechat/client/views/app/analytics/livechatAnalytics.js
#	packages/rocketchat-livechat/client/views/app/livechatAppearance.js
#	packages/rocketchat-livechat/client/views/app/livechatCurrentChats.js
#	packages/rocketchat-livechat/client/views/app/tabbar/visitorHistory.js
#	packages/rocketchat-livechat/server/api/v1/message.js
#	packages/rocketchat-livechat/server/api/v1/room.js
#	packages/rocketchat-livechat/server/api/v1/videoCall.js
#	packages/rocketchat-livechat/server/lib/Livechat.js
#	packages/rocketchat-livechat/server/methods/sendFileLivechatMessage.js
#	packages/rocketchat-otr/client/rocketchat.otr.js
#	packages/rocketchat-otr/client/rocketchat.otr.room.js
#	packages/rocketchat-slackbridge/server/slackbridge_import.server.js
#	packages/rocketchat-slashcommands-archiveroom/server/server.js
#	packages/rocketchat-slashcommands-create/server/server.js
#	packages/rocketchat-slashcommands-hide/server/hide.js
#	packages/rocketchat-slashcommands-invite/server/server.js
#	packages/rocketchat-slashcommands-inviteall/server/server.js
#	packages/rocketchat-slashcommands-join/server/server.js
#	packages/rocketchat-slashcommands-kick/server/server.js
#	packages/rocketchat-slashcommands-msg/server.js
#	packages/rocketchat-slashcommands-mute/server/mute.js
#	packages/rocketchat-slashcommands-mute/server/unmute.js
#	packages/rocketchat-slashcommands-unarchiveroom/server/server.js
#	packages/rocketchat-tokenpass/client/tokenChannelsList.js
#	packages/rocketchat-ui-account/client/accountPreferences.js
#	packages/rocketchat-ui-account/client/avatar/prompt.js
#	packages/rocketchat-ui-admin/client/admin.js
#	packages/rocketchat-ui-admin/client/adminInfo.js
#	packages/rocketchat-ui-admin/client/users/adminUsers.js
#	packages/rocketchat-ui-flextab/client/tabs/membersList.js
#	packages/rocketchat-ui-login/client/login/form.js
#	packages/rocketchat-ui-master/client/main.js
#	packages/rocketchat-ui-message/client/messageBox.js
#	packages/rocketchat-ui-message/client/popup/messagePopup.js
#	packages/rocketchat-ui-sidenav/client/toolbar.js
#	packages/rocketchat-ui/client/lib/RoomManager.js
#	packages/rocketchat-ui/client/lib/accountBox.js
#	packages/rocketchat-ui/client/lib/chatMessages.js
#	packages/rocketchat-ui/client/lib/msgTyping.js
#	packages/rocketchat-ui/client/lib/notification.js
#	packages/rocketchat-ui/client/views/app/createChannel.js
#	packages/rocketchat-ui/client/views/app/directory.js
#	packages/rocketchat-ui/client/views/app/room.js
#	packages/rocketchat-ui/client/views/cmsPage.js
#	packages/rocketchat-webrtc/client/WebRTCClass.js
#	server/lib/accounts.js
#	server/methods/getAvatarSuggestion.js
#	server/methods/registerUser.js
#	server/methods/saveUserProfile.js
#	server/methods/sendConfirmationEmail.js
#	server/methods/sendForgotPasswordEmail.js
#	server/methods/setUserActiveStatus.js
#	server/methods/setUserPassword.js
    @rodrigok
    rodrigok committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    4d5c855 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/imports/wave-3' into imports/wave-4 

    # Conflicts:
#	packages/rocketchat-analytics/client/trackEvents.js
#	packages/rocketchat-lib/client/CustomTranslations.js
#	packages/rocketchat-ui/client/views/cmsPage.js
    @rodrigok
    rodrigok committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    e8dbdbc View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/develop' into imports/wave-4 

    # Conflicts:
#	.eslintrc
#	client/notifications/notification.js
#	client/routes/router.js
#	client/startup/emailVerification.js
#	client/startup/startup.js
#	client/startup/unread.js
#	imports/personal-access-tokens/client/personalAccessTokens.js
#	packages/meteor-autocomplete/client/autocomplete-client.js
#	packages/rocketchat-analytics/client/loadScript.js
#	packages/rocketchat-analytics/client/trackEvents.js
#	packages/rocketchat-authorization/client/views/permissions.js
#	packages/rocketchat-channel-settings/client/startup/trackSettingsChange.js
#	packages/rocketchat-custom-sounds/client/admin/adminSounds.js
#	packages/rocketchat-emoji-custom/admin/adminEmoji.js
#	packages/rocketchat-lib/client/CustomTranslations.js
#	packages/rocketchat-lib/client/MessageAction.js
#	packages/rocketchat-lib/client/lib/Layout.js
#	packages/rocketchat-lib/client/lib/openRoom.js
#	packages/rocketchat-lib/client/views/customFieldsForm.js
#	packages/rocketchat-livechat/client/views/app/analytics/livechatAnalytics.js
#	packages/rocketchat-livechat/client/views/app/analytics/livechatRealTimeMonitoring.js
#	packages/rocketchat-livechat/client/views/app/livechatUsers.js
#	packages/rocketchat-livechat/client/views/app/tabbar/visitorHistory.js
#	packages/rocketchat-livechat/client/views/app/tabbar/visitorNavigation.js
#	packages/rocketchat-livestream/client/tabBar.js
#	packages/rocketchat-logger/client/viewLogs.js
#	packages/rocketchat-message-snippet/client/page/snippetPage.js
#	packages/rocketchat-otr/client/rocketchat.otr.room.js
#	packages/rocketchat-slashcommands-open/client/client.js
#	packages/rocketchat-tokenpass/client/tokenChannelsList.js
#	packages/rocketchat-ui-account/client/account.js
#	packages/rocketchat-ui-account/client/accountPreferences.js
#	packages/rocketchat-ui-account/client/accountProfile.js
#	packages/rocketchat-ui-account/client/avatar/prompt.js
#	packages/rocketchat-ui-admin/client/admin.js
#	packages/rocketchat-ui-admin/client/adminInfo.js
#	packages/rocketchat-ui-admin/client/rooms/adminRooms.js
#	packages/rocketchat-ui-admin/client/users/adminUsers.js
#	packages/rocketchat-ui-clean-history/client/views/cleanHistory.js
#	packages/rocketchat-ui-flextab/client/tabs/membersList.js
#	packages/rocketchat-ui-login/client/login/form.js
#	packages/rocketchat-ui-master/client/main.js
#	packages/rocketchat-ui-message/client/messageBox.js
#	packages/rocketchat-ui-message/client/popup/messagePopup.js
#	packages/rocketchat-ui-message/client/popup/messagePopupConfig.js
#	packages/rocketchat-ui-sidenav/client/chatRoomItem.js
#	packages/rocketchat-ui-sidenav/client/toolbar.js
#	packages/rocketchat-ui/client/lib/RoomManager.js
#	packages/rocketchat-ui/client/lib/accountBox.js
#	packages/rocketchat-ui/client/lib/chatMessages.js
#	packages/rocketchat-ui/client/lib/cordova/push.js
#	packages/rocketchat-ui/client/lib/fileUpload.js
#	packages/rocketchat-ui/client/lib/notification.js
#	packages/rocketchat-ui/client/views/app/createChannel.js
#	packages/rocketchat-ui/client/views/app/directory.js
#	packages/rocketchat-ui/client/views/app/room.js
#	packages/rocketchat-ui/client/views/cmsPage.js
#	packages/rocketchat-videobridge/client/tabBar.js
#	server/methods/setAvatarFromService.js
#	server/methods/userSetUtcOffset.js
    @rodrigok
    rodrigok committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    805a431 View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'origin/imports/wave-4' into imports/wave-5 

    # Conflicts:
#	packages/rocketchat-lib/client/CustomTranslations.js
    @rodrigok
    rodrigok committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    7564ab9 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'origin/develop' into imports/wave-5 

    # Conflicts:
#	.eslintrc
#	client/startup/emailVerification.js
#	packages/chatpal-search/client/template/admin.js
#	packages/chatpal-search/client/template/result.js
#	packages/rocketchat-apps/client/admin/appLogs.js
#	packages/rocketchat-apps/client/admin/appManage.js
#	packages/rocketchat-apps/client/orchestrator.js
#	packages/rocketchat-channel-settings/client/views/channelSettings.js
#	packages/rocketchat-custom-sounds/client/admin/soundEdit.js
#	packages/rocketchat-emoji-custom/admin/emojiEdit.js
#	packages/rocketchat-importer/client/admin/adminImport.js
#	packages/rocketchat-integrations/client/views/integrations.js
#	packages/rocketchat-integrations/client/views/integrationsIncoming.js
#	packages/rocketchat-integrations/client/views/integrationsOutgoing.js
#	packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.js
#	packages/rocketchat-lib/client/CustomTranslations.js
#	packages/rocketchat-livechat/.app/client/lib/commands.js
#	packages/rocketchat-livechat/.app/client/views/livechatWindow.js
#	packages/rocketchat-livechat/.app/client/views/offlineForm.js
#	packages/rocketchat-livechat/.app/client/views/register.js
#	packages/rocketchat-livechat/client/views/app/livechatOfficeHours.js
#	packages/rocketchat-livestream/client/views/liveStreamTab.js
#	packages/rocketchat-mail-messages/client/views/mailer.js
#	packages/rocketchat-message-pin/client/actionButton.js
#	packages/rocketchat-message-star/client/actionButton.js
#	packages/rocketchat-oauth2-server-config/admin/client/views/oauthApp.js
#	packages/rocketchat-otr/client/rocketchat.otr.room.js
#	packages/rocketchat-setup-wizard/client/setupWizard.js
#	packages/rocketchat-tokenpass/client/tokenpassChannelSettings.js
#	packages/rocketchat-ui-account/client/accountPreferences.js
#	packages/rocketchat-ui-admin/client/admin.js
#	packages/rocketchat-ui-admin/client/adminFlex.js
#	packages/rocketchat-ui-admin/client/adminInfo.js
#	packages/rocketchat-ui-admin/client/rooms/adminRoomInfo.js
#	packages/rocketchat-ui-admin/client/rooms/adminRooms.js
#	packages/rocketchat-ui-admin/client/rooms/channelSettingsDefault.js
#	packages/rocketchat-ui-flextab/client/flexTabBar.js
#	packages/rocketchat-ui-flextab/client/tabs/userActions.js
#	packages/rocketchat-ui-flextab/client/tabs/userEdit.js
#	packages/rocketchat-ui-flextab/client/tabs/userInfo.js
#	packages/rocketchat-ui-login/client/login/footer.js
#	packages/rocketchat-ui-message/client/message.js
#	packages/rocketchat-ui-message/client/messageBox.js
#	packages/rocketchat-ui-message/client/popup/messagePopupConfig.js
#	packages/rocketchat-ui-sidenav/client/toolbar.js
#	packages/rocketchat-ui-vrecord/client/vrecord.js
#	packages/rocketchat-ui/client/lib/chatMessages.js
#	packages/rocketchat-ui/client/views/app/popover.js
#	packages/rocketchat-videobridge/client/actionLink.js
#	packages/rocketchat-webrtc/client/WebRTCClass.js
    @rodrigok
    rodrigok committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    5d6ac07 View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'origin/imports/wave-5' into imports/wav… 

    …e-6-main-module-chatpal-search
    @rodrigok
    rodrigok committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    1afc93e View commit details
    Browse the repository at this point in the history

  11. Merge remote-tracking branch 'origin/develop' into imports/wave-6-mai… 

    …n-module-chatpal-search

# Conflicts:
#	packages/chatpal-search/client/template/admin.js
#	packages/chatpal-search/client/template/result.js
    @rodrigok
    rodrigok committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    e296b08 View commit details
    Browse the repository at this point in the history

  12. Merge remote-tracking branch 'origin/imports/wave-6-main-module-chatp… 

    …al-search' into imports/wave-7-main-module-accounts-saml
    @rodrigok
    rodrigok committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    fc77110 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'imports/wave-7-main-module-accounts-saml' into imports/… 

    …wave-8-main-module-autocomplete
    @rodrigok
    rodrigok committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    1489ec6 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'imports/wave-8-main-module-autocomplete' into imports/w… 

    …ave-9-main-module-timesync
    @rodrigok
    rodrigok committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    a4a0be4 View commit details
    Browse the repository at this point in the history

  15. Merge remote-tracking branch 'origin/develop' into imports/wave-8-mai… 

    …n-module-autocomplete

# Conflicts:
#	packages/meteor-accounts-saml/package.js
#	packages/meteor-accounts-saml/server/saml_utils.js
    @rodrigok
    rodrigok committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    7a62c0e View commit details
    Browse the repository at this point in the history

  16. Merge branch 'imports/wave-8-main-module-autocomplete' into imports/w… 

    …ave-9-main-module-timesync
    @rodrigok
    rodrigok committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    657a22d View commit details
    Browse the repository at this point in the history

  17. Merge remote-tracking branch 'origin/develop' into imports/wave-9-mai… 

    …n-module-timesync
    @rodrigok
    rodrigok committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    95b30d1 View commit details
    Browse the repository at this point in the history

  18. Merge remote-tracking branch 'origin/imports/wave-9-main-module-times… 

    …ync' into imports/wave-10-main-module-2fa
    @rodrigok
    rodrigok committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    fe63c1d View commit details
    Browse the repository at this point in the history

  19. Merge remote-tracking branch 'origin/develop' into imports/wave-10-ma… 

    …in-module-2fa
    @rodrigok
    rodrigok committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    590a098 View commit details
    Browse the repository at this point in the history

  20. Merge remote-tracking branch 'origin/imports/wave-10-main-module-2fa'… 

    … into imports/wave-11-main-module-action-links
    @rodrigok
    rodrigok committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    428011f View commit details
    Browse the repository at this point in the history

  21. Merge remote-tracking branch 'origin/develop' into imports/wave-10-ma… 

    …in-module-2fa
    @rodrigok
    rodrigok committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    42cace9 View commit details
    Browse the repository at this point in the history

  22. Merge remote-tracking branch 'origin/imports/wave-10-main-module-2fa'… 

    … into imports/wave-11-main-module-action-links
    @rodrigok
    rodrigok committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    a67319a View commit details
    Browse the repository at this point in the history

  23. Merge remote-tracking branch 'origin/develop' into imports/wave-11-ma… 

    …in-module-action-links

# Conflicts:
#	packages/rocketchat-ui/package.js
    @rodrigok
    rodrigok committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    0f0a00a View commit details
    Browse the repository at this point in the history

  24. Merge branch 'imports/wave-11-main-module-action-links' into imports/… 

    …wave-12-main-module-analytics

# Conflicts:
#	packages/rocketchat-analytics/client/trackEvents.js
#	packages/rocketchat-analytics/package.js
    @rodrigok
    rodrigok committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    68f1a6a View commit details
    Browse the repository at this point in the history

  25. Merge remote-tracking branch 'origin/develop' into imports/wave-12-ma… 

    …in-module-analytics

# Conflicts:
#	packages/rocketchat-ui/package.js
    @rodrigok
    rodrigok committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    3b6bd22 View commit details
    Browse the repository at this point in the history