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/14 16:46:35 UTC
[05/12] isis git commit: Merge branch 'master' of
https://github.com/apache/isis
Merge branch 'master' of https://github.com/apache/isis
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2f7a414f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2f7a414f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2f7a414f
Branch: refs/heads/pr-84
Commit: 2f7a414f74afcf046ad96dbb23db060f3c9c46c2
Parents: 6698573 3c0750a
Author: hobrom <ho...@gmx.at>
Authored: Tue Sep 12 10:47:51 2017 +0200
Committer: hobrom <ho...@gmx.at>
Committed: Tue Sep 12 10:47:51 2017 +0200
----------------------------------------------------------------------
.../asciidoc/guides/dg/_dg_ide_intellij.adoc | 68 ++++++++++----------
.../guides/rgcfg/_rgcfg_configuring-core.adoc | 4 +-
.../rgcms/_rgcms_methods_reserved_disable.adoc | 6 +-
.../main/asciidoc/guides/rgmvn/_rgmvn_xsd.adoc | 2 +-
...dless-access_BackgroundCommandExecution.adoc | 2 +-
.../_ugbtb_hints-and-tips_are-you-sure.adoc | 8 +--
...g_disabling-persistence-by-reachability.adoc | 2 +-
.../_ugsec_configuring-isis-to-use-shiro.adoc | 2 +-
...and-tips_configuring-isis-to-use-bypass.adoc | 2 +-
...c_shiro-realm-implementations_ini-realm.adoc | 2 +-
...o-realm-implementations_isis-ldap-realm.adoc | 12 ++--
...ations_isisaddons-security-module-realm.adoc | 4 +-
..._shiro-realm-implementations_jdbc-realm.adoc | 2 +-
.../_ugtst_fixture-scripts_api-and-usage.adoc | 4 +-
...gtst_integ-test-support_wrapper-factory.adoc | 2 +-
.../asciidoc/guides/ugtst/_ugtst_overview.adoc | 2 +-
.../documentation/src/main/asciidoc/index.html | 17 ++++-
.../main/asciidoc/js/toc-scroll/toc-scroll.js | 35 ++++++----
.../_migration-notes_1.14.0-to-1.15.0.adoc | 23 ++++++-
.../documentation/src/main/asciidoc/quotes.adoc | 14 ++++
core/pom.xml | 12 +++-
.../scalars/ScalarPanelSelect2Abstract.java | 4 +-
.../scalars/reference/ReferencePanel.java | 19 +-----
.../valuechoices/ValueChoicesSelect2Panel.java | 24 +------
.../application/manifest/isis.properties | 12 +++-
.../webapp/src/main/webapp/WEB-INF/shiro.ini | 10 +--
26 files changed, 164 insertions(+), 130 deletions(-)
----------------------------------------------------------------------