Code

Develop sync#7363

Code

Merged

sampaiodiego merged 34 commits intodevelopRocketChat/Rocket.Chat:developfrom develop-syncRocketChat/Rocket.Chat:develop-syncCopy head branch name to clipboardJun 29, 2017

+351-57

Commits

Commits on Jun 7, 2017

• Fix mobile avatars (#7177)

  

  rodrigok

  authored and

  geekgonecrazy

  committed
  88e9cfd

  Copy full SHA for 88e9cfd

Commits on Jun 8, 2017

• Fix migration version

  geekgonecrazy

  committed
  e85109a

  Copy full SHA for e85109a

• Removing the kadira package install on build

  Show description for 5bcdcfd
  

  JSzaszvari

  authored and

  geekgonecrazy

  committed
  5bcdcfd

  Copy full SHA for 5bcdcfd

• Fixes emoji titles translations

  Show description for a9a830b
  

  MartinSchoeler

  authored and

  geekgonecrazy

  committed
  a9a830b

  Copy full SHA for a9a830b

• fix wrong commit

  

  MartinSchoeler

  authored and

  geekgonecrazy

  committed
  f885e2c

  Copy full SHA for f885e2c

• Fix the admin oauthApps view not working due to converting to js from coffee (#7196)

  

  graywolf336

  authored and

  geekgonecrazy

  committed
  b66e1bc

  Copy full SHA for b66e1bc

• Merge branch 'develop' into release-candidate

  geekgonecrazy

  committed
  969599a

  Copy full SHA for 969599a

Commits on Jun 12, 2017

• Revert merge from develop

  sampaiodiego

  committed
  b791a65

  Copy full SHA for b791a65

• Merge pull request #7209 from RocketChat/fix-requirePasswordChange-not-applying-when-false

  Show description for 1c87c92
  sampaiodiego

  committed
  1c87c92

  Copy full SHA for 1c87c92

• Fix the Zapier oAuth return url to the new one (#7215)

  

  graywolf336

  authored and

  sampaiodiego

  committed
  c5ffd45

  Copy full SHA for c5ffd45

• Merge pull request #7208 from RocketChat/fix-oembed-previews-not-showing

  Show description for c5723da
  sampaiodiego

  committed
  c5723da

  Copy full SHA for c5723da

• Fix editing others messages (#7200)

  sampaiodiego

  committed
  452b970

  Copy full SHA for 452b970

• Bump version to 0.57.0-rc.2

  sampaiodiego

  committed
  8ea4a8b

  Copy full SHA for 8ea4a8b

Commits on Jun 21, 2017

• [FIX] Proxy upload to correct instance

  Show description for e7e0785
  rodrigok

  committed
  e7e0785

  Copy full SHA for e7e0785

Commits on Jun 22, 2017

• Move code to correct place

  rodrigok

  committed
  f96832c

  Copy full SHA for f96832c

Commits on Jun 23, 2017

• Merge pull request #7321 from RocketChat/fix-secret-url

  Show description for f1e9f70
  rodrigok

  committed
  f1e9f70

  Copy full SHA for f1e9f70

Commits on Jun 26, 2017

• fix undefined description|title on image preview

  ggazzo

  committed
  940ab0d

  Copy full SHA for 940ab0d

Commits on Jun 27, 2017

• Merge pull request #7304 from RocketChat/hotfix/rc-avatar-upload-proxy

  Show description for b031171
  rodrigok

  authored
  b031171

  Copy full SHA for b031171

• Merge pull request #7345 from RocketChat/fix-preview-image

  Show description for f68a42c
  rodrigok

  authored
  f68a42c

  Copy full SHA for f68a42c

• Merge pull request #7320 from RocketChat/fix-jump-to-unread

  Show description for 492fce9
  rodrigok

  committed
  492fce9

  Copy full SHA for 492fce9

• Merge pull request #7311 from RocketChat/use-db-for-spotlight

  Show description for e1a84a8
  rodrigok

  committed
  e1a84a8

  Copy full SHA for e1a84a8

• Merge pull request #7207 from RocketChat/fix-delete-message

  Show description for b23eb6f
  rodrigok

  committed
  b23eb6f

  Copy full SHA for b23eb6f

• Add support to run a specific migration

  sampaiodiego

  committed
  ced1652

  Copy full SHA for ced1652

• Improve avatar migration

  sampaiodiego

  committed
  e8baeae

  Copy full SHA for e8baeae

• Fix migration from GridFS

  sampaiodiego

  committed
  7a4d855

  Copy full SHA for 7a4d855

• Run avatar migration in batches

  sampaiodiego

  committed
  46861ea

  Copy full SHA for 46861ea

Commits on Jun 28, 2017

• Fix user's customFields not being saved

  sampaiodiego

  committed
  3db0301

  Copy full SHA for 3db0301

• Merge pull request #7308 from RocketChat/improvements/escape-error-messages

  Show description for f8273b2
  rodrigok

  committed
  f8273b2

  Copy full SHA for f8273b2

• Merge pull request #7352 from RocketChat/improve-avatar-migration

  Show description for 7ccaa03
  rodrigok

  authored
  7ccaa03

  Copy full SHA for 7ccaa03

• Merge pull request #7358 from RocketChat/fix-users-customfields

  Show description for 9547687
  rodrigok

  authored
  9547687

  Copy full SHA for 9547687

• Merge branch 'release-candidate' of https://github.com/RocketChat/Rocket.Chat into release-candidate

  rodrigok

  committed
  2ec7590

  Copy full SHA for 2ec7590

• Bump version to 0.57.0-rc.3

  rodrigok

  committed
  2347d2a

  Copy full SHA for 2347d2a

• Merge branch 'release-candidate' into develop

  rodrigok

  committed
  7c1ab8e

  Copy full SHA for 7c1ab8e

• Merge release-candidate

  rodrigok

  committed
  46762ee

  Copy full SHA for 46762ee