Merge branches 'ignite-3345' and 'master' of 
https://git-wip-us.apache.org/repos/asf/ignite into ignite-3345


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/be64ed80
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/be64ed80
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/be64ed80

Branch: refs/heads/ignite-3345
Commit: be64ed8048d4a67f19606e99946b9d4ac3e54689
Parents: 22f85e3 67922b3
Author: Alexey Kuznetsov <akuznet...@apache.org>
Authored: Mon Feb 19 15:14:22 2018 +0700
Committer: Alexey Kuznetsov <akuznet...@apache.org>
Committed: Mon Feb 19 15:14:22 2018 +0700

----------------------------------------------------------------------
 .../Apache.Ignite.Core.Tests.DotNetCore.csproj  |  10 +
 .../Apache.Ignite.Core.Tests.csproj             |  29 +--
 .../Client/Cache/CacheClientAsyncWrapper.cs     |   1 -
 .../Config/KeyStore/client.jks                  | Bin 3232 -> 0 bytes
 .../Config/KeyStore/client.pem                  |  69 -------
 .../Config/KeyStore/client.pfx                  | Bin 3148 -> 0 bytes
 .../Config/KeyStore/generate.sh                 |  99 ---------
 .../Config/KeyStore/server.pem                  |  69 -------
 .../Config/KeyStore/server.pfx                  | Bin 3148 -> 0 bytes
 .../Apache.Ignite.Core.Tests/Config/ssl.xml     |  65 ++++++
 .../Config/start-test-grid1-ssl.xml             |  65 ------
 .../Config/start-test-grid1.xml                 |  55 -----
 .../Config/start-test-grid2.xml                 |  46 -----
 .../Config/start-test-grid3.xml                 |  44 ----
 .../IgniteConfigurationSerializerTest.cs        |   2 +-
 .../IgniteStartStopTest.cs                      |  77 ++-----
 .../Apache.Ignite.Core.Tests/LoadDllTest.cs     |  88 ++------
 .../Ssl/SslConfigurationTest.cs                 |  77 +++----
 .../Apache.Ignite.Core.DotNetCore.csproj        |  15 +-
 .../Apache.Ignite.Core.csproj                   |   6 +-
 .../Cluster/Ssl/ISslContextFactory.cs           |  35 ----
 .../Cluster/Ssl/SslContextFactory.cs            | 166 ---------------
 .../Apache.Ignite.Core/IgniteConfiguration.cs   |   4 +-
 .../Impl/Cluster/Ssl/SslFactorySerializer.cs    |  58 ------
 .../Impl/Ssl/SslFactorySerializer.cs            |  65 ++++++
 .../Ssl/ISslContextFactory.cs                   |  32 +++
 .../Apache.Ignite.Core/Ssl/SslContextFactory.cs | 166 +++++++++++++++
 modules/web-console/e2e/testcafe/Dockerfile     |   2 +
 modules/web-console/e2e/testcafe/envtools.js    |   1 +
 .../web-console/e2e/testcafe/fixtures/auth.js   |  73 ++++---
 .../e2e/testcafe/fixtures/user-profile.js       | 113 -----------
 .../fixtures/user-profile/credentials.js        |  63 ++++++
 .../testcafe/fixtures/user-profile/profile.js   |  84 ++++++++
 modules/web-console/e2e/testcafe/roles.js       |  23 +--
 modules/web-console/e2e/testcafe/testcafe.js    |   4 +-
 modules/web-console/e2e/testenv/Dockerfile      |   2 +
 modules/web-console/frontend/app/app.js         |  14 +-
 .../app/components/page-configure/index.js      |   3 +
 .../app/components/page-landing/index.js        |  65 ++++++
 .../app/components/page-landing/style.scss      | 104 ++++++++++
 .../app/components/page-landing/template.pug    |  66 ++++++
 .../page-password-changed/controller.js         |  26 +++
 .../components/page-password-changed/index.js   |  41 ++++
 .../components/page-password-changed/style.scss |  42 ++++
 .../page-password-changed/template.pug          |  22 ++
 .../page-password-reset/controller.js           |  53 +++++
 .../app/components/page-password-reset/index.js |  57 ++++++
 .../components/page-password-reset/style.scss   |  31 +++
 .../components/page-password-reset/template.pug |  80 ++++++++
 .../app/components/page-profile/controller.js   |   8 +-
 .../app/components/page-profile/index.js        |  13 +-
 .../app/components/page-profile/style.scss      |  31 +++
 .../app/components/page-profile/template.pug    | 203 +++++++++++++------
 .../app/components/page-signin/controller.js    |  30 +++
 .../app/components/page-signin/index.js         |  56 +++++
 .../app/components/page-signin/style.scss       |  38 ++++
 .../app/components/page-signin/template.pug     | 161 +++++++++++++++
 .../components/web-console-header/style.scss    |   1 +
 .../components/web-console-header/template.pug  |   2 +-
 .../frontend/app/controllers/auth.controller.js |  29 ---
 .../frontend/app/data/countries.json            |  72 ++++---
 .../frontend/app/helpers/jade/mixins.pug        |   1 +
 .../app/modules/states/configuration.state.js   |   1 +
 .../app/modules/states/password.state.js        |  50 -----
 .../frontend/app/modules/states/signin.state.js |  53 -----
 .../frontend/app/modules/user/Auth.service.js   |   6 +-
 .../app/primitives/form-field/checkbox.pug      |  30 +++
 .../app/primitives/form-field/dropdown.pug      |  51 +++++
 .../app/primitives/form-field/email.pug         |  37 ++++
 .../app/primitives/form-field/error.pug         |  29 +++
 .../app/primitives/form-field/index.pug         |  27 +++
 .../app/primitives/form-field/index.scss        | 149 +++++++++++++-
 .../app/primitives/form-field/input.pug         |  28 +++
 .../app/primitives/form-field/label.pug         |  30 +++
 .../app/primitives/form-field/number.pug        |  46 +++++
 .../app/primitives/form-field/password.pug      |  37 ++++
 .../app/primitives/form-field/phone.pug         |  35 ++++
 .../frontend/app/primitives/form-field/text.pug |  35 ++++
 .../app/primitives/form-field/tooltip.pug       |  18 ++
 .../frontend/app/primitives/panel/index.scss    |  96 +++++++--
 .../frontend/app/primitives/tooltip/index.scss  |  17 ++
 .../frontend/app/primitives/ui-grid/index.scss  |  32 +--
 .../frontend/app/services/DefaultState.js       |  36 ++++
 .../web-console/frontend/app/services/index.js  |   2 +
 modules/web-console/frontend/app/vendor.js      |   5 +-
 modules/web-console/frontend/package.json       |   3 +-
 .../frontend/public/images/icons/collapse.svg   |   3 +
 .../public/images/icons/exclamation.svg         |   3 +
 .../frontend/public/images/icons/expand.svg     |   3 +
 .../frontend/public/images/icons/index.js       |   4 +
 .../frontend/public/images/main-screenshot.png  | Bin 0 -> 86830 bytes
 .../public/images/page-landing-carousel-1.png   | Bin 0 -> 84434 bytes
 .../public/images/page-landing-carousel-2.png   | Bin 0 -> 106670 bytes
 .../public/images/page-landing-carousel-3.png   | Bin 0 -> 70876 bytes
 .../public/stylesheets/_bootstrap-custom.scss   |   1 -
 .../web-console/frontend/views/reset.tpl.pug    |  44 ----
 .../web-console/frontend/views/signin.tpl.pug   | 165 ---------------
 97 files changed, 2449 insertions(+), 1584 deletions(-)
----------------------------------------------------------------------


Reply via email to