ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject ignite git commit: IGNITE-843 Minor fix.
Date Mon, 30 Nov 2015 06:27:11 GMT
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 <anovikov@gridgain.com>
Authored: Mon Nov 30 13:22:33 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
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'
                 };


Mime
View raw message