From 3be4d19f85b4dc5c341f04b2b6bf1eccac6abd22 Mon Sep 17 00:00:00 2001 From: akhil Date: Fri, 17 Sep 2021 13:10:22 +0530 Subject: [PATCH 1/4] Added dashboard user status widget removal patch --- patches/011-privacy-settings.patch | 6 ++++++ patches/012-remove-user-status-widget.patch | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 patches/012-remove-user-status-widget.patch diff --git a/patches/011-privacy-settings.patch b/patches/011-privacy-settings.patch index 26647694..e109e2a8 100644 --- a/patches/011-privacy-settings.patch +++ b/patches/011-privacy-settings.patch @@ -1,3 +1,9 @@ +From: Akhil +Date: Thu, 07 Sep 2021 17:45 +0530 +Subject: [PATCH] Removes sections in "privacy" section in personal settings + +This patch removes certain unnecessary sections from the "privacy" section in personal settings + --- ./apps/privacy/lib/Settings/MissionSettings.php 2021-09-07 17:38:08.650902445 +0530 +++ ./apps/privacy/lib/Settings/MissionSettings-new.php 2021-09-07 17:40:30.078256502 +0530 @@ -41,8 +41,8 @@ diff --git a/patches/012-remove-user-status-widget.patch b/patches/012-remove-user-status-widget.patch new file mode 100644 index 00000000..0ee37bf0 --- /dev/null +++ b/patches/012-remove-user-status-widget.patch @@ -0,0 +1,19 @@ +From: Akhil +Date: Thu, 17 Sep 2021 13:00 +0530 +Subject: [PATCH] Removes user status widget from Dashboard + +This patch removes user status widget from available widgets in dashboard + +--- DashboardController.php 2021-09-17 12:56:19.691685082 +0530 ++++ DashboardController-new.php 2021-09-17 12:59:18.906502554 +0530 +@@ -111,6 +111,10 @@ + ]; + }, $this->dashboardManager->getWidgets()); + ++ $widgets = array_filter($widgets, function($widget) { ++ return($widget['id'] !== "user_status"); ++ }); ++ + + $configStatuses = $this->config->getUserValue($this->userId, 'dashboard', 'statuses', ''); + $statuses = json_decode($configStatuses, true); -- GitLab From c92a3a35d994e4cada190d0dc994bc2cb498e545 Mon Sep 17 00:00:00 2001 From: akhil Date: Fri, 17 Sep 2021 13:11:01 +0530 Subject: [PATCH 2/4] Bump version to 20,0,12,13 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4547d7e6..c27298b3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images COPY patches/ ${TMP_PATCH_DIR}/ COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh -RUN sed -i 's/20,0,12,1/20,0,12,12/' ${BASE_DIR}/version.php +RUN sed -i 's/20,0,12,1/20,0,12,13/' ${BASE_DIR}/version.php # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip -- GitLab From 5a6972f6c0c1a7069d4e5a229f6ad5cefdbbd7c9 Mon Sep 17 00:00:00 2001 From: akhil Date: Fri, 17 Sep 2021 13:20:35 +0530 Subject: [PATCH 3/4] Corrected date in patches --- patches/011-privacy-settings.patch | 2 +- patches/012-remove-user-status-widget.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/011-privacy-settings.patch b/patches/011-privacy-settings.patch index e109e2a8..17300809 100644 --- a/patches/011-privacy-settings.patch +++ b/patches/011-privacy-settings.patch @@ -1,5 +1,5 @@ From: Akhil -Date: Thu, 07 Sep 2021 17:45 +0530 +Date: Tue, 07 Sep 2021 17:45 +0530 Subject: [PATCH] Removes sections in "privacy" section in personal settings This patch removes certain unnecessary sections from the "privacy" section in personal settings diff --git a/patches/012-remove-user-status-widget.patch b/patches/012-remove-user-status-widget.patch index 0ee37bf0..7aeaa05c 100644 --- a/patches/012-remove-user-status-widget.patch +++ b/patches/012-remove-user-status-widget.patch @@ -1,5 +1,5 @@ From: Akhil -Date: Thu, 17 Sep 2021 13:00 +0530 +Date: Fri, 17 Sep 2021 13:00 +0530 Subject: [PATCH] Removes user status widget from Dashboard This patch removes user status widget from available widgets in dashboard -- GitLab From 4717a4efed2f688197707c06add61454c63e3bb0 Mon Sep 17 00:00:00 2001 From: akhil Date: Fri, 17 Sep 2021 15:11:37 +0530 Subject: [PATCH 4/4] Brought version number back to 20,0,12,12 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c27298b3..4547d7e6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images COPY patches/ ${TMP_PATCH_DIR}/ COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh -RUN sed -i 's/20,0,12,1/20,0,12,13/' ${BASE_DIR}/version.php +RUN sed -i 's/20,0,12,1/20,0,12,12/' ${BASE_DIR}/version.php # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip -- GitLab