Merge branches 'ignite-2612' and 'ignite-843-rc2' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-2612
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3f37fc8d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3f37fc8d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3f37fc8d Branch: refs/heads/ignite-2612 Commit: 3f37fc8d122e5a181859492e4d445b0eab3a4fbe Parents: a3214be ea979d8 Author: Alexey Kuznetsov <[email protected]> Authored: Fri Feb 19 16:45:30 2016 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Fri Feb 19 16:45:30 2016 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/common-module.js | 2 +- .../main/js/helpers/generator/generator-java.js | 199 ++++++++++++++----- .../src/main/js/serve/routes/public.js | 2 +- .../src/main/js/views/signin.jade | 2 +- .../src/main/js/views/sql/notebook-new.jade | 13 +- .../src/main/js/views/templates/clone.jade | 10 +- 6 files changed, 162 insertions(+), 66 deletions(-) ----------------------------------------------------------------------
