diff --git a/SECURITY.md b/SECURITY.md index 605d9a5c48..823dc6e856 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -4,8 +4,8 @@ | Version | Supported | | ------------------- | ------------------ | -| release-8.1 | :white_check_mark: | -| master a.k.a. 8.1z | :white_check_mark: | +| release-8.2 | :white_check_mark: | +| master a.k.a. 8.2z | :white_check_mark: | ## Reporting a Vulnerability diff --git a/org.adempiere.base/src/org/compiere/Adempiere.java b/org.adempiere.base/src/org/compiere/Adempiere.java index 6876c638d9..7440adc080 100644 --- a/org.adempiere.base/src/org/compiere/Adempiere.java +++ b/org.adempiere.base/src/org/compiere/Adempiere.java @@ -64,11 +64,11 @@ public final class Adempiere /** Timestamp */ static public final String ID = "$Id: Adempiere.java,v 1.8 2006/08/11 02:58:14 jjanke Exp $"; /** Main Version String */ - static public String MAIN_VERSION = "Release 8.1"; + static public String MAIN_VERSION = "Release 8.2"; /** Detail Version as date Used for Client/Server */ - static public String DATE_VERSION = "2020-11-03"; + static public String DATE_VERSION = "2020-12-20"; /** Database Version as date Compared with AD_System */ - static public String DB_VERSION = "2020-11-03"; + static public String DB_VERSION = "2020-12-20"; /** Product Name */ static public final String NAME = "iDempiere\u00AE"; @@ -242,7 +242,7 @@ public final class Adempiere if (s_ImplementationVendor != null) return; - Package adempierePackage = Package.getPackage("org.compiere"); + Package adempierePackage = Adempiere.class.getClassLoader().getDefinedPackage("org.compiere"); s_ImplementationVendor = adempierePackage.getImplementationVendor(); s_ImplementationVersion = adempierePackage.getImplementationVersion(); if (s_ImplementationVendor == null) diff --git a/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control b/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control index f25b22174c..574fc0381a 100644 --- a/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control +++ b/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control @@ -1,5 +1,5 @@ Package: idempiere -Version: 8.1 +Version: 8.2 Section: web Priority: extra Architecture: all diff --git a/org.adempiere.server/idempiere.html b/org.adempiere.server/idempiere.html index e43a4e9214..ca206bd3c0 100644 --- a/org.adempiere.server/idempiere.html +++ b/org.adempiere.server/idempiere.html @@ -44,7 +44,7 @@ - Welcome to the iDempiere (OSGi+ADempiere) 8.1 RC Page!
+ Welcome to the iDempiere (OSGi+ADempiere) 8.2 Phong Page!
 diff --git a/org.adempiere.server/idempiere.jsp b/org.adempiere.server/idempiere.jsp index 8d379fb10a..39ac361f86 100644 --- a/org.adempiere.server/idempiere.jsp +++ b/org.adempiere.server/idempiere.jsp @@ -77,12 +77,6 @@ Author URI: http://www.bmlaurus.com
<%=Prop.getProperty(Prop.SUPPORTREQUEST_TEXT)%>
-
  • - - " border="0" /> - -
    <%=Prop.getProperty(Prop.IRC_TEXT)%>
    -
  • " border="0" /> diff --git a/org.adempiere.server/resources/templates/white/images/img_back.jpg b/org.adempiere.server/resources/templates/white/images/img_back.jpg index 5ca17fe579..24c90070f7 100644 Binary files a/org.adempiere.server/resources/templates/white/images/img_back.jpg and b/org.adempiere.server/resources/templates/white/images/img_back.jpg differ diff --git a/org.adempiere.server/resources/templates/white/styles/template.css b/org.adempiere.server/resources/templates/white/styles/template.css index 25f78687e7..f357b3991e 100644 --- a/org.adempiere.server/resources/templates/white/styles/template.css +++ b/org.adempiere.server/resources/templates/white/styles/template.css @@ -72,22 +72,22 @@ div.body{ justify-content: center; } #main-docuBtns ul { - margin: 0px auto; + margin: 60px auto; padding:28px; display: flex; flex-direction: row; flex-wrap: wrap; - align-content: center; + align-content: flex-end; align-items: flex-start; justify-content: flex-start; - height: 450px; + height: 400px; width: 700px; } #main-docuBtns ul li { display: inline-flex; flex-direction: column; - height:120px; - width:130px; + height:114px; + width:106px; padding: 9px 0; text-align:center; background-color: #fff; diff --git a/org.adempiere.server/src/main/home/org/bmlaurus/home/Prop.java b/org.adempiere.server/src/main/home/org/bmlaurus/home/Prop.java index df187c9869..2a0f5a021e 100644 --- a/org.adempiere.server/src/main/home/org/bmlaurus/home/Prop.java +++ b/org.adempiere.server/src/main/home/org/bmlaurus/home/Prop.java @@ -90,7 +90,7 @@ public final class Prop implements Serializable { public static final String SOC_7 = "Social7"; /**Defaults*/ - private static final String CREDITS = "Welcome to the iDempiere (OSGi+ADempiere) 8.1 RC Page!"; + private static final String CREDITS = "Welcome to the iDempiere (OSGi+ADempiere) 8.2 Phong Page!"; private static String LOGO_URL = null; diff --git a/org.adempiere.server/src/main/home/org/bmlaurus/home/home.properties b/org.adempiere.server/src/main/home/org/bmlaurus/home/home.properties index 8dd983116e..e9a7cb9bf5 100644 --- a/org.adempiere.server/src/main/home/org/bmlaurus/home/home.properties +++ b/org.adempiere.server/src/main/home/org/bmlaurus/home/home.properties @@ -52,5 +52,5 @@ CustomImagePath = NONE ClientName = iDempiere Application Home #Custom Credits & Copyright tail -Credits = Welcome to iDempiere 8.1 RC +Credits = Welcome to iDempiere 8.2 Phong Copyriright = || by iDempiere Community