Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Z
zpush-openshift
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
mail
zpush-openshift
Commits
9d4c5eb8
Unverified
Commit
9d4c5eb8
authored
4 years ago
by
Vincent Brillault
Browse files
Options
Downloads
Patches
Plain Diff
Remove patch already applied in CERN's repo
parent
c1a8be6e
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.s2i/bin/assemble
+0
-4
0 additions, 4 deletions
.s2i/bin/assemble
patches/01_fix_caldav_events.patch
+0
-32
0 additions, 32 deletions
patches/01_fix_caldav_events.patch
with
0 additions
and
36 deletions
.s2i/bin/assemble
+
0
−
4
View file @
9d4c5eb8
...
@@ -11,10 +11,6 @@ sed -ri \
...
@@ -11,10 +11,6 @@ sed -ri \
-e
'/The configured LOGERRORFILE can not be modified./ s/^.*$/true;/'
\
-e
'/The configured LOGERRORFILE can not be modified./ s/^.*$/true;/'
\
./lib/core/zpush.php
./lib/core/zpush.php
# Workaround to make calendars actually writable
echo
"Applying patches"
patch
-p2
< 01_fix_caldav_events.patch
echo
"Assembling"
echo
"Assembling"
/usr/libexec/s2i/assemble
/usr/libexec/s2i/assemble
...
...
This diff is collapsed.
Click to expand it.
patches/01_fix_caldav_events.patch
deleted
100644 → 0
+
0
−
32
View file @
c1a8be6e
From 19f32af87b32e5c171d2bfa767717767e26e4a07 Mon Sep 17 00:00:00 2001
From: Giacomo Tenaglia <Giacomo.Tenaglia@cern.ch>
Date: Wed, 9 Dec 2020 15:51:04 +0100
Subject: [PATCH] CalDAV: add missing DESCRIPTION for VALARM of ACTION:DISPLAY
---
src/backend/caldav/caldav.php | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/backend/caldav/caldav.php b/src/backend/caldav/caldav.php
index feeb3543..f782badb 100644
--- a/src/backend/caldav/caldav.php
+++ b/src/backend/caldav/caldav.php
@@ -1227,6 +1227,7 @@
class BackendCalDAV extends BackendDiff {
if (isset($data->reminder)) {
$valarm = $vcal->createComponent('VALARM');
$valarm->add('ACTION', "DISPLAY");
+ $valarm->add('DESCRIPTION', 'Default Z-Push description');
$valarm->add('TRIGGER', "-PT".$data->reminder."M", ['RELATED' => "START"]);
$vevent->add($valarm);
}
@@ -1632,6 +1633,7 @@
class BackendCalDAV extends BackendDiff {
if ($data->reminderset && $data->remindertime) {
$valarm = $vcal->createComponent('VALARM');
$valarm->add('ACTION', "DISPLAY");
+ $valarm->add('DESCRIPTION', 'Default Z-Push description');
$valarm->add('TRIGGER', gmdate("Ymd\THis\Z", $data->remindertime), ['VALUE' => "DATE-TIME"]);
$vtodo->add($valarm);
}
--
2.29.2
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment