Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c43eb9b3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c43eb9b3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c43eb9b3 Branch: refs/heads/ignite-843 Commit: c43eb9b3c42a462c53ad3a148da8a6e1034a4bc7 Parents: 900e4b8 a9af674 Author: Alexey Kuznetsov <akuznet...@apache.org> Authored: Thu Aug 20 10:42:57 2015 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Thu Aug 20 10:42:57 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/common-module.js | 51 +++++++++++--------- .../main/js/controllers/profile-controller.js | 4 +- .../src/main/js/controllers/sql-controller.js | 34 +++++++++++-- .../src/main/js/public/stylesheets/style.scss | 8 +++ .../src/main/js/routes/agent.js | 4 +- .../src/main/js/routes/notebooks.js | 39 +++++++++++++-- .../src/main/js/routes/profile.js | 13 +---- .../src/main/js/routes/public.js | 10 ++-- .../src/main/js/views/includes/header.jade | 6 +-- .../src/main/js/views/login.jade | 14 +++--- .../src/main/js/views/sql/sql.jade | 10 ++-- 11 files changed, 128 insertions(+), 65 deletions(-) ----------------------------------------------------------------------
