Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 19729180A1 for ; Mon, 30 Nov 2015 06:27:13 +0000 (UTC) Received: (qmail 18576 invoked by uid 500); 30 Nov 2015 06:27:11 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 18483 invoked by uid 500); 30 Nov 2015 06:27:11 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 18357 invoked by uid 99); 30 Nov 2015 06:27:11 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Nov 2015 06:27:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6D36FDFDAF; Mon, 30 Nov 2015 06:27:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anovikov@apache.org To: commits@ignite.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: IGNITE-843 Minor fix. Date: Mon, 30 Nov 2015 06:27:11 +0000 (UTC) Repository: ignite Updated Branches: refs/heads/ignite-843-rc2 b16b27ef8 -> c2efcd405 IGNITE-843 Minor fix. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c2efcd40 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c2efcd40 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c2efcd40 Branch: refs/heads/ignite-843-rc2 Commit: c2efcd405deb489382eb0aa01ccddb3272f0e1a6 Parents: b16b27e Author: Andrey Authored: Mon Nov 30 13:22:33 2015 +0700 Committer: Andrey Committed: Mon Nov 30 13:22:33 2015 +0700 ---------------------------------------------------------------------- modules/control-center-web/src/main/js/package.json | 5 +++++ modules/control-center-web/src/main/js/routes/public.js | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c2efcd40/modules/control-center-web/src/main/js/package.json ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/package.json b/modules/control-center-web/src/main/js/package.json index 52dd01e..da3f887 100644 --- a/modules/control-center-web/src/main/js/package.json +++ b/modules/control-center-web/src/main/js/package.json @@ -24,6 +24,7 @@ "body-parser": "~1.14.1", "bootstrap-sass": "^3.3.6", "compression": "1.6.0", + "connect-modrewrite": "^0.8.2", "connect-mongo": "^0.8.1", "cookie-parser": "~1.4.0", "debug": "~2.2.0", @@ -31,7 +32,11 @@ "express": "~4.13.3", "express-force-ssl": "^0.3.0", "express-session": "^1.12.0", + "font-awesome": "^4.4.0", "gulp": "^3.9.0", + "gulp-concat": "^2.6.0", + "gulp-connect": "^2.2.0", + "gulp-environments": "^0.1.1", "gulp-inject": "^3.0.0", "gulp-jade": "^1.1.0", "gulp-rimraf": "^0.2.0", http://git-wip-us.apache.org/repos/asf/ignite/blob/c2efcd40/modules/control-center-web/src/main/js/routes/public.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/routes/public.js b/modules/control-center-web/src/main/js/routes/public.js index 73fc95c..717b217 100644 --- a/modules/control-center-web/src/main/js/routes/public.js +++ b/modules/control-center-web/src/main/js/routes/public.js @@ -140,7 +140,7 @@ router.post('/password/forgot', function(req, res) { subject: 'Password Reset', text: 'You are receiving this because you (or someone else) have requested the reset of the password for your account.\n\n' + 'Please click on the following link, or paste this into your browser to complete the process:\n\n' + - 'http://' + (req.headers['x-forwarded-for'] || req.headers.host) + '/password/reset?token=' + token + '\n\n' + + 'http://' + req.headers.host + '/password/reset?token=' + token + '\n\n' + 'If you did not request this, please ignore this email and your password will remain unchanged.\n\n' + '--------------\n' + 'Apache Ignite Web Console\n' @@ -194,7 +194,7 @@ router.post('/password/reset', function(req, res) { subject: 'Your password has been changed', text: 'Hello,\n\n' + 'This is a confirmation that the password for your account ' + user.email + ' has just been changed.\n\n' + - 'Now you can login: http://' + (req.headers['x-forwarded-for'] || req.headers.host) + '\n\n' + + 'Now you can login: http://' + req.headers.host + '\n\n' + '--------------\n' + 'Apache Ignite Web Console\n' };