Merge branch 'hotfixes-21' into 'nc-21'

FROM nextcloud:21.0.7-fpm AS nextcloud

ARG BASE_DIR="/usr/src/nextcloud"

ARG TMP_PATCH_DIR="/tmp/build_patches"

# temporarily setting theme version to "nc21" to test

ARG THEME_VERSION="21.0.0"

ARG THEME_VERSION="21.1.0"

ARG THEME_HELPER_VERSION="1.0.2"

ARG NEWS_VERSION="16.2.1"

ARG NEWS_VERSION="17.0.0"

ARG QUOTA_WARN_VERSION="1.11.0"

ARG NOTES_VERSION="4.2.0"

ARG CONTACTS_VERSION="4.0.6"

ARG CALENDAR_VERSION="2.3.4"

ARG CALENDAR_VERSION="3.0.1"

ARG USER_BACKEND_RAW_SQL_VERSION="1.1.1"

ARG EMAIL_RECOVERY_JOB_ID="199763"

ARG RAINLOOP_VERSION="7.1.2"

ARG RAINLOOP_COMMIT_SHA="aa5c57a7"

ARG RAINLOOP_COMMIT_SHA="e9da581c"

ARG EDA_TAG="nc-21"

ARG ECLOUD_LAUNCHER_JOB_ID="222001"

ARG GOOGLE_INTEGRATION_VERSION="1.0.6"

COPY patches/ ${TMP_PATCH_DIR}/

RUN sed -i 's/21,0,7,0/21,0,7,8/' ${BASE_DIR}/version.php

RUN sed -i 's/21,0,7,0/21,0,7,11/' ${BASE_DIR}/version.php

# Install unzip for unzipping artifacts

RUN apt-get update && apt-get install unzip 

RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/contacts-main.js

RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i 's/emit("new-contact")/emit("newContact")/g' js/contacts-main.js

RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/calendar.js

RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/{name:\[a,"displayname"\]},//' js/calendar.js

RUN cd ${BASE_DIR}/custom_apps/calendar &&  sed -i 's/defaultValue:"PUBLIC"/defaultValue:"CONFIDENTIAL"/' js/calendar.js

RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/calendar-main.js

RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/{name:\[a,"displayname"\]},//' js/calendar-main.js

RUN cd ${BASE_DIR}/custom_apps/calendar &&  sed -i 's/defaultValue:"PUBLIC"/defaultValue:"CONFIDENTIAL"/' js/calendar-main.js

# Set default widgets to calendar, tasks and notes

RUN sed -i 's/recommendations,spreed,mail,calendar/calendar,tasks,notes/' ${BASE_DIR}/apps/dashboard/lib/Controller/DashboardController.php

-				<?php p($l->t('Administrator documentation')); ?>

+	<li>

+			<a class="icon-user"

+				href="https://docs.nextcloud.com/server/20/user_manual/en/" target="_blank" rel="noreferrer noopener">

+				href="https://docs.nextcloud.com/server/21/user_manual/en/" target="_blank" rel="noreferrer noopener">

+				<?php p('Nextcloud ' . $_['ncVersion'] . ' ' . $l->t('User documentation')); ?> ↗

 			</a>

 		</li>