diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..77bda52
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,13 @@
+
+# Changelog for invites-common-livrary
+
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [v7.0.0-SNAPSHOT] - 2020-10-01
+
+ported to git and added patch for my account URL pointing to keycloak user acount URL
+
+## [v1.0.0] - 2015-10-06
+
+First release
diff --git a/pom.xml b/pom.xml
index 601539b..39c4fb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
social-dockbar-hook
war
social-dockbar-hook Hook
- 6.5.1-SNAPSHOT
+ 7.0.0-SNAPSHOT
This component is a Liferay 6.2.6 CE Hook which customise the dockbar adding the Dashboard Icon, Workspace, Catalogue etc.
diff --git a/src/main/webapp/WEB-INF/liferay-plugin-package.properties b/src/main/webapp/WEB-INF/liferay-plugin-package.properties
index 51d6df0..b7211b9 100644
--- a/src/main/webapp/WEB-INF/liferay-plugin-package.properties
+++ b/src/main/webapp/WEB-INF/liferay-plugin-package.properties
@@ -1,6 +1,6 @@
name=social-dockbar-hook
module-group-id=liferay
-module-incremental-version=8
+module-incremental-version=9
tags=
short-description=
change-log=
diff --git a/src/main/webapp/custom_jsps/html/portlet/dockbar/view_user_account.portal.jspf b/src/main/webapp/custom_jsps/html/portlet/dockbar/view_user_account.portal.jspf
index 7ae92e5..d6ba433 100644
--- a/src/main/webapp/custom_jsps/html/portlet/dockbar/view_user_account.portal.jspf
+++ b/src/main/webapp/custom_jsps/html/portlet/dockbar/view_user_account.portal.jspf
@@ -129,12 +129,8 @@
}
%>
- <%
- String myAccountURL = themeDisplay.getURLMyAccount().toString();
-
- myAccountURL = HttpUtil.setParameter(myAccountURL, "controlPanelCategory", PortletCategoryKeys.MY);
- %>
- <%//Patch for myProfile URL
+
+ <%//Patch for myProfile URL s
PortalContext context = PortalContext.getConfiguration();
String mySiteURL = context.getSiteLandingPagePath(request);
String myProfileURL = mySiteURL + GCubePortalConstants.USER_PROFILE_FRIENDLY_URL;
@@ -146,7 +142,14 @@
- <%//End Patch for myProfile URL %>
+ <%//End Patch for myProfile URL
+ //start patch for myAccount URL
+ //String myAccountURL = themeDisplay.getURLMyAccount().toString();
+ //myAccountURL = HttpUtil.setParameter(myAccountURL, "controlPanelCategory", PortletCategoryKeys.MY);
+
+ String myAccountURL = PrefsPropsUtil.getString(themeDisplay.getCompany().getCompanyId(), "d4science.oidc-user_account_url");
+
+ %>