From d5e2e8e342aea92661ac1df1969e7ce2bf9c7470 Mon Sep 17 00:00:00 2001 From: IlhemEssaadi <93516534+IlhemEssaadi@users.noreply.github.com> Date: Fri, 1 Dec 2023 10:52:35 +0100 Subject: [PATCH 1/4] fix: Update the wallet application image of page editor - EXO-67096 - Meeds-io/meeds#1358 (#462) After this change, we update the default image for wallet application. --- .../DefaultSkin/portletIcons/SpaceWallet.png | Bin 0 -> 13820 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 wallet-webapps/src/main/webapp/skin/DefaultSkin/portletIcons/SpaceWallet.png diff --git a/wallet-webapps/src/main/webapp/skin/DefaultSkin/portletIcons/SpaceWallet.png b/wallet-webapps/src/main/webapp/skin/DefaultSkin/portletIcons/SpaceWallet.png new file mode 100644 index 0000000000000000000000000000000000000000..a745f1f14263052b572dd8be44a0e2cdd96ece5e GIT binary patch literal 13820 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 Date: Mon, 4 Dec 2023 12:38:03 +0100 Subject: [PATCH 2/4] Update addons-parent-pom to 17 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e08a862e9..10ba4f3a0 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. addons-parent-pom org.exoplatform.addons - 17-M04 + 17 org.exoplatform.addons.wallet From 727d1b31a3da9cdb1340b0a70fd27348f2cf8e9d Mon Sep 17 00:00:00 2001 From: halaya Date: Mon, 4 Dec 2023 16:25:35 +0100 Subject: [PATCH 3/4] Update Project version and Dependencies to 2.6.x-SNAPSHOT --- pom.xml | 8 ++++---- wallet-api/pom.xml | 2 +- wallet-packaging/pom.xml | 2 +- wallet-reward-services/pom.xml | 2 +- wallet-services/pom.xml | 2 +- wallet-webapps/pom.xml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 10ba4f3a0..b789e53ae 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. org.exoplatform.addons.wallet wallet - 2.5.x-SNAPSHOT + 2.6.x-SNAPSHOT pom eXo Add-on:: Wallet Add-on eXo Wallet Add-on @@ -46,10 +46,10 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - 6.5.x-SNAPSHOT + 6.6.x-SNAPSHOT 1.3.0 - 6.5.x-SNAPSHOT - 1.4.x-SNAPSHOT + 6.6.x-SNAPSHOT + 1.5.x-SNAPSHOT meeds-io diff --git a/wallet-api/pom.xml b/wallet-api/pom.xml index 974fe5dfa..b87bb5914 100644 --- a/wallet-api/pom.xml +++ b/wallet-api/pom.xml @@ -20,7 +20,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. org.exoplatform.addons.wallet wallet - 2.5.x-SNAPSHOT + 2.6.x-SNAPSHOT wallet-api eXo Add-on:: Wallet - API diff --git a/wallet-packaging/pom.xml b/wallet-packaging/pom.xml index c0b9d9bb0..ca45539ad 100644 --- a/wallet-packaging/pom.xml +++ b/wallet-packaging/pom.xml @@ -21,7 +21,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. org.exoplatform.addons.wallet wallet - 2.5.x-SNAPSHOT + 2.6.x-SNAPSHOT wallet-packaging pom diff --git a/wallet-reward-services/pom.xml b/wallet-reward-services/pom.xml index fc285aba9..3ba67a229 100644 --- a/wallet-reward-services/pom.xml +++ b/wallet-reward-services/pom.xml @@ -20,7 +20,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. org.exoplatform.addons.wallet wallet - 2.5.x-SNAPSHOT + 2.6.x-SNAPSHOT wallet-reward-services eXo Add-on:: Wallet - Reward Services diff --git a/wallet-services/pom.xml b/wallet-services/pom.xml index e22485321..09496deff 100644 --- a/wallet-services/pom.xml +++ b/wallet-services/pom.xml @@ -20,7 +20,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. org.exoplatform.addons.wallet wallet - 2.5.x-SNAPSHOT + 2.6.x-SNAPSHOT wallet-services eXo Add-on:: Wallet - Services diff --git a/wallet-webapps/pom.xml b/wallet-webapps/pom.xml index 9a9478b23..55399fc8f 100644 --- a/wallet-webapps/pom.xml +++ b/wallet-webapps/pom.xml @@ -20,7 +20,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. org.exoplatform.addons.wallet wallet - 2.5.x-SNAPSHOT + 2.6.x-SNAPSHOT wallet-webapps war From e06831bfb8a873f7e309e1d9ff84cb4f0cb3145c Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Mon, 4 Dec 2023 19:42:06 +0100 Subject: [PATCH 4/4] feat: Delete AppCenter Mandatory Flag - MEED-3034 - Meeds-io/meeds#1371 (#465) This change will delete mandatory flag from AppCenter application to let users choose it when needed instead of adding it systematically. --- .../webapp/WEB-INF/conf/wallet/app-center-configuration.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/app-center-configuration.xml b/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/app-center-configuration.xml index a985b8958..8e9ca127d 100644 --- a/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/app-center-configuration.xml +++ b/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/app-center-configuration.xml @@ -62,9 +62,6 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. true - - true - true