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 2018/09/21 04:38:59 UTC
[isis] branch v2 updated (6b9a5bb -> 9bd3e0c)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 6b9a5bb ISIS-1920: fixes show all disabled reasons on members except 'Always disabled'
add 63f7419 ISIS-1899: updates asciidoc versions
add 87c6c03 ISIS-1899: adds stereotypes for uml diag in ad.adoc
add be330aa ISIS-1974: backports synchronisation fix
add 5987023 ISIS-1974: reinstates tests etc for simpleapp in CI
new 6d0e8b3 Merge branch 'master' into v2
add 16c4161 Revert "ISIS-1974: reinstates tests etc for simpleapp in CI"
new 9bd3e0c Merge branch 'master' into v2
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
adocs/documentation/pom-pdf.xml | 67 ++---
adocs/documentation/pom.xml | 19 +-
adocs/documentation/preview-html.sh | 2 +-
adocs/documentation/preview-pdf.sh | 2 +-
.../src/main/asciidoc/guides/ad/ad.adoc | 25 +-
.../cgcom/_cgcom_post-release-successful.adoc | 2 +-
.../guides/dg/images/contributing/git-workflow.png | Bin 55066 -> 38464 bytes
.../documentation/src/main/theme/custom-theme.yml | 278 +++++++++++++++++++++
.../documentation/src/main/theme}/isis-logo.png | Bin
.../core/runtime/services/i18n/po/PoWriter.java | 5 +-
10 files changed, 326 insertions(+), 74 deletions(-)
create mode 100644 adocs/documentation/src/main/theme/custom-theme.yml
copy {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/about/images => adocs/documentation/src/main/theme}/isis-logo.png (100%)
[isis] 02/02: Merge branch 'master' into v2
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 9bd3e0c6b9fa59698b9de63c64e369df49360251
Merge: 6d0e8b3 16c4161
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Sep 21 06:37:58 2018 +0200
Merge branch 'master' into v2
.gitlab-ci.yml | 3 +++
1 file changed, 3 insertions(+)
[isis] 01/02: Merge branch 'master' into v2
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 6d0e8b3f3864be97e1a77cdeef739e7c451cc6b3
Merge: 6b9a5bb 5987023
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Sep 20 23:28:33 2018 +0200
Merge branch 'master' into v2
# Conflicts:
# adocs/documentation/src/main/asciidoc/guides/ad/ad.adoc
# core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/PoWriter.java
.gitlab-ci.yml | 3 -
adocs/documentation/pom-pdf.xml | 67 ++---
adocs/documentation/pom.xml | 19 +-
adocs/documentation/preview-html.sh | 2 +-
adocs/documentation/preview-pdf.sh | 2 +-
.../src/main/asciidoc/guides/ad/ad.adoc | 25 +-
.../cgcom/_cgcom_post-release-successful.adoc | 2 +-
.../guides/dg/images/contributing/git-workflow.png | Bin 55066 -> 38464 bytes
.../documentation/src/main/theme/custom-theme.yml | 278 +++++++++++++++++++++
adocs/documentation/src/main/theme/isis-logo.png | Bin 0 -> 14160 bytes
.../core/runtime/services/i18n/po/PoWriter.java | 5 +-
11 files changed, 326 insertions(+), 77 deletions(-)
diff --cc core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/PoWriter.java
index efbf9c2,d7d6b3e..85bdc8e
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/PoWriter.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/PoWriter.java
@@@ -36,13 -36,10 +36,10 @@@ class PoWriter extends PoAbstract
public static Logger LOG = LoggerFactory.getLogger(PoWriter.class);
private static class Block {
- //private final String msgId;
- private final SortedSet<String> contexts = Sets.newTreeSet();
+ private final SortedSet<String> contexts = _Sets.newTreeSet();
private String msgIdPlural;
- private Block(/*final String msgId*/) {
- //this.msgId = msgId;
- }
+ private Block() { }
}
private final SortedMap<String, Block> blocksByMsgId = Maps.newTreeMap();