You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2017/09/08 19:19:12 UTC
[1/3] isis git commit: Update _dg_ide_intellij.adoc
Repository: isis
Updated Branches:
refs/heads/master cb9c522f8 -> 3c0750a3e
Update _dg_ide_intellij.adoc
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/af9300aa
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/af9300aa
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/af9300aa
Branch: refs/heads/master
Commit: af9300aa74730b0fc3dc3b8c42553b5178341184
Parents: c92e5bf
Author: ppirus <pp...@users.noreply.github.com>
Authored: Thu Aug 31 14:42:04 2017 +0200
Committer: GitHub <no...@github.com>
Committed: Thu Aug 31 14:42:04 2017 +0200
----------------------------------------------------------------------
.../src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/af9300aa/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc
index 5e422cd..856edca 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc
@@ -121,6 +121,8 @@ Select all the categories (there should just be one), and hit OK. then hit rest
[WARNING]
====
+If importing into IntelliJ 2017.2.3 two categories are shown - "File templates" and "File templates (schemes)". Select all the categories.
+
Apparently no categories are shown if importing into IntelliJ 2016.1.1 Community Edition (and perhaps other 2016
versions). The file does import ok into IntelliJ 15.0.x, so we think this is a bug in the 2016 version.
@@ -245,7 +247,7 @@ If any dependencies are already loaded in the project, then IntelliJ will automa
You can press F4 (or use `File > Project Structure`) to see the resolved classpath for any of the modules loaded into the project.
-If you want to focus on one set of code (eg the Isis todoapp but not Apache Isis core) then you _could_ remove the module; but better is to ignore those modules. This will remove from the the _Projects_ window but keep them available in the _Maven Projects_ window for when you next want to work on them:
+If you want to focus on one set of code (eg the Isis todoapp but not Apache Isis core) then you _could_ remove the module; but better is to ignore those modules. This will remove them from the _Projects_ window but keep them available in the _Maven Projects_ window for when you next want to work on them:
.IntelliJ Maven Module Management - Ignoring Modules
image::{_imagesdir}intellij-idea/100-maven-module-mgmt/040-ignoring-modules.png[width="730px"]
[2/3] isis git commit: Merge branch 'patch-6' of
https://github.com/ppirus/isis into ISIS-1712_pr-85
Posted by da...@apache.org.
Merge branch 'patch-6' of https://github.com/ppirus/isis into ISIS-1712_pr-85
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/21ba2ca9
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/21ba2ca9
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/21ba2ca9
Branch: refs/heads/master
Commit: 21ba2ca909e1b52d49b3f02e6890810e9b144ddb
Parents: cb9c522 af9300a
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Sep 8 20:18:40 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Sep 8 20:18:40 2017 +0100
----------------------------------------------------------------------
.../src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/21ba2ca9/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc
----------------------------------------------------------------------
diff --cc adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc
index 83e3587,856edca..aecc99a
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc
@@@ -245,10 -247,10 +247,10 @@@ If any dependencies are already loaded
You can press F4 (or use `File > Project Structure`) to see the resolved classpath for any of the modules loaded into the project.
- If you want to focus on one set of code (eg the Isis todoapp but not Apache Isis core) then you _could_ remove the module; but better is to ignore those modules. This will remove from the the _Projects_ window but keep them available in the _Maven Projects_ window for when you next want to work on them:
+ If you want to focus on one set of code (eg the Isis todoapp but not Apache Isis core) then you _could_ remove the module; but better is to ignore those modules. This will remove them from the _Projects_ window but keep them available in the _Maven Projects_ window for when you next want to work on them:
.IntelliJ Maven Module Management - Ignoring Modules
-image::{_imagesdir}intellij-idea/100-maven-module-mgmt/040-ignoring-modules.png[width="730px"]
+image::{_imagesdir}intellij-idea/100-maven-module-mgmt/040-ignoring-modules.png[width="730px",link="{_imagesdir}intellij-idea/100-maven-module-mgmt/040-ignoring-modules.png"]
Confirm that it's ok to ignore these modules:
[3/3] isis git commit: Merge branch 'ISIS-1712_pr-85'
Posted by da...@apache.org.
Merge branch 'ISIS-1712_pr-85'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/3c0750a3
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/3c0750a3
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/3c0750a3
Branch: refs/heads/master
Commit: 3c0750a3e91af24a146a5dcdb4910d2fccd2162d
Parents: cb9c522 21ba2ca
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Sep 8 20:18:54 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Sep 8 20:18:54 2017 +0100
----------------------------------------------------------------------
.../src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------