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 2021/06/18 19:23:29 UTC

[isis] branch master updated (87c735e -> 2352985)

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.


    from 87c735e  Merge pull request #618 from apache/ISIS-2751
     add 7738291  ISIS-2750: fixes missed @Priority edits
     add 0f1bce0  ISIS-2750: fixes integ test
     new 2352985  Merge pull request #619 from apache/ISIS-2750

The 1 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:
 .gitignore                                         |  1 +
 .../hooks/DomainServiceLayout_021-menuBar.adoc     |  2 +-
 ...ntentMappingService_020-examples-and-usage.adoc |  4 +--
 .../GridSystemService_020-examples-and-usage.adoc  |  2 +-
 .../RoutingService_020-examples-and-usage.adoc     |  2 +-
 .../refguide/modules/applib-svc/pages/about.adoc   | 19 +++++-----
 .../how-to-handle-void-and-null-results.adoc       |  2 +-
 .../replacing-default-service-implementations.adoc |  6 ++--
 .../domain-services.adoc                           |  2 +-
 .../inject-services.adoc                           |  2 +-
 .../modules/fun/pages/ui/table-columns.adoc        |  4 +--
 .../main/adoc/modules/webapp/pages/webmodules.adoc | 12 +++----
 .../customui/vm/WhereInTheWorldVm-description.adoc |  2 +-
 .../adoc/modules/secman/pages/setting-up.adoc      |  2 +-
 .../ui/components/markup/MarkupFieldFactory.java   |  4 +--
 .../ui/components/number/NumberFieldFactory.java   |  4 +--
 .../objectref/ObjectReferenceFieldFactory.java     |  4 +--
 .../ui/components/other/FallbackFieldFactory.java  |  4 +--
 .../components/temporal/TemporalFieldFactory.java  |  4 +--
 .../ui/components/text/TextFieldFactory.java       |  4 +--
 ...t.java => SpringServiceInjectPriorityTest.java} | 40 +++++++---------------
 .../modules/ROOT/pages/extending/custom-pages.adoc |  2 +-
 22 files changed, 57 insertions(+), 71 deletions(-)
 rename regressiontests/stable-bootstrapping/src/test/java/org/apache/isis/testdomain/bootstrapping/{SpringServiceInjectOrderTest.java => SpringServiceInjectPriorityTest.java} (87%)

[isis] 01/01: Merge pull request #619 from apache/ISIS-2750

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 23529850832d044db422207c96828401daea527c
Merge: 87c735e 0f1bce0
Author: Dan Haywood <da...@apache.org>
AuthorDate: Fri Jun 18 20:23:20 2021 +0100

    Merge pull request #619 from apache/ISIS-2750
    
    ISIS-2750: fixes missed @Priority edits

 .gitignore                                         |  1 +
 .../hooks/DomainServiceLayout_021-menuBar.adoc     |  2 +-
 ...ntentMappingService_020-examples-and-usage.adoc |  4 +--
 .../GridSystemService_020-examples-and-usage.adoc  |  2 +-
 .../RoutingService_020-examples-and-usage.adoc     |  2 +-
 .../refguide/modules/applib-svc/pages/about.adoc   | 19 +++++-----
 .../how-to-handle-void-and-null-results.adoc       |  2 +-
 .../replacing-default-service-implementations.adoc |  6 ++--
 .../domain-services.adoc                           |  2 +-
 .../inject-services.adoc                           |  2 +-
 .../modules/fun/pages/ui/table-columns.adoc        |  4 +--
 .../main/adoc/modules/webapp/pages/webmodules.adoc | 12 +++----
 .../customui/vm/WhereInTheWorldVm-description.adoc |  2 +-
 .../adoc/modules/secman/pages/setting-up.adoc      |  2 +-
 .../ui/components/markup/MarkupFieldFactory.java   |  4 +--
 .../ui/components/number/NumberFieldFactory.java   |  4 +--
 .../objectref/ObjectReferenceFieldFactory.java     |  4 +--
 .../ui/components/other/FallbackFieldFactory.java  |  4 +--
 .../components/temporal/TemporalFieldFactory.java  |  4 +--
 .../ui/components/text/TextFieldFactory.java       |  4 +--
 ...t.java => SpringServiceInjectPriorityTest.java} | 40 +++++++---------------
 .../modules/ROOT/pages/extending/custom-pages.adoc |  2 +-
 22 files changed, 57 insertions(+), 71 deletions(-)