Skip to content

Commit

Permalink
Merge branch 'develop' into goalify
Browse files Browse the repository at this point in the history
* develop: (91 commits)
  [FIX] Audio Message UI fixes (RocketChat#10303)
  [NEW] Improve history generation (RocketChat#10319)
  Strip the colons when searching (RocketChat#10323)
  Bump snap version to include security fix (RocketChat#10313)
  Update Meteor to 1.6.1.1 (RocketChat#10314)
  [FIX] Unable to mention after newline in message (RocketChat#10078)
  [FIX] Wrong pagination information on /api/v1/channels.members (RocketChat#10224)
  [FIX] Inline code following a url leads to autolinking of code with url (RocketChat#10163)
  Fixed issue on incoming webhooks that caused the content raw to not be available (RocketChat#10258)
  [FIX] Missing Translation Key on Reactions (RocketChat#10270)
  Fix: inputs for rocketchat apps (RocketChat#10274)
  Fix: chat.react api not accepting previous emojis (RocketChat#10290)
  Fix: Scroll on content page (RocketChat#10300)
  [FIX] File had redirect delay when using external storage services and no option to proxy only avatars
  Add quotes in the endpoint deprecation warning
  Add deprecation warning to user.roles endpoint
  Improve pt-BR translations
  Fix caddy download link to pull from github
  Renaming channels.notifications Get/Post endpoints to subscriptions.getOne and rooms.saveNotifications
  Revert the removed endpoint, user.roles
  ...

# Conflicts:
#	package-lock.json
  • Loading branch information
trongthanh committed Apr 5, 2018
2 parents 25452d5 + a9aea36 commit 3fc91c1
Show file tree
Hide file tree
Showing 213 changed files with 76,988 additions and 11,106 deletions.
1 change: 1 addition & 0 deletions .circleci/snap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ git clone -b $SNAP_CHANNEL git+ssh://rocket.chat.buildmaster@git.launchpad.net/r
# Rarely will change, but just incase we copy it all
cp -r resources buildinfo launchpad/
sed s/#{RC_VERSION}/$RC_VERSION/ snapcraft.yaml > launchpad/snapcraft.yaml
sed s/#{RC_VERSION}/$RC_VERSION/ resources/prepareRocketChat > launchpad/resources/prepareRocketChat

cd launchpad
git add resources snapcraft.yaml buildinfo
Expand Down
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ private/moment-locales/
public/livechat/
public/mp3-realtime-worker.js
public/lame.min.js
!.scripts
15 changes: 15 additions & 0 deletions .github/history-manual.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"0.55.0": [{
"title": "[BREAK] `getUsersOfRoom` API to return array of objects with user and username, instead of array of strings",
"userLogin": "rodrigok",
"contributors": []
}, {
"title": "[FIX] Incoming integrations would break when trying to use the `Store` feature.`",
"userLogin": "rodrigok",
"contributors": []
}, {
"title": "[FIX] Removed Deprecated Package rocketchat:sharedsecret`",
"userLogin": "rodrigok",
"contributors": []
}]
}
Loading

0 comments on commit 3fc91c1

Please sign in to comment.