You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by jo...@apache.org on 2022/06/13 16:51:07 UTC
[isis] 04/06: Merge branch 'master' of https://github.com/apache/isis
This is an automated email from the ASF dual-hosted git repository.
joergrade pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 21e8f2759ef0e5cecd09814f5eebec4d3d83c3f0
Merge: 7939fb8f24 2b267d7ccf
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Fri Jun 10 12:58:55 2022 +0200
Merge branch 'master' of https://github.com/apache/isis
.../java/org/apache/isis/applib/value/Markup.java | 12 +-
bom/pom.xml | 12 +-
.../isis/core/config/beans/IsisBeanMetaData.java | 31 ++++-
.../beans/IsisBeanTypeClassifierDefault.java | 7 +-
.../beans/IsisComponentScanInterceptorImpl.java | 3 +-
.../facets/all/named/ParamNamedFacetAbstract.java | 11 +-
.../ViewModelFacetForDomainObjectAnnotation.java | 21 +++-
.../NamedFacetForParameterUsingReflection.java | 2 +-
.../services/registry/ServiceRegistryDefault.java | 12 +-
.../isis/core/metamodel/spec/ManagedObject.java | 132 ++++++++++++++-------
.../isis/core/metamodel/spec/ManagedObjects.java | 45 ++-----
.../core/metamodel/spec/PackedManagedObject.java | 20 ++--
.../DomainModelTest_usingGoodDomain.java | 10 ++
...roperViewModelInferredFromNotBeingAnEntity.java | 21 ++--
starters/pom.xml | 2 +-
tooling/pom.xml | 2 +-
.../valuetypes/asciidoc/applib/value/AsciiDoc.java | 4 +-
.../valuetypes/markdown/applib/value/Markdown.java | 4 +-
.../components/scalars/ScalarPanelAbstract2.java | 4 +-
.../scalars/reference/EntityLinkSelect2Panel.java | 31 ++++-
.../components/widgets/bootstrap/ModalDialog.java | 20 ----
.../ui/components/widgets/select2/Select2.java | 3 +-
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 30 -----
.../bootstrap/css/bootstrap-overrides-all-v2.css | 6 +
.../viewer/wicket/ui/pages/entity/EntityPage.java | 7 +-
25 files changed, 251 insertions(+), 201 deletions(-)