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/29 07:28:46 UTC

[isis] branch master updated (b823e62 -> 84dac87)

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 b823e62  Merge pull request #645 from apache/ISIS-2779
     add d961034  ISIS-2733: surfaces UserMemento via new "me" action.
     add ea8582d  ISIS-2733: adds some icons
     add 655bde9  ISIS-2733: registers UI subscribers
     add 25b4b0c  ISIS-2733: uses annotations for layout
     add d4dd1b2  ISIS-2733: suppress default UserMenu me action if secman is configured
     new 84dac87  Merge pull request #646 from apache/ISIS-2733

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:
 .../org/apache/isis/applib/IsisModuleApplib.java   |   6 +-
 .../appfeatui/ApplicationFeatureViewModel.png      | Bin
 .../isis/applib/services/user/RoleMemento.java     |  49 +++++---
 .../services/user/RoleMemento.layout.fallback.xml  |  14 +--
 .../isis/applib/services/user/RoleMemento.png      | Bin
 .../isis/applib/services/user/UserMemento.java     | 133 +++++++++++++--------
 .../services/user/UserMemento.layout.fallback.xml  |   8 +-
 .../isis/applib/services/user/UserMemento.png      | Bin
 .../isis/applib/services/user/package-info.java    |  37 ------
 .../applib/services/userprof/package-info.java     |  28 -----
 .../UserMenu.java}                                 |  45 +++----
 .../apache/isis/core/config/IsisConfiguration.java |  19 +++
 .../secman/applib/IsisModuleExtSecmanApplib.java   |   1 +
 .../secman/applib/user/menu/MeService.java         |  25 +++-
 14 files changed, 201 insertions(+), 164 deletions(-)
 copy extensions/security/secman/integration/src/main/resources/images/ApplicationFeature.png => api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationFeatureViewModel.png (100%)
 copy extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/permission/app/ApplicationOrphanedPermissionManager.layout.fallback.xml => api/applib/src/main/java/org/apache/isis/applib/services/user/RoleMemento.layout.fallback.xml (89%)
 copy extensions/security/secman/integration/src/main/resources/images/ApplicationRole.png => api/applib/src/main/java/org/apache/isis/applib/services/user/RoleMemento.png (100%)
 copy extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/role/dom/ApplicationRole.layout.fallback.xml => api/applib/src/main/java/org/apache/isis/applib/services/user/UserMemento.layout.fallback.xml (94%)
 copy extensions/security/secman/integration/src/main/resources/images/ApplicationUserManager.png => api/applib/src/main/java/org/apache/isis/applib/services/user/UserMemento.png (100%)
 delete mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/user/package-info.java
 delete mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/userprof/package-info.java
 copy api/applib/src/main/java/org/apache/isis/applib/services/{confview/ConfigurationMenu.java => userui/UserMenu.java} (64%)

[isis] 01/01: Merge pull request #646 from apache/ISIS-2733

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 84dac871da867391967053d98284d83633a267aa
Merge: b823e62 d4dd1b2
Author: Dan Haywood <da...@apache.org>
AuthorDate: Tue Jun 29 08:28:36 2021 +0100

    Merge pull request #646 from apache/ISIS-2733
    
    Isis 2733: surfaces UserMemento

 .../org/apache/isis/applib/IsisModuleApplib.java   |   6 +-
 .../appfeatui/ApplicationFeatureViewModel.png      | Bin 0 -> 1170 bytes
 .../isis/applib/services/user/RoleMemento.java     |  49 +++++---
 .../services/user/RoleMemento.layout.fallback.xml  |  44 +++++++
 .../isis/applib/services/user/RoleMemento.png      | Bin 0 -> 1287 bytes
 .../isis/applib/services/user/UserMemento.java     | 133 +++++++++++++--------
 .../services/user/UserMemento.layout.fallback.xml  |  67 +++++++++++
 .../isis/applib/services/user/UserMemento.png      | Bin 0 -> 864 bytes
 .../isis/applib/services/user/package-info.java    |  37 ------
 .../applib/services/userprof/package-info.java     |  28 -----
 .../isis/applib/services/userui/UserMenu.java      |  52 ++------
 .../apache/isis/core/config/IsisConfiguration.java |  19 +++
 .../secman/applib/IsisModuleExtSecmanApplib.java   |   1 +
 .../secman/applib/user/menu/MeService.java         |  25 +++-
 14 files changed, 292 insertions(+), 169 deletions(-)