This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch ISIS-3189 in repository https://gitbox.apache.org/repos/asf/isis.git
commit 402f4c507c205762078a1dc79cd1f69d3c3aa73b Merge: 59db361691 088c7a8b70 Author: Dan Haywood <[email protected]> AuthorDate: Mon Aug 29 11:08:39 2022 +0100 Merge branch 'ISIS-3188' .../mixins/metamodel/Object_logicalTypeName.java | 2 +- .../mixins/metamodel/Object_objectIdentifier.java | 2 +- .../services/bookmark/BookmarkHolder_lookup.java | 3 +- .../services/bookmark/BookmarkHolder_object.java | 3 +- .../commandlog/applib/app/CommandLogMenu.java | 2 +- .../dom/mixins/CommandLogEntry_childCommands.java | 3 +- .../mixins/CommandLogEntry_openResultObject.java | 3 +- .../mixins/CommandLogEntry_siblingCommands.java | 3 +- .../contributions/ExcelDemoToDoItem_export.java | 3 +- .../contributions/ExcelDemoToDoItem_export2.java | 3 +- .../ExecutionLogEntry_copyToOutbox.java | 3 +- .../ApplicationFeatureViewModel_permissions.java | 3 +- .../permission/dom/ApplicationPermission.java | 10 +++---- .../dom/mixins/ApplicationRole_addPermission.java | 2 +- .../secman/applib/user/dom/ApplicationUser.java | 32 +++++++++------------- .../user/dom/mixins/ApplicationUser_timeZone.java | 4 +-- .../mixins/ApplicationUser_updateAccountType.java | 2 +- .../mixins/Persistable_datanucleusVersionLong.java | 2 +- .../Persistable_datanucleusVersionTimestamp.java | 2 +- .../model/bad/AmbiguousMixinAnnotations.java | 6 ++-- .../commons/applib/mixins/Object_impersonate.java | 2 +- .../applib/mixins/Object_impersonateWithRoles.java | 2 +- 22 files changed, 44 insertions(+), 53 deletions(-)
