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.

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

Merge master into develop & Set version to 0.68.0-develop #11536

Merged
merged 8 commits into from
Jul 21, 2018
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .docker/Dockerfile.rhel
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7

ENV RC_VERSION 0.67.0-develop
ENV RC_VERSION 0.68.0-develop

MAINTAINER buildmaster@rocket.chat

Expand Down Expand Up @@ -32,6 +32,10 @@ VOLUME /opt/app-root/src/uploads

WORKDIR /opt/app-root/src/bundle

# Hack needed to force use of bundled library instead of system level outdated library
# https://github.com/lovell/sharp/issues/892
ENV LD_PRELOAD=/opt/app-root/src/bundle/programs/server/npm/node_modules/sharp/vendor/lib/libz.so

ENV DEPLOY_METHOD=docker-redhat \
NODE_ENV=production \
MONGO_URL=mongodb://mongo:27017/rocketchat \
Expand Down
264 changes: 264 additions & 0 deletions .github/history.json
Original file line number Diff line number Diff line change
Expand Up @@ -16859,6 +16859,270 @@
]
}
]
},
"0.67.0-rc.0": {
"node_version": "8.11.3",
"npm_version": "5.6.0",
"pull_requests": [
{
"pr": "10749",
"title": "[BREAK] Remove cache layer and internal calculated property `room.usernames`",
"userLogin": "rodrigok",
"milestone": "0.66.0",
"contributors": [
"rodrigok",
"engelgabriel",
"web-flow"
]
},
{
"pr": "11417",
"title": "Merge master into develop & Set version to 0.67.0-develop",
"userLogin": "sampaiodiego",
"contributors": [
"renatobecker",
"sampaiodiego",
"rodrigok",
"web-flow"
]
},
{
"pr": "11406",
"title": "[FIX] Livechat taking inquiry leading to 404 page",
"userLogin": "renatobecker",
"milestone": "0.66.3",
"contributors": [
"renatobecker"
]
},
{
"pr": "11398",
"title": "[FIX] All messages notifications via email were sent as mention alert",
"userLogin": "rodrigok",
"milestone": "0.66.3",
"contributors": [
"rodrigok"
]
},
{
"pr": "11358",
"title": "[FIX] sort fname sidenav",
"userLogin": "ggazzo",
"contributors": [
"ggazzo",
"web-flow"
]
},
{
"pr": "11399",
"title": "Merge master into develop & Set version to 0.67.0-develop",
"userLogin": "rodrigok",
"contributors": [
"sampaiodiego",
"geekgonecrazy",
"renatobecker",
"rodrigok",
"web-flow"
]
},
{
"pr": "10918",
"title": "[NEW] Additional Livechat iFrame API's",
"userLogin": "renatobecker",
"milestone": "0.66.0",
"contributors": [
"renatobecker",
"sampaiodiego",
"web-flow"
]
},
{
"pr": "11266",
"title": "[FIX] Livechat not sending desktop notifications",
"userLogin": "renatobecker",
"milestone": "0.66.2",
"contributors": [
"renatobecker",
"sampaiodiego"
]
},
{
"pr": "11319",
"title": "[FIX] SVG icons code",
"userLogin": "tassoevan",
"contributors": [
"tassoevan"
]
},
{
"pr": "11365",
"title": "[FIX] Remove file snap store doesn't like",
"userLogin": "geekgonecrazy",
"milestone": "0.66.2",
"contributors": [
"geekgonecrazy",
"web-flow"
]
},
{
"pr": "11364",
"title": "Regression: Fix migration 125 checking for settings field",
"userLogin": "sampaiodiego",
"milestone": "0.66.2",
"contributors": [
"sampaiodiego"
]
},
{
"pr": "11359",
"title": "Send setting Allow_Marketing_Emails to statistics collector",
"userLogin": "rodrigok",
"milestone": "0.66.2",
"contributors": [
"rodrigok"
]
},
{
"pr": "11313",
"title": "[FIX] Message popup responsiveness in slash commands",
"userLogin": "tassoevan",
"contributors": [
"tassoevan"
]
},
{
"pr": "9991",
"title": "[FIX] web app manifest errors as reported by Chrome DevTools",
"userLogin": "justinribeiro",
"milestone": "0.68.0",
"contributors": [
"justinribeiro",
"web-flow"
]
},
{
"pr": "11342",
"title": "[FIX] Message attachment's fields with different sizes",
"userLogin": "sampaiodiego",
"contributors": [
"sampaiodiego"
]
},
{
"pr": "11330",
"title": "[IMPROVE] Stop sort callbacks on run",
"userLogin": "ggazzo",
"contributors": [
"ggazzo"
]
},
{
"pr": "9754",
"title": "[FIX] Parse inline code without space before initial backtick",
"userLogin": "c0dzilla",
"milestone": "0.68.0",
"contributors": [
"c0dzilla",
"gdelavald",
"web-flow",
"ggazzo"
]
},
{
"pr": "11348",
"title": "Merge master into develop & Set version to 0.67.0-develop",
"userLogin": "rodrigok",
"contributors": [
"sampaiodiego",
"rodrigok",
"gdelavald",
"tassoevan",
"Hudell",
"web-flow"
]
},
{
"pr": "11335",
"title": "[FIX] Some updates were returning errors when based on queries with position operators",
"userLogin": "rodrigok",
"milestone": "0.66.1",
"contributors": [
"rodrigok"
]
},
{
"pr": "11315",
"title": "[FIX] SAML attributes with periods are not properly read.",
"userLogin": "Hudell",
"milestone": "0.66.1",
"contributors": [
"Hudell",
"web-flow"
]
},
{
"pr": "11333",
"title": "[FIX] Outgoing integrations were stopping the oplog tailing sometimes",
"userLogin": "rodrigok",
"milestone": "0.66.1",
"contributors": [
"rodrigok"
]
},
{
"pr": "11254",
"title": "[IMPROVE] Setup Wizard username validation, step progress and optin/optout",
"userLogin": "tassoevan",
"milestone": "0.66.1",
"contributors": [
"tassoevan",
"ggazzo",
"web-flow"
]
},
{
"pr": "11267",
"title": "[FIX] Livestream muted when audio only option was enabled",
"userLogin": "gdelavald",
"milestone": "0.66.1",
"contributors": [
"gdelavald",
"web-flow"
]
},
{
"pr": "11295",
"title": "[FIX] Notification preferences being lost when switching view mode",
"userLogin": "sampaiodiego",
"milestone": "0.66.1",
"contributors": [
"sampaiodiego"
]
},
{
"pr": "11290",
"title": "Merge master into develop & Set version to 0.67.0-develop",
"userLogin": "rodrigok",
"contributors": [
"rodrigok",
"web-flow"
]
}
]
},
"0.67.0": {
"node_version": "8.11.3",
"npm_version": "5.6.0",
"pull_requests": [
{
"pr": "11497",
"title": "Fix dependency issue in redhat image",
"userLogin": "geekgonecrazy",
"contributors": [
"geekgonecrazy"
]
}
]
}
}
}
4 changes: 2 additions & 2 deletions .sandstorm/sandstorm-pkgdef.capnp
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ const pkgdef :Spk.PackageDefinition = (

appTitle = (defaultText = "Rocket.Chat"),

appVersion = 81, # Increment this for every release.
appVersion = 84, # Increment this for every release.

appMarketingVersion = (defaultText = "0.67.0-develop"),
appMarketingVersion = (defaultText = "0.68.0-develop"),
# Human-readable representation of appVersion. Should match the way you
# identify versions of your app in documentation and marketing.

Expand Down
2 changes: 1 addition & 1 deletion .travis/snap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
RC_VERSION=$TRAVIS_TAG
else
CHANNEL=edge
RC_VERSION=0.67.0-develop
RC_VERSION=0.68.0-develop
fi

echo "Preparing to trigger a snap release for $CHANNEL channel"
Expand Down
Loading