You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/04/20 18:13:55 UTC
[isis] branch 2617_wicketstuff.bs4 updated (b5105cc -> a8936ff)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch 2617_wicketstuff.bs4
in repository https://gitbox.apache.org/repos/asf/isis.git.
discard b5105cc Merge pull request #506 from mwhesse/upgrade-bootstrap-3-to-4
omit 1a7446f Merge branch '2617_wicketstuff.bs4' into upgrade-bootstrap-3-to-4
omit 95fb3e9 Adadpting DateTimeConfig to handle readonly, fixing some styles, increasing header expansion breakpoint to XL
omit e0b7ad4 ISIS-2617: minor config polishing; use jQuery 3.x as default
omit d521704 ISIS-2617: bump wicket 8.11->8.12
omit 7237695 Extending popover config with boundary (fixes flickering or flipping entity link popovers in collections)
omit 62a5b56 Adding setting to enable jQuery V3 in wicket
omit 2dca199 Adapting bookmarks panel, themechooser, removing occurences of xs-breakpoints, fixing missing popper.js dependency
omit e6779ef Removing all occurences of inline CSS styles
omit 7700804 Excluding popper.js through wicket-bootstrap-core
omit dbf8607 Adapting secondary and tertiary header menu, removing all occurences of .panel-default
omit d087807 Adapting footer to BS4
omit 7085d91 Reworking clearfix show/hide
omit 3d517ee Adjusting card bottom margin, adding new sizes
omit 6baf54f Adding dropdown-item class to menu links
omit 3717ddf Upgrading boostrap from version 3 to 4 (WIP)
omit 0170ea0 Extending popover config with boundary (fixes flickering or flipping entity link popovers in collections)
omit bc27169 Adding setting to enable jQuery V3 in wicket
omit 12ece2c Adapting bookmarks panel, themechooser, removing occurences of xs-breakpoints, fixing missing popper.js dependency
omit 45659c7 Removing all occurences of inline CSS styles
omit 3c2db65 Excluding popper.js through wicket-bootstrap-core
omit fdd3989 Adapting secondary and tertiary header menu, removing all occurences of .panel-default
omit 4bcbd87 Adapting footer to BS4
omit 2daa791 Reworking clearfix show/hide
omit ef359e5 Adjusting card bottom margin, adding new sizes
omit c6e5633 Adding dropdown-item class to menu links
omit 5b44522 Upgrading boostrap from version 3 to 4 (WIP)
add 8d9d5b3 ISIS-2562: remove 'newUser' actions from main menu;
add ea13a2c ISIS-2562: SecMan: rename all layout files to be fallback
add 8cb635d ISIS-2562: add App.User.Man. layout; also fix a misnamed one
add 80ba24d ISIS-2562: SecMan: provide all-user table content via mixin;
add aa81464 ISIS-2562: add mignotes, as the menu actions have changed
add 8b98652 ISIS-2562: polish VM title
add d5db478 Upgrading boostrap from version 3 to 4 (WIP)
add 6c2393d Adding dropdown-item class to menu links
add 9e49f32 Adjusting card bottom margin, adding new sizes
add f565250 Reworking clearfix show/hide
add 1c0f4d0 Adapting footer to BS4
add 6c70fad Adapting secondary and tertiary header menu, removing all occurences of .panel-default
add 070f377 Excluding popper.js through wicket-bootstrap-core
add 40a46f4 Removing all occurences of inline CSS styles
add 0b63b05 Adapting bookmarks panel, themechooser, removing occurences of xs-breakpoints, fixing missing popper.js dependency
add 25e5c1a Adding setting to enable jQuery V3 in wicket
add a61d54c Extending popover config with boundary (fixes flickering or flipping entity link popovers in collections)
add 190ae8b ISIS-2617: bump wicket 8.11->8.12
add b80c341 ISIS-2617: minor config polishing; use jQuery 3.x as default
add a8936ff ISIS-2617: minor post merge cleanup
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (b5105cc)
\
N -- N -- N refs/heads/2617_wicketstuff.bs4 (a8936ff)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.../modules/ROOT/pages/2021/2.0.0-M6/mignotes.adoc | 32 +++
.../applib/services/factory/FactoryService.java | 1 -
.../DomainObjectAnnotationFacetFactory.java | 3 +-
.../factory/FactoryServiceDefault.java | 3 +
.../src/main/java/demoapp/dom/menubars.layout.xml | 23 ++-
.../java/demoapp/webapp/wicket/DemoAppWicket.java | 4 +-
...ml => ApplicationNamespace.layout.fallback.xml} | 0
...out.xml => ApplicationType.layout.fallback.xml} | 0
...l => ApplicationTypeAction.layout.fallback.xml} | 0
... ApplicationTypeCollection.layout.fallback.xml} | 0
...=> ApplicationTypeProperty.layout.fallback.xml} | 0
.../model/dom/user/ApplicationUserManager.java | 19 +-
.../ApplicationUserManager.layout.fallback.xml | 61 ++++++
...r.java => ApplicationUserManager_allUsers.java} | 34 +--
.../ApplicationUserManager_newDelegateUser.java | 60 ++++--
.../user/ApplicationUserManager_newLocalUser.java | 45 ++--
.../secman/model/dom/user/ApplicationUserMenu.java | 229 +++++++++++----------
...=> UserPermissionViewModel.layout.fallback.xml} | 0
...User-enabled.png => ApplicationUserManager.png} | Bin
.../ApplicationPermission.layout.fallback.xml} | 0
.../dom/role/ApplicationRole.layout.fallback.xml} | 0
.../ApplicationTenancy.layout.fallback.xml} | 0
.../dom/user/ApplicationUserManager_allUsers.java | 25 ++-
.../ApplicationUserManager_newDelegateUser.java} | 56 +++--
.../user/ApplicationUserManager_newLocalUser.java | 91 ++++++++
.../ApplicationPermission.layout.fallback.xml} | 0
.../dom/role/ApplicationRole.layout.fallback.xml} | 0
.../ApplicationTenancy.layout.fallback.xml} | 0
.../dom/user/ApplicationUserManager_allUsers.java | 25 ++-
.../ApplicationUserManager_newDelegateUser.java} | 54 +++--
.../user/ApplicationUserManager_newLocalUser.java | 89 ++++++++
.../selector/CollectionSelectorPanel.html | 4 +-
.../ajaxtable/IsisAjaxPagingNavigationLink.java | 11 -
.../wicket/ui/components/footer/FooterPanel.html | 3 +-
.../wicket/ui/components/header/HeaderPanel.html | 8 +-
.../scalars/datepicker/DateTimeConfig.java | 25 ---
.../datepicker/TextFieldWithDateTimePicker.java | 11 +-
.../ui/components/tree/themes/bootstrap/theme.css | 12 +-
.../wicket/ui/pages/bootstrap-overrides-all-v2.css | 22 +-
.../wicket/ui/pages/bootstrap-overrides-cosmo.css | 5 -
.../wicket/ui/pages/bootstrap-overrides-darkly.css | 14 +-
.../viewer/wicketapp/IsisWicketApplication.java | 2 +-
42 files changed, 616 insertions(+), 355 deletions(-)
rename extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/{ApplicationNamespace.layout.xml => ApplicationNamespace.layout.fallback.xml} (100%)
rename extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/{ApplicationType.layout.xml => ApplicationType.layout.fallback.xml} (100%)
rename extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/{ApplicationTypeAction.layout.xml => ApplicationTypeAction.layout.fallback.xml} (100%)
rename extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/{ApplicationTypeCollection.layout.xml => ApplicationTypeCollection.layout.fallback.xml} (100%)
rename extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/{ApplicationTypeProperty.layout.xml => ApplicationTypeProperty.layout.fallback.xml} (100%)
create mode 100644 extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUserManager.layout.fallback.xml
copy extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/{ApplicationUserManager.java => ApplicationUserManager_allUsers.java} (59%)
rename extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/{UserPermissionViewModel.layout.xml => UserPermissionViewModel.layout.fallback.xml} (100%)
copy extensions/security/secman/model/src/main/resources/images/{ApplicationUser-enabled.png => ApplicationUserManager.png} (100%)
rename extensions/security/secman/{persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/permission/ApplicationPermission.layout.xml => persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.layout.fallback.xml} (100%)
rename extensions/security/secman/{persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/role/ApplicationRole.layout.xml => persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.layout.fallback.xml} (100%)
rename extensions/security/secman/{persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/tenancy/ApplicationTenancy.layout.xml => persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancy.layout.fallback.xml} (100%)
copy regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionDemo_biArgDisabled.java => extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUserManager_allUsers.java (67%)
copy extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUser_updatePhoneNumber.java => persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUserManager_newDelegateUser.java} (51%)
create mode 100644 extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUserManager_newLocalUser.java
rename extensions/security/secman/{persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.layout.xml => persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/permission/ApplicationPermission.layout.fallback.xml} (100%)
rename extensions/security/secman/{persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.layout.xml => persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/role/ApplicationRole.layout.fallback.xml} (100%)
rename extensions/security/secman/{persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancy.layout.xml => persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/tenancy/ApplicationTenancy.layout.fallback.xml} (100%)
copy regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/interaction/InteractionDemo_biArgDisabled.java => extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUserManager_allUsers.java (67%)
copy extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUser_updatePhoneNumber.java => persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUserManager_newDelegateUser.java} (52%)
create mode 100644 extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUserManager_newLocalUser.java