You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/12/02 04:07:49 UTC
[20/32] ignite git commit: IGNITE-843 Minor fix.
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/c9026b9f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c9026b9f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c9026b9f
Branch: refs/heads/ignite-843-rc2
Commit: c9026b9f01b55d949b79da4f671c9d49972281d8
Parents: 88ceba9
Author: Andrey <an...@gridgain.com>
Authored: Tue Dec 1 17:28:51 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Tue Dec 1 17:28:51 2015 +0700
----------------------------------------------------------------------
.../control-center-web/src/main/js/app/index.js | 2 +-
.../app/modules/states/password-reset/index.js | 40 --------------------
.../js/app/modules/states/password/index.js | 40 ++++++++++++++++++++
3 files changed, 41 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c9026b9f/modules/control-center-web/src/main/js/app/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/index.js b/modules/control-center-web/src/main/js/app/index.js
index 8c68968..a89ef1e 100644
--- a/modules/control-center-web/src/main/js/app/index.js
+++ b/modules/control-center-web/src/main/js/app/index.js
@@ -56,7 +56,7 @@ import './modules/Auth/index'
import './modules/states/login/index'
import './modules/states/logout/index'
-import './modules/states/password-reset/index'
+import './modules/states/password/index'
import './modules/states/configuration/index'
import './modules/states/sql/index'
import './modules/states/profile/index'
http://git-wip-us.apache.org/repos/asf/ignite/blob/c9026b9f/modules/control-center-web/src/main/js/app/modules/states/password-reset/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/password-reset/index.js b/modules/control-center-web/src/main/js/app/modules/states/password-reset/index.js
deleted file mode 100644
index 0c4d8f9..0000000
--- a/modules/control-center-web/src/main/js/app/modules/states/password-reset/index.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import angular from 'angular'
-
-angular
-.module('ignite-console.states.password', [
- 'ui.router'
-])
-.config(['$stateProvider', function($stateProvider) {
- // set up the states
- $stateProvider
- .state('password', {
- url: '/password',
- abstract: true,
- template: '<ui-view></ui-view>'
- })
- .state('password.reset', {
- url: '/reset?{token}',
- templateUrl: '/reset.html'
- })
- .state('password.send', {
- url: '/send',
- templateUrl: '/reset.html'
- })
-}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/c9026b9f/modules/control-center-web/src/main/js/app/modules/states/password/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/password/index.js b/modules/control-center-web/src/main/js/app/modules/states/password/index.js
new file mode 100644
index 0000000..0c4d8f9
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/states/password/index.js
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import angular from 'angular'
+
+angular
+.module('ignite-console.states.password', [
+ 'ui.router'
+])
+.config(['$stateProvider', function($stateProvider) {
+ // set up the states
+ $stateProvider
+ .state('password', {
+ url: '/password',
+ abstract: true,
+ template: '<ui-view></ui-view>'
+ })
+ .state('password.reset', {
+ url: '/reset?{token}',
+ templateUrl: '/reset.html'
+ })
+ .state('password.send', {
+ url: '/send',
+ templateUrl: '/reset.html'
+ })
+}]);