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 2020/05/07 16:46:19 UTC
[isis] 02/08: 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 550cb99e403da3863b5c2ce3cb1d1d43fa7b61f1
Merge: 9133164 8011f7a
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Sun Apr 12 10:40:59 2020 +0200
Merge branch 'master' of https://github.com/apache/isis
.../ROOT/pages/antora-publish-procedure.adoc | 2 +-
.../modules/ROOT/pages/verifying-releases.adoc | 2 +-
.../going-deeper/articles-and-presentations.adoc | 4 +-
.../modules/ROOT/pages/going-deeper/books.adoc | 2 +
.../fun/pages/concepts-patterns/architecture.adoc | 2 +-
.../modules/applib-svc/pages/RoutingService.adoc | 2 +-
.../adoc/modules/applib-svc/pages/SudoService.adoc | 3 +-
.../applib-svc/pages/TableColumnOrderService.adoc | 2 +-
.../applib-svc/pages/_BackgroundService.adoc | 2 +-
.../main/adoc/modules/applib-svc/pages/about.adoc | 3 +-
.../layout/component/CssClassFaPosition.java | 6 +-
.../src/main/adoc/modules/schema/pages/chg.adoc | 2 +-
.../src/main/adoc/modules/schema/pages/cmd.adoc | 2 +-
.../pages/ContentNegotiationService.adoc | 2 +-
.../pages/PublisherDispatchService.adoc | 2 +-
.../pages/RepresentationService.adoc | 2 +-
incubator/clients/kroviz/{gradlew => gradlew.sh} | 0
incubator/clients/kroviz/pom.xml | 33 ++++-
...ActionFactoryVaa.java => ActionFactoryVaa.java} | 45 ++++--
.../action/{MenuActionVaa.java => ActionVaa.java} | 18 +--
.../model/action/MenuActionLinkFactoryVaa.java | 89 -----------
.../viewer/vaadin/model/decorator/Decorators.java | 98 +++++++++++++
.../viewer/vaadin/model/menu/MenuItemVaa.java | 12 +-
.../viewer/vaadin/ui/pages/main/MainView.java | 4 +-
.../ui/pages/main/MainView_createHeader.java | 14 +-
.../viewer/vaadin/viewer/IsisServletForVaadin.java | 9 +-
testing/adoc/modules/ROOT/pages/about.adoc | 2 +-
.../isis/viewer/common/model/HasUiComponent.java | 11 +-
...el.java => ActionLinkUiComponentDecorator.java} | 25 +---
.../model/action/ActionLinkUiComponentFactory.java | 20 ++-
.../common/model/action/ActionUiMetaModel.java | 144 ++++++++++++++++++
.../viewer/common/model/action/ActionUiModel.java | 90 ++++++++++--
.../common/model/action/ActionUiModelFactory.java | 49 ++++---
.../common/model/action/MenuActionFactory.java | 15 --
.../model/decorator/fa/FontAwesomeDecorator.java | 13 +-
.../model/decorator/fa/FontAwesomeUiModel.java | 59 ++++++++
.../model/decorator/tooltip/TooltipDecorator.java | 42 +++---
.../model/decorator/tooltip/TooltipUiModel.java | 38 +++--
.../common/model/header/HeaderUiModelProvider.java | 18 +++
.../common/model/link/ActionLinkFactory.java | 14 --
.../common/model/link/LinkAndLabelUiModel.java | 55 -------
.../model/link/LinkAndLabelUiModelAbstract.java | 163 ---------------------
.../isis/viewer/common/model/menu/MenuUiModel.java | 4 +-
.../model/menu/MenuUiModel_buildMenuItems.java | 10 +-
.../common/model/menuitem/MenuItemUiModel.java | 123 ++--------------
.../userprofile/UserProfileUiModelProvider.java | 18 +++
.../pages/extending/replacing-page-elements.adoc | 3 +-
.../viewer/wicket/model/links/LinkAndLabel.java | 38 +++--
.../components/actionmenu/CssClassFaBehavior.java | 19 ++-
.../entityactions/AdditionalLinksPanel.java | 42 +++---
.../entityactions/EntityActionLinkFactory.java | 15 +-
.../actionmenu/entityactions/LinkAndLabelUtil.java | 9 +-
.../actionmenu/serviceactions/CssMenuItem.java | 54 +++----
.../serviceactions/MenuActionLinkFactory.java | 17 +--
.../actionmenu/serviceactions/MenuActionWkt.java | 16 +-
.../serviceactions/ServiceActionUtil.java | 79 +++++-----
.../serviceactions/ServiceActionsPanel.java | 2 +-
.../ui/components/scalars/ScalarPanelAbstract.java | 2 +-
.../components/scalars/ScalarPanelAbstract2.java | 6 +-
...icket.java => LinkAndLabelFactoryAbstract.java} | 22 +--
.../isis/viewer/wicket/ui/util/Decorators.java | 79 ++++++++++
.../isis/viewer/wicket/ui/util/Tooltips.java | 47 +++---
62 files changed, 915 insertions(+), 810 deletions(-)