Merge branch 'MueezKhan/Removing-Unencrypted-Credentials-From-Model' …

…of github.com:openedx/edx-enterprise into MueezKhan/Remove-Unencrypted-SAP-Client-Credentials
openedx · Sep 10, 2024 · d2a0a89 · d2a0a89
2 parents b8c71de + b2ea600
commit d2a0a89
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -17,18 +17,22 @@ Unreleased
 ----------
 * nothing unreleased
 
-[4.25.7]
+[4.25.8]
 ----------
 * feat: added migration for removing unencrypted client credentials
 
-[4.25.6]
+[4.25.7]
 ----------
 * refactor: removed unencrypted credentials from sap config model.
 
-[4.25.5]
+[4.25.6]
 ----------
 * refactor: making unencrypted credentials nullable so after removing refs tests can run
 
+[4.25.5]
+----------
+* feat: changing django enterprise customer summary columns
+
 [4.25.4]
 ----------
 * feat: replaced references from unencrypted to encrypted columns.

diff --git a/enterprise/__init__.py b/enterprise/__init__.py
@@ -2,4 +2,4 @@
 Your project description goes here.
 """
 
-__version__ = "4.25.7"
+__version__ = "4.25.8"
diff --git a/enterprise/admin/__init__.py b/enterprise/admin/__init__.py
@@ -161,10 +161,9 @@ class EnterpriseCustomerAdmin(DjangoObjectActions, SimpleHistoryAdmin):
         'name',
         'slug',
         'customer_type',
-        'site',
         'country',
         'active',
-        'has_logo',
+        'enable_learner_portal',
         'enable_dsc',
         'has_identity_provider',
         'uuid',