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

Merge master into develop & Set version to 2.1.0-develop #15357

Merged
merged 28 commits into from
Sep 12, 2019
Merged

Merge master into develop & Set version to 2.1.0-develop #15357

merged 28 commits into from
Sep 12, 2019

Commits on Aug 8, 2019

  1. [FIX] Direct Message names not visible on Admin panel (#15114)

    @ggazzo @sampaiodiego
    ggazzo authored and sampaiodiego committed Aug 8, 2019
    Configuration menu
    Copy the full SHA
    18009ee View commit details
    Browse the repository at this point in the history

  2. [FIX] Custom emoji limit table scroll (#15119)

    @ggazzo @sampaiodiego
    ggazzo authored and sampaiodiego committed Aug 8, 2019
    Configuration menu
    Copy the full SHA
    47cf06d View commit details
    Browse the repository at this point in the history

  3. Fix custom auth (#15141)

    @MarcosSpessatto @sampaiodiego
    MarcosSpessatto authored and sampaiodiego committed Aug 8, 2019
    Configuration menu
    Copy the full SHA
    d1372d7 View commit details
    Browse the repository at this point in the history

  4. Bump version to 1.3.1

    @sampaiodiego
    sampaiodiego committed Aug 8, 2019
    Configuration menu
    Copy the full SHA
    fbdb7d7 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2019

  1. Merge pull request #15148 from RocketChat/release-1.3.1 

    Release 1.3.1
    @sampaiodiego
    sampaiodiego committed Aug 9, 2019
    Configuration menu
    Copy the full SHA
    63bb25e View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2019

  1. Update latest Livechat widget version(1.1.3) (#15154) 

    * Update the latest livechat widget version(1.1.2).

* Rename the latest release from 1.1.2 to 1.1.3
    @renatobecker @sampaiodiego
    renatobecker authored and sampaiodiego committed Aug 13, 2019
    Configuration menu
    Copy the full SHA
    8f672b6 View commit details
    Browse the repository at this point in the history

  2. Update latest Livechat widget version to 1.1.4 (#15173)

    @renatobecker @sampaiodiego
    renatobecker authored and sampaiodiego committed Aug 13, 2019
    Configuration menu
    Copy the full SHA
    af0bcc8 View commit details
    Browse the repository at this point in the history

  3. [FIX] IE11 - callback createTreeWalker doesnt accept acceptNo… (#15157)

    @ggazzo @sampaiodiego
    ggazzo authored and sampaiodiego committed Aug 13, 2019
    Configuration menu
    Copy the full SHA
    3be728b View commit details
    Browse the repository at this point in the history

  4. [FIX] search messages scroll (#15175)

    @ggazzo @sampaiodiego
    ggazzo authored and sampaiodiego committed Aug 13, 2019
    Configuration menu
    Copy the full SHA
    15b8579 View commit details
    Browse the repository at this point in the history

  5. [FIX] Attachment download button behavior (#15172)

    @tassoevan @sampaiodiego
    tassoevan authored and sampaiodiego committed Aug 13, 2019
    Configuration menu
    Copy the full SHA
    f17e9a8 View commit details
    Browse the repository at this point in the history

  6. Bump version to 1.3.2

    @sampaiodiego
    sampaiodiego committed Aug 13, 2019
    Configuration menu
    Copy the full SHA
    e6be2a9 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2019

  1. Merge pull request #15176 from RocketChat/release-1.3.2 

    Release 1.3.2
    @sampaiodiego
    sampaiodiego committed Aug 14, 2019
    Configuration menu
    Copy the full SHA
    2289486 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2019

  1. Bump version to 2.0.0-rc.0

    @sampaiodiego
    sampaiodiego committed Aug 21, 2019
    Configuration menu
    Copy the full SHA
    53d0aa3 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2019

  1. Merge remote-tracking branch 'origin/develop' into release-candidate

    @sampaiodiego
    sampaiodiego committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    db870c8 View commit details
    Browse the repository at this point in the history

  2. Bump version to 2.0.0-rc.1

    @sampaiodiego
    sampaiodiego committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    61c5388 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2019

  1. Merge remote-tracking branch 'origin/develop' into release-candidate

    @sampaiodiego
    sampaiodiego committed Aug 28, 2019
    Configuration menu
    Copy the full SHA
    3042a3e View commit details
    Browse the repository at this point in the history

  2. Bump version to 2.0.0-rc.2

    @sampaiodiego
    sampaiodiego committed Aug 28, 2019
    Configuration menu
    Copy the full SHA
    6dc57e1 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2019

  1. Merge remote-tracking branch 'origin/develop' into release-candidate

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

  2. Bump version to 2.0.0-rc.3

    @sampaiodiego
    sampaiodiego committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    0f43330 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2019

  1. Merge remote-tracking branch 'origin/develop' into release-candidate

    @sampaiodiego
    sampaiodiego committed Sep 12, 2019
    Configuration menu
    Copy the full SHA
    9362cf1 View commit details
    Browse the repository at this point in the history

  2. Bump version to 2.0.0-rc.4

    @sampaiodiego
    sampaiodiego committed Sep 12, 2019
    Configuration menu
    Copy the full SHA
    73bfe73 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/develop' into release-candidate

    @sampaiodiego
    sampaiodiego committed Sep 12, 2019
    Configuration menu
    Copy the full SHA
    04535fa View commit details
    Browse the repository at this point in the history

  4. Bump version to 2.0.0-rc.5

    @sampaiodiego
    sampaiodiego committed Sep 12, 2019
    Configuration menu
    Copy the full SHA
    056fc30 View commit details
    Browse the repository at this point in the history

  5. Remove wrong items on history.json file

    @sampaiodiego
    sampaiodiego committed Sep 12, 2019
    Configuration menu
    Copy the full SHA
    cd8c3c3 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/release-candidate' into release-… 

    …2.0.0
    @sampaiodiego
    sampaiodiego committed Sep 12, 2019
    Configuration menu
    Copy the full SHA
    67593f7 View commit details
    Browse the repository at this point in the history

  7. Bump version to 2.0.0

    @sampaiodiego
    sampaiodiego committed Sep 12, 2019
    Configuration menu
    Copy the full SHA
    370d4a6 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #15350 from RocketChat/release-2.0.0 

    Release 2.0.0
    @sampaiodiego
    sampaiodiego committed Sep 12, 2019
    Configuration menu
    Copy the full SHA
    92c00dc View commit details
    Browse the repository at this point in the history

  9. Bump version to 2.1.0-develop

    @sampaiodiego
    sampaiodiego committed Sep 12, 2019
    Configuration menu
    Copy the full SHA
    cce0274 View commit details
    Browse the repository at this point in the history