diff --git a/license.txt b/license.txt
index b2f7db90f7..beccce5ebe 100644
--- a/license.txt
+++ b/license.txt
@@ -1,17 +1,17 @@
-License Agreement for PMEase GitPlex Source Code
-
-This is a legal agreement between you and PMEase
-covering your use of GitPlex source code (the "Source"). Be sure to
-read the following agreement before using the Source. BY USING THE
-SOURCE,YOU ARE AGREEING TO BE BOUND BY THE TERMS OF THIS AGREEMENT.
-IF YOU DO NOT AGREE TO THE TERMS OF THIS AGREEMENT, DO NOT
-USE THE SOURCE AND DESTROY ALL COPIES IN YOUR POSSESSION.
-
-The Source is owned by PMEase and is protected by
-international treaty provisions. Therefore, you must treat the Source
-like any other copyrighted material (e. g., a book or musical recording).
-
-You may not redistribute the Source, or make any software competing with
-GitPlex based on the Source.
-
-Copyright (C) 2016-2017 by PMEase. All rights reserved.
\ No newline at end of file
+License Agreement for PMEase GitPlex Source Code
+
+This is a legal agreement between you and PMEase covering your use
+of GitPlex source code (the "Source"). Be sure to read the
+following agreement before using the Source. BY USING THE SOURCE,
+YOU ARE AGREEING TO BE BOUND BY THE TERMS OF THIS AGREEMENT.IF YOU
+DO NOT AGREE TO THE TERMS OF THIS AGREEMENT, DO NOT USE THE SOURCE
+AND DESTROY ALL COPIES IN YOUR POSSESSION.
+
+The Source is owned by PMEase and is protected by international
+treaty provisions. Therefore, you must treat the Source like any
+other copyrighted material (e. g., a book or musical recording).
+
+You may not redistribute the Source, or make any software competing
+with GitPlex based on the Source.
+
+Copyright (C) 2005-2018 by PMEase. All rights reserved.
\ No newline at end of file
diff --git a/product/system/license.txt b/product/system/license.txt
index 5600df90fe..e2351c821f 100644
--- a/product/system/license.txt
+++ b/product/system/license.txt
@@ -1,32 +1,36 @@
-Software License Agreement for PMEase @productName@.
+Software License Agreement for PMEase GitPlex.
-This is a legal agreement between you and PMEase Inc.
-covering your use of @productName@ (the "Software"). Be sure to read the
-following agreement before using the Software. BY USING THE SOFTWARE
-(REGARDLESS IF YOU HAVE GOT PERMANENT LICENSE OF THE SOFTWARE OR NOT),
-YOU ARE AGREEING TO BE BOUND BY THE TERMS OF THIS AGREEMENT.
-IF YOU DO NOT AGREE TO THE TERMS OF THIS AGREEMENT, DO NOT
-USE THE SOFTWARE AND DESTROY ALL COPIES IN YOUR POSSESSION.
+This is a legal agreement between you and PMEase covering your use of
+GitPlex (the "Software"). Be sure to read the following agreement
+before using the Software. BY USING THE SOFTWARE, YOU ARE AGREEING TO
+BE BOUND BY THE TERMS OF THIS AGREEMENT. IF YOU DO NOT AGREE TO THE
+TERMS OF THIS AGREEMENT, DO NOT USE THE SOFTWARE AND DESTROY ALL
+COPIES IN YOUR POSSESSION.
-The Software is owned by PMEase Inc. and is protected by
-international treaty provisions. Therefore, you must treat the Software
-like any other copyrighted material (e. g., a book or musical recording).
+The Software is owned by PMEase and is protected by international
+treaty provisions. Therefore, you must treat the Software like any
+other copyrighted material (e. g., a book or musical recording).
-PMEase Inc. grants you the right to use EAP (early access program) version
-of @productName@ for free. However you may not rent or lease the Software,
-nor may you modify, adapt, translate, reverse engineer, decompile, or
-disassemble the Software. If you violate any part of this agreement, your
-right to use this Software terminates automatically and you must then
-destroy all copies of the Software in your possession.
+PMEase grants you the right to use GitPlex for free for 10 named
+users on unlimited servers. Additional users require license generated
+from gitplex.com account. Licenses generated from single gitplex.com
+account should only be used in a single GitPlex instance, except for
+those used for backup and other non-production purposes.
+
+You may not rent or lease the Software, nor may you modify, adapt,
+translate, reverse engineer, decompile, or disassemble the Software.
+If you violate any part of this agreement, your right to use this
+Software terminates automatically and you must then destroy all copies
+of the Software in your possession.
The Software and its related documentation are provided "AS IS" and
-without warranty of any kind and PMEase Inc. expressly disclaims all other
+without warranty of any kind and PMEase expressly disclaims all other
warranties, expressed or implied, including, but not limited to, the
implied warranties of merchantability and fitness for a particular
-purpose. Under no circumstances shall PMEase Inc. be liable for any
-incidental, special, or consequential damages that result from the use or
-inability to use the Software or related documentation, even if PMEase Inc.
-has been advised of the possibility of such damages. In no event shall
-PMEase Inc. liability exceed the license fee paid, if any.
+purpose. Under no circumstances shall PMEase be liable for any
+incidental, special, or consequential damages that result from the use
+or inability to use the Software or related documentation, even if
+PMEase has been advised of the possibility of such damages. In no event
+shall PMEase liability exceed the license fee paid, if any.
-Copyright (C) 2005-2016 by PMEase Inc. All rights reserved.
+Copyright (C) 2005-2018 by PMEase All rights reserved.
diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/licensemanagement/LicenseManagementPage.html b/web/src/main/java/com/gitplex/server/web/page/admin/licensemanagement/LicenseManagementPage.html
index 3e3986c6bf..2b50d8cb67 100644
--- a/web/src/main/java/com/gitplex/server/web/page/admin/licensemanagement/LicenseManagementPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/admin/licensemanagement/LicenseManagementPage.html
@@ -28,6 +28,10 @@
| Expiration Date |
|
+
+ | Issue Account |
+ |
+
diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/licensemanagement/LicenseManagementPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/licensemanagement/LicenseManagementPage.java
index 3dc389ff01..48cc73f7df 100644
--- a/web/src/main/java/com/gitplex/server/web/page/admin/licensemanagement/LicenseManagementPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/admin/licensemanagement/LicenseManagementPage.java
@@ -95,6 +95,7 @@ public class LicenseManagementPage extends AdministrationPage {
WebConstants.DATE_FORMATTER.print(new DateTime(licenseDetail.getIssueDate()))));
fragment.add(new Label("expirationDate",
WebConstants.DATE_FORMATTER.print(new DateTime(licenseDetail.getExpirationDate())) + " (renew)").setEscapeModelStrings(false));
+ fragment.add(new Label("issueAccount", licenseDetail.getIssueAccount()));
add(fragment);
} else {
if (getUserCount() > LicenseDetail.FREE_LICENSE_USERS) {
diff --git a/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.html b/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.html
index 8fba46b7aa..205d63b6af 100644
--- a/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.html
@@ -37,10 +37,10 @@