Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1924f60f authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

jobs id updates and version bump

parent 69bbf838
Loading
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ ARG TMP_PATCH_DIR="/tmp/build_patches"
ARG THEME_HELPER_JOB_ID="868228"
ARG NOTES_VERSION="4.9.2"
ARG CONTACTS_JOB_ID="870287"
ARG CALENDAR_JOB_ID="870142"
ARG CALENDAR_JOB_ID="871506"
ARG EMAIL_RECOVERY_JOB_ID="868237"
ARG EA_JOB_ID="868194"
ARG LAUNCHER_JOB_ID="868255"
@@ -16,7 +16,7 @@ ARG USER_MIGRATION_JOB_ID="870242"
ARG MEMORIES_VERSION="6.2.2"
ARG DROP_ACCOUNT_VERSION="2.3.2"

RUN sed -i 's/27,1,7,3/27,1,7,3/' ${BASE_DIR}/version.php
RUN sed -i 's/27,1,7,3/27,1,7,4/' ${BASE_DIR}/version.php
COPY custom_entrypoint.sh /
RUN chmod +x /custom_entrypoint.sh
RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images
@@ -201,8 +201,8 @@ From selfhost as ecloud
ARG BASE_DIR="/usr/src/nextcloud"
ARG TMP_PATCH_DIR="/tmp/build_patches"
ARG THEME_VERSION="26.0.2"
ARG LDAP_WRITE_SUPPORT_VERSION="1.8.0"
ARG OIDC_LOGIN_VERSION="2.6.0"
ARG LDAP_WRITE_SUPPORT_VERSION="1.9.0"
ARG OIDC_LOGIN_VERSION="3.0.2"
ARG IS_SELFHOST=false

# Patches
+2 −2
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@
-		$this->imipService->addSubjectAndHeading($template, $method, $data['invitee_name'], $data['meeting_title'], $isModified, $replyingAttendee);
+		$l10n = \OC::$server->getL10N('dav');
+		if ( count($vEvent)>1) {
+			$this->imipService->addSubjectAndHeadingUpdated($template, $method, $data['invitee_name'], $data['meeting_title']);
+			$this->imipService->addSubjectAndHeadingUpdated($template, $method, $data['invitee_name'], $data['meeting_title'], $isModified, $replyingAttendee);
+		} else {
+			$this->imipService->addSubjectAndHeading($template, $method, $data['invitee_name'], $data['meeting_title']);
+			$this->imipService->addSubjectAndHeading($template, $method, $data['invitee_name'], $data['meeting_title'], $isModified, $replyingAttendee);
+		}
+		if ($method === self::METHOD_CANCEL) {
+			$template->addHeadingBanner('#FFC2B9','#7D1000',$l10n->t('The invitation has been cancelled'));