{{_ "You_are_not_authorized_to_view_this_page"}}
+ {{else}} + + {{#if apiKey}} +Here is your Chatpal Api Key
+Please copy the key and insert it in the key field of the Chatpal Provider in the Search Admin Page.
+diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
new file mode 100644
index 000000000000..935c47ff829f
--- /dev/null
+++ b/.docker/Dockerfile.rhel
@@ -0,0 +1,44 @@
+FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
+
+ENV RC_VERSION 0.64.0-develop
+
+MAINTAINER buildmaster@rocket.chat
+
+LABEL name="Rocket.Chat" \
+ vendor="Rocket.Chat" \
+ version="${RC_VERSION}" \
+ release="1" \
+ url="https://rocket.chat" \
+ summary="The Ultimate Open Source Web Chat Platform" \
+ description="The Ultimate Open Source Web Chat Platform" \
+ run="docker run -d --name ${NAME} ${IMAGE}"
+
+
+# This is ugly... But for some reason npm and node aren't available at this stage.
+ENV PATH /opt/rh/rh-nodejs8/root/usr/bin:/opt/app-root/src/node_modules/.bin/:/opt/app-root/src/.npm-global/bin/:/opt/app-root/src/bin:/opt/app-root/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+
+RUN set -x \
+ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 0E163286C20D07B9787EBE9FD7F9D0414FD08104 \
+ && curl -SLf "https://releases.rocket.chat/${RC_VERSION}/download" -o rocket.chat.tgz \
+ && curl -SLf "https://releases.rocket.chat/${RC_VERSION}/asc" -o rocket.chat.tgz.asc \
+ && gpg --verify rocket.chat.tgz.asc \
+ && tar -zxf rocket.chat.tgz -C /opt/app-root/src/ \
+ && cd /opt/app-root/src/bundle/programs/server \
+ && npm install
+
+COPY licenses /licenses
+
+VOLUME /opt/app-root/src/uploads
+
+WORKDIR /opt/app-root/src/bundle
+
+ENV DEPLOY_METHOD=docker-redhat \
+ NODE_ENV=production \
+ MONGO_URL=mongodb://mongo:27017/rocketchat \
+ HOME=/tmp \
+ PORT=3000 \
+ ROOT_URL=http://localhost:3000
+
+EXPOSE 3000
+
+CMD ["node", "main.js"]
diff --git a/.docker/licenses/LICENSE b/.docker/licenses/LICENSE
new file mode 100644
index 000000000000..b3435a104885
--- /dev/null
+++ b/.docker/licenses/LICENSE
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2015-2017 Rocket.Chat Technologies Corp.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/.eslintignore b/.eslintignore
index 29bd695245f3..36c9a41003ff 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -8,7 +8,6 @@ packages/rocketchat-katex/client/katex/katex.min.js
packages/rocketchat-livechat/.app/node_modules
packages/rocketchat-livechat/assets/*.min.js
packages/rocketchat-livechat/assets/rocket-livechat.js
-packages/rocketchat-migrations/
packages/rocketchat-theme/client/minicolors/jquery.minicolors.js
packages/rocketchat-ui/client/lib/customEventPolyfill.js
packages/rocketchat-ui/client/lib/Modernizr.js
diff --git a/.eslintrc b/.eslintrc
index 2510662072ce..7b20950289e6 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -76,7 +76,7 @@
"curly": [2, "all"],
"eqeqeq": [2, "allow-null"],
"new-cap": [2, {
- "capIsNewExceptions": ["Match.Optional", "Match.Maybe", "Match.ObjectIncluding", "Push.Configure", "SHA256"]
+ "capIsNewExceptions": ["Match.Optional", "Match.Maybe", "Match.OneOf", "Match.Where", "Match.ObjectIncluding", "Push.Configure", "SHA256"]
}],
"use-isnan": 2,
"valid-typeof": 2,
diff --git a/.github/history.json b/.github/history.json
index 1c523399eede..f5c429911baf 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -12207,5 +12207,62 @@
"web-flow"
]
}
+ ],
+ "0.63.2": [
+ {
+ "pr": "10475",
+ "title": "[FIX] Even TypeErrors with SAML",
+ "userLogin": "graywolf336",
+ "contributors": [
+ "graywolf336"
+ ]
+ },
+ {
+ "pr": "10408",
+ "title": "add redhat dockerfile to master",
+ "userLogin": "geekgonecrazy",
+ "contributors": [
+ "geekgonecrazy"
+ ]
+ }
+ ],
+ "0.63.3": [
+ {
+ "pr": "10485",
+ "title": "[FIX] The 'channel.messages' REST API Endpoint error",
+ "userLogin": "rafaelks",
+ "milestone": "0.64.0",
+ "contributors": [
+ "rafaelks",
+ "web-flow"
+ ]
+ },
+ {
+ "pr": "10218",
+ "title": "Added one2mail.info to default blocked domains list",
+ "userLogin": "nsuchy",
+ "milestone": "0.64.0",
+ "contributors": [
+ "nsuchy",
+ "web-flow"
+ ]
+ },
+ {
+ "pr": "10476",
+ "title": "Release 0.63.2",
+ "userLogin": "graywolf336",
+ "contributors": [
+ "graywolf336",
+ "web-flow"
+ ]
+ },
+ {
+ "pr": "10475",
+ "title": "[FIX] Even TypeErrors with SAML",
+ "userLogin": "graywolf336",
+ "contributors": [
+ "graywolf336"
+ ]
+ }
]
-}
\ No newline at end of file
+}
diff --git a/.gitignore b/.gitignore
index 3f7fd5b8134e..ae7a0245e404 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
**/build/*
**/node_modules/*
**/tmp/*
+**/.meteor/.id
**/.meteor/dev_bundle
**/.meteor/local*
**/.meteor/meteorite
@@ -73,3 +74,4 @@ pm2.json
settings.json
build.sh
/public/livechat
+packages/rocketchat-i18n/i18n/livechat.*
diff --git a/.meteor/.id b/.meteor/.id
deleted file mode 100644
index bf888b12702f..000000000000
--- a/.meteor/.id
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file contains a token that is unique to your project.
-# Check it into your repository along with the rest of this directory.
-# It can be used for purposes such as:
-# - ensuring you don't accidentally deploy one app on top of another
-# - providing package authors with aggregated statistics
-
-1d10m9yd7fq1hsv663c
diff --git a/.meteor/packages b/.meteor/packages
index 951eadb8980c..4e496bd5640a 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -146,6 +146,7 @@ rocketchat:ui-master
rocketchat:ui-message
rocketchat:ui-sidenav
rocketchat:ui-vrecord
+rocketchat:user-data-download
rocketchat:version
rocketchat:videobridge
rocketchat:webrtc
@@ -185,3 +186,6 @@ todda00:friendly-slugs
yasaricli:slugify
yasinuslu:blaze-meta
rocketchat:version-check
+
+rocketchat:search
+chatpal:search
diff --git a/.meteor/versions b/.meteor/versions
index 3fa982c52f2d..172e46687476 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -21,6 +21,7 @@ caching-compiler@1.1.11
caching-html-compiler@1.1.2
callback-hook@1.1.0
cfs:http-methods@0.0.32
+chatpal:search@0.0.1
check@1.3.1
coffeescript@1.0.17
dandv:caret-position@2.1.1
@@ -43,7 +44,7 @@ ejson@1.1.0
email@1.2.3
emojione:emojione@2.2.6
es5-shim@4.7.3
-facebook-oauth@1.4.0
+facebook-oauth@1.4.1
fastclick@1.0.13
francocatena:status@1.5.3
geojson-utils@1.0.10
@@ -52,7 +53,7 @@ google-oauth@1.2.5
hot-code-push@1.0.4
html-tools@1.0.11
htmljs@1.0.11
-http@1.4.0
+http@1.4.1
id-map@1.1.0
jalik:ufs@0.7.5
jalik:ufs-gridfs@0.2.1
@@ -92,7 +93,7 @@ mobile-experience@1.0.5
mobile-status-bar@1.0.14
modules@0.11.6
modules-runtime@0.9.2
-mongo@1.4.5
+mongo@1.4.7
mongo-dev-server@1.1.0
mongo-id@1.0.7
mongo-livedata@1.0.12
@@ -200,6 +201,7 @@ rocketchat:postcss@1.0.0
rocketchat:push-notifications@0.0.1
rocketchat:reactions@0.0.1
rocketchat:sandstorm@0.0.1
+rocketchat:search@0.0.1
rocketchat:slackbridge@0.0.1
rocketchat:slashcommands-archive@0.0.1
rocketchat:slashcommands-asciiarts@0.0.1
@@ -235,6 +237,7 @@ rocketchat:ui-master@0.1.0
rocketchat:ui-message@0.1.0
rocketchat:ui-sidenav@0.1.0
rocketchat:ui-vrecord@0.0.1
+rocketchat:user-data-download@1.0.0
rocketchat:version@1.0.0
rocketchat:version-check@0.0.1
rocketchat:videobridge@0.2.0
diff --git a/.scripts/set-version.js b/.scripts/set-version.js
index e21035ee3a99..cad1c3b602da 100644
--- a/.scripts/set-version.js
+++ b/.scripts/set-version.js
@@ -25,6 +25,7 @@ const files = [
'./.circleci/snap.sh',
'./.circleci/update-releases.sh',
'./.docker/Dockerfile',
+ './.docker/Dockerfile.rhel',
'./packages/rocketchat-lib/rocketchat.info'
];
const readFile = (file) => {
diff --git a/HISTORY.md b/HISTORY.md
index 6b32486661bb..e4d09df6415b 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -2,7 +2,39 @@
# 0.64.0-develop (2018-04-07)
+# 0.63.3
+`2018-04-18 · 2 🐛 · 2 🔍 · 1 👩💻👨💻`
+### 🐛 Bug fixes
+
+- The 'channel.messages' REST API Endpoint error ([#10485](https://github.com/RocketChat/Rocket.Chat/pull/10485))
+- Even TypeErrors with SAML ([#10475](https://github.com/RocketChat/Rocket.Chat/pull/10475))
+
+ {{_ "Sorry_page_you_requested_does_not_exists_or_was_deleted"}} {{_ "You_are_not_authorized_to_view_this_page"}} Please copy the key and insert it in the key field of the Chatpal Provider in the Search Admin Page.
+ {{_ "Chatpal_Welcome"}}
+ 🔍 Minor changes
+
+- Added one2mail.info to default blocked domains list ([#10218](https://github.com/RocketChat/Rocket.Chat/pull/10218) by [@nsuchy](https://github.com/nsuchy))
+- Release 0.63.2 ([#10476](https://github.com/RocketChat/Rocket.Chat/pull/10476))
+
+🔍 Minor changes
+
+- add redhat dockerfile to master ([#10408](https://github.com/RocketChat/Rocket.Chat/pull/10408))
+
+{{_ "Error_404"}}
+ {{_ "Oops_page_not_found"}}
+ Here is your Chatpal Api Key
+
+
+
+
+ {{_ "Chatpal_No_Results"}}
+
+ {{#if resultNumFound}}
+ {{resultNumFound}}
+ {{/if}}
+
+
+
+ {{> icon icon=roomIcon}}
+ {{roomName}}
+ {{_ "Chatpal_go_to_message"}}
+ {{date}}
+
+ {{{user_name}}}
+
+
+
+ {{> icon icon=roomIcon}}
+ {{{room_name}}}
+ {{_ "Chatpal_go_to_room"}}
+
+
');
}
});
diff --git a/packages/rocketchat-apps/client/admin/appManage.html b/packages/rocketchat-apps/client/admin/appManage.html
index b27c8a2df044..ce53365fa337 100644
--- a/packages/rocketchat-apps/client/admin/appManage.html
+++ b/packages/rocketchat-apps/client/admin/appManage.html
@@ -24,7 +24,7 @@