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/04/09 11:50:36 UTC
[isis] branch master updated (9ad5d2f -> 2293a4e)
This is an automated email from the ASF dual-hosted git repository.
joergrade pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 9ad5d2f Merge remote-tracking branch 'origin/master'
new 04ca260 ISIS-2345 unignore gradle/wrapper/*
new 3508f62 ISIS-2345 unignore gradle/wrapper/*
new 2293a4e Merge remote-tracking branch 'origin/master'
The 3 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:
incubator/clients/kroviz/.gitignore | 6 ++++--
.../clients/kroviz/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 55190 bytes
2 files changed, 4 insertions(+), 2 deletions(-)
create mode 100644 incubator/clients/kroviz/gradle/wrapper/gradle-wrapper.jar
[isis] 03/03: Merge remote-tracking branch 'origin/master'
Posted by jo...@apache.org.
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 2293a4efdf799b62c6e6f1c381f183b20eb85f9d
Merge: 3508f62 9ad5d2f
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Thu Apr 9 13:50:13 2020 +0200
Merge remote-tracking branch 'origin/master'
.../services/userprof/UserProfileService.java | 2 -
.../authentication/logout/LogoutHandler.java | 23 +++++++--
.../vaadin/ui/IsisModuleIncViewerVaadinUi.java | 2 +
.../common/model/IsisModuleViewerCommon.java} | 31 ++++++------
.../common/model/branding/BrandingUiModel.java} | 31 +++++++-----
.../model/branding/BrandingUiModelProvider.java} | 37 +++++++++-----
.../viewer/common/model/header/HeaderUiModel.java | 23 +++++----
.../common/model/header/HeaderUiModelProvider.java | 22 ++++++++
.../model/userprofile/UserProfileUiModel.java | 20 ++++----
.../userprofile/UserProfileUiModelProvider.java | 28 +++++++++++
.../viewer/wicket/ui/IsisModuleViewerWicketUi.java | 2 +
.../serviceactions/TertiaryActionsPanel.java | 2 +-
.../wicket/ui/components/header/HeaderPanel.java | 58 ++++++----------------
.../ui/components/widgets/navbar/BrandLogo.java | 11 ++--
.../ui/components/widgets/navbar/BrandName.java | 18 +++----
.../accmngt/AccountManagementPageAbstract.java | 12 +++--
.../viewer/wicket/ui/panels/PanelAbstract.java | 2 -
.../isis/viewer/wicket/ui/panels/PanelBase.java | 8 +++
18 files changed, 199 insertions(+), 133 deletions(-)
[isis] 02/03: ISIS-2345 unignore gradle/wrapper/*
Posted by jo...@apache.org.
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 3508f629bdea8f279cbec1f77c69cb92781ea239
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Thu Apr 9 13:49:34 2020 +0200
ISIS-2345 unignore gradle/wrapper/*
---
incubator/clients/kroviz/.gitignore | 3 ++-
.../clients/kroviz/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 55190 bytes
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/incubator/clients/kroviz/.gitignore b/incubator/clients/kroviz/.gitignore
index 7fe5306..ce639ba 100644
--- a/incubator/clients/kroviz/.gitignore
+++ b/incubator/clients/kroviz/.gitignore
@@ -1,7 +1,8 @@
-./build
+build
./out
./target
.idea/
+.gradle
*.iml
*.ipr
*.iws
diff --git a/incubator/clients/kroviz/gradle/wrapper/gradle-wrapper.jar b/incubator/clients/kroviz/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..87b738c
Binary files /dev/null and b/incubator/clients/kroviz/gradle/wrapper/gradle-wrapper.jar differ
[isis] 01/03: ISIS-2345 unignore gradle/wrapper/*
Posted by jo...@apache.org.
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 04ca26021ad4fb42830b022fcfbd6eb2ca4d5fb8
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Thu Apr 9 13:46:11 2020 +0200
ISIS-2345 unignore gradle/wrapper/*
---
incubator/clients/kroviz/.gitignore | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/incubator/clients/kroviz/.gitignore b/incubator/clients/kroviz/.gitignore
index b550c2a..7fe5306 100644
--- a/incubator/clients/kroviz/.gitignore
+++ b/incubator/clients/kroviz/.gitignore
@@ -1,7 +1,6 @@
./build
./out
./target
-.gradle
.idea/
*.iml
*.ipr
@@ -9,3 +8,5 @@
/refresh.sh
package-lock.json
node_modules/
+!gradle/wrapper/gradle-wrapper.jar
+!gradle/wrapper/gradle-wrapper.properties