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 2016/10/22 10:57:11 UTC
[1/4] isis git commit: Remove unsused field declarations
Repository: isis
Updated Branches:
refs/heads/master d89a12611 -> 067ea19a1
Remove unsused field declarations
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/232959ac
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/232959ac
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/232959ac
Branch: refs/heads/master
Commit: 232959ac259e207342783771c39c48108d2032e4
Parents: d023786
Author: bibryam <red2KIDS>
Authored: Mon Oct 17 11:20:47 2016 +0100
Committer: bibryam <red2KIDS>
Committed: Mon Oct 17 11:20:47 2016 +0100
----------------------------------------------------------------------
.../viewer/wicket/ui/components/header/HeaderPanel.java | 9 ---------
1 file changed, 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/232959ac/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.java
index 6ad110c..bd38ff1 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.java
@@ -49,19 +49,10 @@ import org.apache.isis.viewer.wicket.ui.util.Components;
public class HeaderPanel extends PanelAbstract<Model<String>> {
private static final String ID_USER_NAME = "userName";
-
private static final String ID_PRIMARY_MENU_BAR = "primaryMenuBar";
private static final String ID_SECONDARY_MENU_BAR = "secondaryMenuBar";
private static final String ID_TERTIARY_MENU_BAR = "tertiaryMenuBar";
- @com.google.inject.Inject
- @Named("applicationName")
- private String applicationName;
-
- @com.google.inject.Inject(optional = true)
- @Named("brandLogo")
- private String brandLogo;
-
/**
* Constructor.
*
[2/4] isis git commit: Ignore mac os generated files from git
Posted by da...@apache.org.
Ignore mac os generated files from git
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/6476fed8
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/6476fed8
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/6476fed8
Branch: refs/heads/master
Commit: 6476fed886ae9b0be8a56c7ea26fa3ef0bc60d8e
Parents: 232959a
Author: bibryam <red2KIDS>
Authored: Mon Oct 17 11:45:01 2016 +0100
Committer: bibryam <red2KIDS>
Committed: Mon Oct 17 11:45:01 2016 +0100
----------------------------------------------------------------------
.gitignore | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/6476fed8/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index bb099fc..fb3a16a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,5 @@ JArchitectOut/
core/integtestsupport/fixture-data
rebel.xml
+
+**/.DS_Store
[4/4] isis git commit: Merge branch 'ISIS-1522_pr-58'
Posted by da...@apache.org.
Merge branch 'ISIS-1522_pr-58'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/067ea19a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/067ea19a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/067ea19a
Branch: refs/heads/master
Commit: 067ea19a19de1f72d1945c640573656a10ad0983
Parents: d89a126 3570b90
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Oct 22 11:56:58 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Oct 22 11:56:58 2016 +0100
----------------------------------------------------------------------
.gitignore | 2 ++
.../viewer/wicket/ui/components/header/HeaderPanel.java | 9 ---------
2 files changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
[3/4] isis git commit: Merge branch 'cleanup' of
https://github.com/bibryam/isis into ISIS-1522_pr-58
Posted by da...@apache.org.
Merge branch 'cleanup' of https://github.com/bibryam/isis into ISIS-1522_pr-58
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/3570b90a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/3570b90a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/3570b90a
Branch: refs/heads/master
Commit: 3570b90a9d28648ad4922a8e48cfdcb21cc172a0
Parents: d89a126 6476fed
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Oct 22 11:43:19 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Oct 22 11:43:19 2016 +0100
----------------------------------------------------------------------
.gitignore | 2 ++
.../viewer/wicket/ui/components/header/HeaderPanel.java | 9 ---------
2 files changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------