Skip to content

Commit

Permalink
Merge branch 'goalify'
Browse files Browse the repository at this point in the history
* goalify: (200 commits)
  Add S3 upload script
  Remove root-priviledged command
  switch gitlab ci config to use shell executor
  Try another build
  fix change language not reload
  temporary disable readonly
  [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)
  change weather city to location
  ...

# Conflicts:
#	.docker/Dockerfile
#	.sandstorm/sandstorm-pkgdef.capnp
#	.travis/snap.sh
#	HISTORY.md
#	package.json
#	packages/rocketchat-lib/rocketchat.info
#	packages/rocketchat-lib/server/functions/deleteUser.js
#	packages/rocketchat-theme/client/imports/components/main-content.css
  • Loading branch information
trongthanh committed Apr 6, 2018
2 parents 6cf49c0 + 2680d5d commit f8248f3
Show file tree
Hide file tree
Showing 310 changed files with 95,467 additions and 7,694 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://[email protected]/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
2 changes: 1 addition & 1 deletion .docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM rocketchat/base:8

ENV RC_VERSION 0.62.1
ENV RC_VERSION 0.63.0-develop

MAINTAINER [email protected]

Expand Down
4 changes: 3 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,6 @@ packages/rocketchat-videobridge/client/public/external_api.js
packages/rocketchat-theme/client/vendor/
private/moment-locales/
public/livechat/
public/recorderWorker.js
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 f8248f3

Please sign in to comment.