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

[NEW] Heavy weight threading (now called Discussions)- with minor model impact #11803

Closed
wants to merge 108 commits into from
Closed

[NEW] Heavy weight threading (now called Discussions)- with minor model impact #11803

wants to merge 108 commits into from

Commits on Jul 20, 2018

  1. [WIP] Add thread creation to home screen

    @mrsimpson
    mrsimpson committed Jul 20, 2018
    Configuration menu
    Copy the full SHA
    d4a052a View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2018

  1. Made it look nice, fix a lot of essentials, added even more TODOs

    @mrsimpson
    mrsimpson committed Jul 23, 2018
    Configuration menu
    Copy the full SHA
    97f8c6f View commit details
    Browse the repository at this point in the history

  2. enable debugging for non-rocketchat-packages

    @mrsimpson
    mrsimpson committed Jul 23, 2018
    Configuration menu
    Copy the full SHA
    510efee View commit details
    Browse the repository at this point in the history

  3. Propagate user creating the thread properly

    @mrsimpson
    mrsimpson committed Jul 23, 2018
    Configuration menu
    Copy the full SHA
    5963fdb View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2018

  1. Ask questions with thread

    @vickyokrm
    vickyokrm committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    2bd5eff View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2018

  1. world cloud integration fix

    @vickyokrm
    vickyokrm committed Aug 7, 2018
    Configuration menu
    Copy the full SHA
    9994302 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2018

  1. fix circleci out of memory

    @vickyokrm
    vickyokrm committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    e1f27ca View commit details
    Browse the repository at this point in the history

  2. fix circleci

    @vickyokrm
    vickyokrm committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    85a3279 View commit details
    Browse the repository at this point in the history

  3. update npm

    @vickyokrm
    vickyokrm committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    5949142 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2018

  1. Add translations

    @mrsimpson
    mrsimpson committed Aug 10, 2018
    Configuration menu
    Copy the full SHA
    8770ce3 View commit details
    Browse the repository at this point in the history

  2. Role-Check needs roomas context

    @mrsimpson
    mrsimpson committed Aug 10, 2018
    Configuration menu
    Copy the full SHA
    34248e7 View commit details
    Browse the repository at this point in the history

  3. Adapt thread-created message to display the quoted message

    @mrsimpson
    mrsimpson committed Aug 10, 2018
    Configuration menu
    Copy the full SHA
    fbfa4e5 View commit details
    Browse the repository at this point in the history

  4. Fix channel attachments not being navigateable as mentions

    @mrsimpson
    mrsimpson committed Aug 10, 2018
    Configuration menu
    Copy the full SHA
    4a0c5e9 View commit details
    Browse the repository at this point in the history

  5. Add threading from context menu

    @mrsimpson
    mrsimpson committed Aug 10, 2018
    Configuration menu
    Copy the full SHA
    1324c37 View commit details
    Browse the repository at this point in the history

  6. Add icon for threading

    @mrsimpson
    mrsimpson committed Aug 10, 2018
    Configuration menu
    Copy the full SHA
    66e3f8e View commit details
    Browse the repository at this point in the history

  7. Support renamed rooms in thread message

    @mrsimpson
    mrsimpson committed Aug 10, 2018
    Configuration menu
    Copy the full SHA
    adf1254 View commit details
    Browse the repository at this point in the history

  8. Support usage of channel-ID in mentions 

    for renaming-safe linking if necessary
    @mrsimpson
    mrsimpson committed Aug 10, 2018
    Configuration menu
    Copy the full SHA
    ee22f80 View commit details
    Browse the repository at this point in the history

  9. Move threading setting to separate group to allow stable automated tests

    @mrsimpson
    mrsimpson committed Aug 10, 2018
    Configuration menu
    Copy the full SHA
    eac4147 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2018

  1. Adapt circle-ci configuration for Assistify

    @mrsimpson
    mrsimpson committed Aug 13, 2018
    Configuration menu
    Copy the full SHA
    ed10759 View commit details
    Browse the repository at this point in the history

  2. Verticall align thread creation on home screen

    @mrsimpson
    mrsimpson committed Aug 13, 2018
    Configuration menu
    Copy the full SHA
    8e1fbbf View commit details
    Browse the repository at this point in the history

  3. Fix book-icon for wordcloud

    @mrsimpson
    mrsimpson committed Aug 13, 2018
    Configuration menu
    Copy the full SHA
    41ee70b View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2018

  1. Provide back button from wordcloud

    @mrsimpson
    mrsimpson committed Aug 14, 2018
    Configuration menu
    Copy the full SHA
    ab5b300 View commit details
    Browse the repository at this point in the history

  2. show all channels in thread settings

    @vickyokrm
    vickyokrm committed Aug 14, 2018
    Configuration menu
    Copy the full SHA
    731f33e View commit details
    Browse the repository at this point in the history

  3. Merge branch '#418-requestless-threading' of https://github.com/assis… 

    …tify/Rocket.Chat into 418-requestless-threading
    @vickyokrm
    vickyokrm committed Aug 14, 2018
    Configuration menu
    Copy the full SHA
    a335908 View commit details
    Browse the repository at this point in the history

  4. Don't show wordcloud for the time being

    @mrsimpson
    mrsimpson committed Aug 14, 2018
    Configuration menu
    Copy the full SHA
    a53bfba View commit details
    Browse the repository at this point in the history

  5. Merge branch '#418-requestless-threading' of https://github.com/assis… 

    …tify/Rocket.Chat into #418-requestless-threading
    @mrsimpson
    mrsimpson committed Aug 14, 2018
    Configuration menu
    Copy the full SHA
    a602124 View commit details
    Browse the repository at this point in the history

  6. update circleci config to our tagnames

    @mrsimpson
    mrsimpson committed Aug 14, 2018
    Configuration menu
    Copy the full SHA
    bb64b24 View commit details
    Browse the repository at this point in the history

  7. Fix autocomplete for parent channel

    @vickyokrm
    vickyokrm committed Aug 14, 2018
    Configuration menu
    Copy the full SHA
    11c4005 View commit details
    Browse the repository at this point in the history

  8. Merge branch '#418-requestless-threading' of https://github.com/assis… 

    …tify/Rocket.Chat into #418-requestless-threading
    @mrsimpson
    mrsimpson committed Aug 14, 2018
    Configuration menu
    Copy the full SHA
    c5f194b View commit details
    Browse the repository at this point in the history

  9. Add threads to sidepanel

    @mrsimpson
    mrsimpson committed Aug 14, 2018
    Configuration menu
    Copy the full SHA
    5da86c1 View commit details
    Browse the repository at this point in the history

  10. Explicit route for create-thread

    @mrsimpson
    mrsimpson committed Aug 14, 2018
    Configuration menu
    Copy the full SHA
    dc6bcdc View commit details
    Browse the repository at this point in the history

  11. Fix configuration andselect proper default channel

    @mrsimpson
    mrsimpson committed Aug 14, 2018
    Configuration menu
    Copy the full SHA
    8e2e8f6 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2018

  1. minor UI fixes

    @mrsimpson
    mrsimpson committed Aug 15, 2018
    Configuration menu
    Copy the full SHA
    65bb748 View commit details
    Browse the repository at this point in the history

  2. Add parentRoom index to rooms and subscriptions

    @mrsimpson
    mrsimpson committed Aug 15, 2018
    Configuration menu
    Copy the full SHA
    06a1b19 View commit details
    Browse the repository at this point in the history

  3. create threads in direct messages as private groups

    @mrsimpson
    mrsimpson committed Aug 15, 2018
    Configuration menu
    Copy the full SHA
    89c781e View commit details
    Browse the repository at this point in the history

  4. Create thread from direct message with better name

    @mrsimpson
    mrsimpson committed Aug 15, 2018
    Configuration menu
    Copy the full SHA
    137e10a View commit details
    Browse the repository at this point in the history

  5. Improve UX

    @mrsimpson
    mrsimpson committed Aug 15, 2018
    Configuration menu
    Copy the full SHA
    ad7f2cd View commit details
    Browse the repository at this point in the history

  6. Fix scrolling and make sidebar-button larger

    @mrsimpson
    mrsimpson committed Aug 15, 2018
    Configuration menu
    Copy the full SHA
    4f818ba View commit details
    Browse the repository at this point in the history

  7. Unimplement threading on home fix overlapping modals

    @mrsimpson
    mrsimpson committed Aug 15, 2018
    Configuration menu
    Copy the full SHA
    5e5edeb View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2018

  1. Minor beautifications on code level

    @mrsimpson
    mrsimpson committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    a495f84 View commit details
    Browse the repository at this point in the history

  2. Fix: Allow normal users to select only public channels for threads

    @mrsimpson
    mrsimpson committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    18c86fe View commit details
    Browse the repository at this point in the history

  3. Move threading button to the top

    @mrsimpson
    mrsimpson committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    ce34629 View commit details
    Browse the repository at this point in the history

  4. Hide private channels from inital dropdown

    @mrsimpson
    mrsimpson committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    792fcf0 View commit details
    Browse the repository at this point in the history

  5. Improve creation screenUX

    @mrsimpson
    mrsimpson committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    5761d67 View commit details
    Browse the repository at this point in the history

  6. Don't offer threads as potential parents

    @mrsimpson
    mrsimpson committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    7438c44 View commit details
    Browse the repository at this point in the history

  7. Configure action menu for threading

    @mrsimpson
    mrsimpson committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    0da19c3 View commit details
    Browse the repository at this point in the history

  8. remove no-rooms-message from threading list

    @mrsimpson
    mrsimpson committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    6aa72ce View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'upstream/develop' into core/threading

    @mrsimpson
    mrsimpson committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    17aa919 View commit details
    Browse the repository at this point in the history

  10. Remove "no threads" text from sidebar

    @mrsimpson
    mrsimpson committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    c6f81d1 View commit details
    Browse the repository at this point in the history

  11. Remove "no threads" text from sidebar

    @mrsimpson
    mrsimpson committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    f82c0ed View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2018

  1. Fix test failing due to new user preference

    @mrsimpson
    mrsimpson committed Aug 17, 2018
    Configuration menu
    Copy the full SHA
    d07d256 View commit details
    Browse the repository at this point in the history

  2. Add scripts for executing tests seperately

    @mrsimpson
    mrsimpson committed Aug 17, 2018
    Configuration menu
    Copy the full SHA
    25e5a9a View commit details
    Browse the repository at this point in the history

  3. Exclude test-documentation screenshots from git

    @mrsimpson
    mrsimpson committed Aug 17, 2018
    Configuration menu
    Copy the full SHA
    4c07c51 View commit details
    Browse the repository at this point in the history

  4. Add tests for threading

    @mrsimpson
    mrsimpson committed Aug 17, 2018
    Configuration menu
    Copy the full SHA
    e9c082c View commit details
    Browse the repository at this point in the history

  5. Add thread creation from message action

    @mrsimpson
    mrsimpson committed Aug 17, 2018
    Configuration menu
    Copy the full SHA
    5a8d5e9 View commit details
    Browse the repository at this point in the history

  6. Cleaup tests for threading

    @mrsimpson
    mrsimpson committed Aug 17, 2018
    Configuration menu
    Copy the full SHA
    812f9c0 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/#418-requestless-threading' into… 

    … core/threading
    @mrsimpson
    mrsimpson committed Aug 17, 2018
    Configuration menu
    Copy the full SHA
    0a8858d View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2018

  1. Add migrations for requests and topics

    @mrsimpson
    mrsimpson committed Aug 20, 2018
    Configuration menu
    Copy the full SHA
    7b2a85e View commit details
    Browse the repository at this point in the history

  2. Skip setup-wizard tests if they completed earlier on

    @vickyokrm @mrsimpson
    vickyokrm authored and mrsimpson committed Aug 20, 2018
    Configuration menu
    Copy the full SHA
    05b4d08 View commit details
    Browse the repository at this point in the history

  3. Revert try of skipping the setup wizard

    @mrsimpson
    mrsimpson committed Aug 20, 2018
    Configuration menu
    Copy the full SHA
    6f12af8 View commit details
    Browse the repository at this point in the history

  4. Grant more time for autocomplete to vanish

    @mrsimpson
    mrsimpson committed Aug 20, 2018
    Configuration menu
    Copy the full SHA
    62c5daf View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2018

  1. Provide the threaded message as message quote preserving ordering

    @mrsimpson
    mrsimpson committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    35203c9 View commit details
    Browse the repository at this point in the history

  2. Fix wordcloud being visible in dropdiwn

    @mrsimpson
    mrsimpson committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    0510e38 View commit details
    Browse the repository at this point in the history

  3. Fix migration: update subscriptions too

    @mrsimpson
    mrsimpson committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    8d5f038 View commit details
    Browse the repository at this point in the history

  4. choose general as default channel

    @mrsimpson
    mrsimpson committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    9928698 View commit details
    Browse the repository at this point in the history

  5. update ui texts

    @mrsimpson
    mrsimpson committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    9d46d13 View commit details
    Browse the repository at this point in the history

  6. Set focus on thread creation

    @mrsimpson
    mrsimpson committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    6055aca View commit details
    Browse the repository at this point in the history

  7. Move threads list in sidenav beneath the favorites and unred

    @mrsimpson
    mrsimpson committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    d96df06 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #434 from assistify/#418-requestless-threading 

    Update the Rocket.Chat core PR from assistify-branch
    @mrsimpson
    mrsimpson committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    39ec65f View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'upstream/develop' into core/threading

    @mrsimpson
    mrsimpson committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    39551ae View commit details
    Browse the repository at this point in the history

  10. Cleanup unnecessarily changed artefacts

    @mrsimpson
    mrsimpson committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    74a2666 View commit details
    Browse the repository at this point in the history

  11. Satisfy the even stricter linter

    @mrsimpson
    mrsimpson committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    afdfcd8 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2018

  1. Satisfy stylelint

    @mrsimpson
    mrsimpson committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    1dc8917 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2018

  1. Adapt threading test for CircleCi's low performance

    @mrsimpson
    mrsimpson committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    c2c1b87 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2018

  1. Merge branch 'develop' into core/threading

    @MarcosSpessatto
    MarcosSpessatto committed Dec 14, 2018
    Configuration menu
    Copy the full SHA
    b53a82e View commit details
    Browse the repository at this point in the history

  2. Import global variables that has been removed from eslintrc

    @MarcosSpessatto
    MarcosSpessatto committed Dec 14, 2018
    Configuration menu
    Copy the full SHA
    5678971 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2018

  1. Fixes as already implemented and tested on downstream fork

    @mrsimpson
    mrsimpson committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    5344861 View commit details
    Browse the repository at this point in the history

  2. Validate permission for thread creation for showing the button

    @mrsimpson
    mrsimpson committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    ea956fc View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into core/threading

    @engelgabriel
    engelgabriel committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    e732f95 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2018

  1. Merge branch 'core/threading' of https://github.com/assistify/Rocket.… 

    …Chat into core/threading
    @mrsimpson
    mrsimpson committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    f608568 View commit details
    Browse the repository at this point in the history

  2. Resolve merge conflicts and add auth for button

    @mrsimpson
    mrsimpson committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    d1486ef View commit details
    Browse the repository at this point in the history

  3. Navigatable back button in thread header

    @mrsimpson
    mrsimpson committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    36f491b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into core/threading

    @mrsimpson
    mrsimpson committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    af7efbf View commit details
    Browse the repository at this point in the history

  5. Import Toastr

    @mrsimpson
    mrsimpson committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    a59e49b View commit details
    Browse the repository at this point in the history

  6. Infrastructure for custom renderings of attachment fields

    @mrsimpson
    mrsimpson committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    efcad4b View commit details
    Browse the repository at this point in the history

  7. Replace global openRoom with Router-function

    @mrsimpson
    mrsimpson committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    a26fa39 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2018

  1. Minimal identification checks in methods

    @mrsimpson
    mrsimpson committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    795fda4 View commit details
    Browse the repository at this point in the history

  2. Add replies and last-message-age to thread created

    @mrsimpson
    mrsimpson committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    548f77a View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2018

  1. add package.js

    @mrsimpson
    mrsimpson committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    e7586b7 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2019

  1. Merge branch 'develop' into pr/11803-mrsimpson-core/threading

    @sampaiodiego
    sampaiodiego committed Jan 3, 2019
    Configuration menu
    Copy the full SHA
    b106f93 View commit details
    Browse the repository at this point in the history

  2. Fix file names

    @sampaiodiego
    sampaiodiego committed Jan 3, 2019
    Configuration menu
    Copy the full SHA
    637accc View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2019

  1. Don't suppress system messages in threads

    @mrsimpson
    mrsimpson committed Jan 5, 2019
    Configuration menu
    Copy the full SHA
    b490778 View commit details
    Browse the repository at this point in the history

  2. Slash command /thread

    @mrsimpson
    mrsimpson committed Jan 5, 2019
    Configuration menu
    Copy the full SHA
    cfcc113 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'core/threading' of https://github.com/assistify/Rocket.… 

    …Chat into core/threading
    @mrsimpson
    mrsimpson committed Jan 5, 2019
    Configuration menu
    Copy the full SHA
    64d179e View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2019

  1. Make thread metadata on message update on new thread message

    @mrsimpson
    mrsimpson committed Jan 6, 2019
    Configuration menu
    Copy the full SHA
    fef61d6 View commit details
    Browse the repository at this point in the history

  2. Add slash command and fix linting

    @mrsimpson
    mrsimpson committed Jan 6, 2019
    Configuration menu
    Copy the full SHA
    0a6272a View commit details
    Browse the repository at this point in the history

  3. Add threads tabbar

    @mrsimpson
    mrsimpson committed Jan 6, 2019
    Configuration menu
    Copy the full SHA
    a00e826 View commit details
    Browse the repository at this point in the history

  4. Threads: Display last change on instead of age

    @mrsimpson
    mrsimpson committed Jan 6, 2019
    Configuration menu
    Copy the full SHA
    701ad20 View commit details
    Browse the repository at this point in the history

  5. Fix filenames 

    Git somewhat does not recognize case-changes of files
    @mrsimpson
    mrsimpson committed Jan 6, 2019
    Configuration menu
    Copy the full SHA
    e9f1fae View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2019

  1. Merge remote-tracking branch 'upstream/develop' into core/threading

    @mrsimpson
    mrsimpson committed Jan 7, 2019
    Configuration menu
    Copy the full SHA
    f0f0242 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2019

  1. Merge remote-tracking branch 'upstream/develop' into core/threading

    @mrsimpson
    mrsimpson committed Feb 1, 2019
    Configuration menu
    Copy the full SHA
    5390eb8 View commit details
    Browse the repository at this point in the history

  2. Add missing imports

    @mrsimpson
    mrsimpson committed Feb 1, 2019
    Configuration menu
    Copy the full SHA
    89a1db8 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2019

  1. Merge branch 'develop' into core/threading

    @engelgabriel
    engelgabriel committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    2ed0843 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2019

  1. Merge branch 'develop' into core/threading

    @mrsimpson
    mrsimpson committed Feb 6, 2019
    Configuration menu
    Copy the full SHA
    2d0ed55 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2019

  1. Merge branch 'core/threading' of git@github.com:assistify/Rocket.Chat… 

    ….git; branch 'develop' of github.com:RocketChat/Rocket.Chat into pr/11803-mrsimpson-core/threading
    @ggazzo
    ggazzo committed Feb 8, 2019
    Configuration menu
    Copy the full SHA
    37334ba View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2019

  1. Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into pr/1… 

    …1803-mrsimpson-core/threading
    @ggazzo
    ggazzo committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    bd6c565 View commit details
    Browse the repository at this point in the history

  2. fix imports

    @ggazzo
    ggazzo committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    f9e1fe7 View commit details
    Browse the repository at this point in the history

  3. fix imports

    @ggazzo
    ggazzo committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    510c039 View commit details
    Browse the repository at this point in the history