Skip to content
Snippets Groups Projects
Commit 20bb51a6 authored by Marcel Nellesen's avatar Marcel Nellesen
Browse files

Merge branch 'Sprint/2021-03' into 'master' 

Sprint/2021 03

See merge request !23
parents e73ab4c4 f68977d7
No related branches found
No related tags found
1 merge request!23Sprint/2021 03
Show whitespace changes
Inline Side-by-side
Showing
with 47 additions and 87 deletions
.config/dotnet-tools.json deleted 100644 → 0
+ 0
− 18
View file @ e73ab4c4
{
"version": 1,
"isRoot": true,
"tools": {
"gitversion.tool": {
"version": "5.6.4",
"commands": [
"dotnet-gitversion"
]
},
"dotnet-version-cli": {
"version": "2.1.1",
"commands": [
"dotnet-version"
]
}
}
}
\ No newline at end of file
.gitignore
+ 3
− 0
View file @ 20bb51a6
......@@ -268,3 +268,6 @@ __pycache__/
tools/*
!tools/packages.config
dist/
# Dotnet Tool Manifest
.config/*
src/NotificationConfiguration.Test/NotificationConfiguration.Test.csproj
+ 2
− 3
View file @ 20bb51a6
......@@ -3,15 +3,14 @@
<OutputType>Library</OutputType>
<RootNamespace>Coscine.NotificationConfiguration.Test</RootNamespace>
<AssemblyName>Coscine.NotificationConfiguration.Test</AssemblyName>
<TargetFrameworks>net5.0;net461</TargetFrameworks>
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\NotificationConfiguration\NotificationConfiguration.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="NUnit" Version="3.13.0" />
<PackageReference Include="NUnit" Version="3.13.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
</ItemGroup>
</Project>
\ No newline at end of file
src/NotificationConfiguration.Test/Properties/AssemblyInfo.cs deleted 100644 → 0
+ 0
− 9
View file @ e73ab4c4
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by Cake.
// </auto-generated>
//------------------------------------------------------------------------------
using System.Reflection;
[assembly: AssemblyDescription("NotificationConfiguration.Test is a part of the CoScInE group.")]
[assembly: AssemblyCopyright("2021 IT Center, RWTH Aachen University")]
src/NotificationConfiguration/Actions.json
+ 30
− 30
View file @ 20bb51a6
......@@ -8,11 +8,11 @@
"template": {
"email": {
"de": {
"subject": "[CoScInE] Projekt gelöscht",
"subject": "[Coscine] Projekt {{_projectName}} gelöscht",
"body": "{{> header}}Das Projekt {{_projectName}} wurde gelöscht.{{> footer}}"
},
"en": {
"subject": "[CoScInE] Project deleted",
"subject": "[Coscine] Project {{_projectName}} deleted",
"body": "{{> header}}The Project {{_projectName}} was deleted.{{> footer}}"
}
}
......@@ -36,11 +36,11 @@
"template": {
"email": {
"de": {
"subject": "[CoScInE] Projekt erstellt",
"subject": "[Coscine] Projekt {{_projectName}} erstellt",
"body": "{{> header}}Das Projekt {{_projectName}} wurde erstellt.{{> footer}}"
},
"en": {
"subject": "[CoScInE] Project created",
"subject": "[Coscine] Project {{_projectName}} created",
"body": "{{> header}}The project {{_projectName}} was created.{{> footer}}"
}
}
......@@ -64,12 +64,12 @@
"template": {
"email": {
"de": {
"subject": "[CoScInE] Benutzer von Projekt entfernt",
"body": "{{> header}}Sie wurden von einem Projekt entfernt.{{> footer}}"
"subject": "[Coscine] Zugang zu {{_projectName}} widerrufen",
"body": "{{> header}}Ihr Zugang zu Projekt {{_projectName}} wurde widerrufen.{{> footer}}"
},
"en": {
"subject": "[CoScInE] User removed from project",
"body": "{{> header}}You were removed from a project.{{> footer}}"
"subject": "[Coscine] Access to {{_projectName}} revoked",
"body": "{{> header}}Your access to {{_projectName}} was revoked.{{> footer}}"
}
}
},
......@@ -92,11 +92,11 @@
"template": {
"email": {
"de": {
"subject": "[CoScInE] Benutzerrolle in Projekt geändert",
"subject": "[Coscine] Benutzerrolle in Projekt {{_projectName}} geändert",
"body": "{{> header}}Ihre Rolle in dem Projekt {{_projectName}} wurde geändert.{{> footer}}"
},
"en": {
"subject": "[CoScInE] User role changed in project",
"subject": "[Coscine] Role in project {{_projectName}} changed",
"body": "{{> header}}Your role in the project {{_projectName}} was changed.{{> footer}}"
}
}
......@@ -120,12 +120,12 @@
"template": {
"email": {
"de": {
"subject": "[CoScInE] Ressource entfernt",
"body": "{{> header}}Es wurde eine Ressource im Projekt {{_projectName}} entfernt.{{> footer}}"
"subject": "[Coscine] Ressource {{resourceName}} entfernt",
"body": "{{> header}}Es wurde die Ressource {{resourceName}} im Projekt {{_projectName}} entfernt.{{> footer}}"
},
"en": {
"subject": "[CoScInE] Resource removed",
"body": "{{> header}}A resource was removed from the project {{_projectName}}.{{> footer}}"
"subject": "[Coscine] Resource {{resourceName}} removed",
"body": "{{> header}}The resource {{resourceName}} was removed from the project {{_projectName}}.{{> footer}}"
}
}
},
......@@ -148,12 +148,12 @@
"template": {
"email": {
"de": {
"subject": "[CoScInE] Ressource erstellt",
"body": "{{> header}}Es wurde eine Ressource in dem Projekt {{_projectName}} erstellt.{{> footer}}"
"subject": "[Coscine] Ressource {{resourceName}} erstellt",
"body": "{{> header}}Die Ressource {{resourceName}} wurde im Projekt {{_projectName}} erstellt.{{> footer}}"
},
"en": {
"subject": "[CoScInE] Resource created",
"body": "{{> header}}A resource was created in the project {{_projectName}}.{{> footer}}"
"subject": "[Coscine] Resource {{resourceName}} created",
"body": "{{> header}}The resource {{resourceName}} was created in the project {{_projectName}}.{{> footer}}"
}
}
},
......@@ -176,12 +176,12 @@
"template": {
"email": {
"de": {
"subject": "[CoScInE] Anfrage zu {{resourceName}} des Projekts {{_projectName}}",
"body": "{{> header}}Sehr geehrter {{_targetUserName}},<br/><br/> Es wurde eine externe Anfrage bezüglich der Ressource {{resourceName}} Ihres Coscine-Projekts {{_projectName}} gesendet. <br/>Sie und alle anderen Projektinhaber haben diese Nachricht erhalten.<br/><br/>Bitte beachten Sie:<br/>Ihre E-Mail-Adresse wurde nicht an die Person weitergegeben, die die Anfrage initiiert hat. Die Nachricht wurde von Coscine weitergeleitet.<br/><br/>Wenn Sie sich dafür entscheiden, die Anfrage über die untenstehenden Kontaktinformationen zu beantworten, erhält die anfragende Person Informationen über Ihre E-Mail-Adresse.<br/><br/>Haftungsausschluss: Der Inhalt der Anfrage wurde nicht von Coscine erstellt. Bitte melden Sie jeglichen Missbrauch des Kontaktformulars an servicedesk@itc.rwth-aachen.de<br/><br/>Mit freundlichen Grüßen<br/>Ihr Coscine-Team<br/> <br/><br/>--- <br/><br/>Anfrage Informationen <br/>Name: {{requesterName}}<br/>Kontakt: {{requesterMail}}<br/><br/>Nachricht: {{requestMessage}}{{> footer}}"
"subject": "[Coscine] Anfrage zu {{resourceName}} des Projekts {{_projectName}}",
"body": "{{> header}}Hallo {{_targetUserName}},<br/><br/> es wurde eine externe Anfrage bezüglich der Ressource {{resourceName}} Ihres Coscine-Projekts {{_projectName}} gesendet. <br/>Sie und alle anderen Projektinhaber haben diese Nachricht erhalten.<br/><br/>Bitte beachten Sie:<br/>Ihre E-Mail-Adresse wurde nicht an die Person weitergegeben, die die Anfrage initiiert hat. Die Nachricht wurde von Coscine weitergeleitet.<br/><br/>Wenn Sie sich dafür entscheiden, die Anfrage über die untenstehenden Kontaktinformationen zu beantworten, erhält die anfragende Person Informationen über Ihre E-Mail-Adresse.<br/><br/>Haftungsausschluss: Der Inhalt der Anfrage wurde nicht von Coscine erstellt. Bitte melden Sie jeglichen Missbrauch des Kontaktformulars an servicedesk@rwth-aachen.de<br/><br/>Mit freundlichen Grüßen<br/>Ihr Coscine-Team<br/> <br/><br/>--- <br/><br/>Anfrage Informationen <br/>Name: {{requesterName}}<br/>Kontakt: {{requesterMail}}<br/><br/>Nachricht: {{requestMessage}}{{> footer}}"
},
"en": {
"subject": "[CoScInE] Request for {{resourceName}} of project {{_projectName}}",
"body": "{{> header}}Dear {{_targetUserName}}, <br/><br/> an external request was sent, regarding the resource {{resourceName}} of your Coscine project: {{_projectName}}. <br/>You and all other project owners have been relayed this message. <br/><br/>Please note: <br/>Your E-Mail adress was not disclosed to the person who initiated the requested. The message was relayed by Coscine. <br/><br/>If you choose to answer the request via the contact information below, the requesting person will gain information about your E-Mail address. <br/><br/>Disclaimer: The content of the request was not created by Coscine. Please report any abuse of the contact form to servicedesk@itc.rwth-aachen.de <br/><br/>Best regards <br/>Your Coscine team <br/><br/>--- <br/><br/>Request Information <br/>Name: {{requesterName}} <br/><br/><br/>Contact Mail: {{requesterMail}} <br/><br/><br/>Message: {{requestMessage}}{{> footer}}"
"subject": "[Coscine] Request for {{resourceName}} of project {{_projectName}}",
"body": "{{> header}}Dear {{_targetUserName}}, <br/><br/> an external request was sent, regarding the resource {{resourceName}} of your Coscine project: {{_projectName}}. <br/>You and all other project owners have been relayed this message. <br/><br/>Please note: <br/>Your E-Mail adress was not disclosed to the person who initiated the requested. The message was relayed by Coscine. <br/><br/>If you choose to answer the request via the contact information below, the requesting person will gain information about your E-Mail address. <br/><br/>Disclaimer: The content of the request was not created by Coscine. Please report any abuse of the contact form to servicedesk@rwth-aachen.de <br/><br/>Best regards <br/>Your Coscine team <br/><br/>--- <br/><br/>Request Information <br/>Name: {{requesterName}} <br/><br/><br/>Contact Mail: {{requesterMail}} <br/><br/><br/>Message: {{requestMessage}}{{> footer}}"
}
}
},
......@@ -204,12 +204,12 @@
"template": {
"email": {
"de": {
"subject": "[CoScInE] Anfrage zu Projekt {{_projectName}}",
"body": "{{> header}}Sehr geehrter {{_targetUserName}},<br/><br/> Es wurde eine externe Anfrage bezüglich Ihres Coscine-Projekts {{_projectName}} gesendet. <br/>Sie und alle anderen Projektinhaber haben diese Nachricht erhalten.<br/><br/>Bitte beachten Sie:<br/>Ihre E-Mail-Adresse wurde nicht an die Person weitergegeben, die die Anfrage initiiert hat. Die Nachricht wurde von Coscine weitergeleitet.<br/><br/>Wenn Sie sich dafür entscheiden, die Anfrage über die untenstehenden Kontaktinformationen zu beantworten, erhält die anfragende Person Informationen über Ihre E-Mail-Adresse.<br/><br/>Haftungsausschluss: Der Inhalt der Anfrage wurde nicht von Coscine erstellt. Bitte melden Sie jeglichen Missbrauch des Kontaktformulars an servicedesk@itc.rwth-aachen.de<br/><br/>Mit freundlichen Grüßen<br/>Ihr Coscine-Team<br/> <br/><br/>--- <br/><br/>Anfrage Informationen <br/>Name: {{requesterName}}<br/>Kontakt: {{requesterMail}}<br/><br/>Nachricht: {{requestMessage}}{{> footer}}"
"subject": "[Coscine] Anfrage zu Projekt {{_projectName}}",
"body": "{{> header}}Hallo {{_targetUserName}},<br/><br/> es wurde eine externe Anfrage bezüglich Ihres Coscine-Projekts {{_projectName}} gesendet. <br/>Sie und alle anderen Projektinhaber haben diese Nachricht erhalten.<br/><br/>Bitte beachten Sie:<br/>Ihre E-Mail-Adresse wurde nicht an die Person weitergegeben, die die Anfrage initiiert hat. Die Nachricht wurde von Coscine weitergeleitet.<br/><br/>Wenn Sie sich dafür entscheiden, die Anfrage über die untenstehenden Kontaktinformationen zu beantworten, erhält die anfragende Person Informationen über Ihre E-Mail-Adresse.<br/><br/>Haftungsausschluss: Der Inhalt der Anfrage wurde nicht von Coscine erstellt. Bitte melden Sie jeglichen Missbrauch des Kontaktformulars an servicedesk@rwth-aachen.de<br/><br/>Mit freundlichen Grüßen<br/>Ihr Coscine-Team<br/> <br/><br/>--- <br/><br/>Anfrage Informationen <br/>Name: {{requesterName}}<br/>Kontakt: {{requesterMail}}<br/><br/>Nachricht: {{requestMessage}}{{> footer}}"
},
"en": {
"subject": "[CoScInE] Request for project {{_projectName}}",
"body": "{{> header}}Dear {{_targetUserName}}, <br/><br/> an external request was sent, regarding your Coscine project: {{_projectName}}. <br/>You and all other project owners have been relayed this message. <br/><br/>Please note: <br/>Your E-Mail adress was not disclosed to the person who initiated the requested. The message was relayed by Coscine. <br/><br/>If you choose to answer the request via the contact information below, the requesting person will gain information about your E-Mail address. <br/><br/>Disclaimer: The content of the request was not created by Coscine. Please report any abuse of the contact form to servicedesk@itc.rwth-aachen.de <br/><br/>Best regards <br/>Your Coscine team <br/><br/>--- <br/><br/>Request Information <br/>Name: {{requesterName}} <br/><br/><br/>Contact Mail: {{requesterMail}} <br/><br/><br/>Message: {{requestMessage}}{{> footer}}"
"subject": "[Coscine] Request for project {{_projectName}}",
"body": "{{> header}}Dear {{_targetUserName}}, <br/><br/> an external request was sent, regarding your Coscine project: {{_projectName}}. <br/>You and all other project owners have been relayed this message. <br/><br/>Please note: <br/>Your E-Mail adress was not disclosed to the person who initiated the requested. The message was relayed by Coscine. <br/><br/>If you choose to answer the request via the contact information below, the requesting person will gain information about your E-Mail address. <br/><br/>Disclaimer: The content of the request was not created by Coscine. Please report any abuse of the contact form to servicedesk@rwth-aachen.de <br/><br/>Best regards <br/>Your Coscine team <br/><br/>--- <br/><br/>Request Information <br/>Name: {{requesterName}} <br/><br/><br/>Contact Mail: {{requesterMail}} <br/><br/><br/>Message: {{requestMessage}}{{> footer}}"
}
}
},
......@@ -232,11 +232,11 @@
"template": {
"email": {
"de": {
"subject": "[CoScInE] Anfrage zu PID: {{pid}}",
"subject": "[Coscine] Anfrage zu PID: {{pid}}",
"body": "{{> header}}Hallo {{requesterName}},<br/><br/>Sie haben eine Anfrage zur PID <b>{{pid}}</b> gestellt.<br/><br/>Die Nachricht wurde von Coscine an den Eigentümer weitergeleitet.<br/><br/><br/>Mit freundlichen Grüßen<br/>Ihr Coscine-Team<br/><br/><br/>---<br/><br/>Anfrage <br/>Name: {{requesterName}}<br/>Kontakt: {{requesterMail}}<br/><br/>Nachricht: {{requestMessage}}{{> footer}}"
},
"en": {
"subject": "[CoScInE] Request for PID: {{pid}}",
"subject": "[Coscine] Request for PID: {{pid}}",
"body": "{{> header}}Hello {{requesterName}},<br/><br/>You have made an inquiry about the PID <b>{{pid}}</b>.<br/><br/>The message was forwarded by Coscine to the owner.<br/><br/><br/>With kind regards<br/>Your Coscine Team<br/><br/><br/>---<br/><br/>Request <br/>Name: {{requesterName}}<br/>Contact Mail: {{requesterMail}}<br/><br/>Message: {{requestMessage}}{{> footer}}"
}
}
......@@ -260,11 +260,11 @@
"template": {
"email": {
"de": {
"subject": "[Coscine] Quota wurde verändert",
"subject": "[Coscine] Quota von {{_projectName}} verändert",
"body": "{{> header}}Die Quota für Ihr Projekt {{_projectName}} wurde verändert.{{> footer}}"
},
"en": {
"subject": "[Coscine] Quota was changed",
"subject": "[Coscine] Quota of {{_projectName}} changed",
"body": "{{> header}}The quota for your project {{_projectName}} was changed.{{> footer}}"
}
}
......
src/NotificationConfiguration/NotificationConfiguration.csproj
+ 12
− 2
View file @ 20bb51a6
......@@ -3,8 +3,18 @@
<OutputType>Library</OutputType>
<RootNamespace>Coscine.NotificationConfiguration</RootNamespace>
<AssemblyName>Coscine.NotificationConfiguration</AssemblyName>
<TargetFrameworks>net5.0;net461</TargetFrameworks>
<Version>1.6.0</Version></PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<Version>1.6.0</Version>
</PropertyGroup>
<PropertyGroup>
<Authors>RWTH Aachen University</Authors>
<Company>IT Center, RWTH Aachen University</Company>
<Copyright>2021 IT Center, RWTH Aachen University</Copyright>
<Description>NotificationConfiguration is a part of the Coscine group.</Description>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://git.rwth-aachen.de/coscine/backend/libraries/NotificationConfiguration</PackageProjectUrl>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="Actions.json" />
<EmbeddedResource Include="Channels.json" />
......
src/NotificationConfiguration/NotificationConfiguration.nuspec deleted 100644 → 0
+ 0
− 15
View file @ e73ab4c4
<?xml version="1.0"?>
<package >
<metadata>
<id>$id$</id>
<version>$version$</version>
<title>$title$</title>
<authors>rwth-aachen</authors>
<owners>rwth-aachen</owners>
<license type="expression">MIT</license>
<projectUrl>https://git.rwth-aachen.de/coscine/cs/notificationconfiguration</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>$description$</description>
<copyright>$copyright$</copyright>
</metadata>
</package>
\ No newline at end of file
src/NotificationConfiguration/Properties/AssemblyInfo.cs deleted 100644 → 0
+ 0
− 10
View file @ e73ab4c4
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by Cake.
// </auto-generated>
//------------------------------------------------------------------------------
using System.Reflection;
[assembly: AssemblyDescription("NotificationConfiguration is a part of the CoScInE group.")]
[assembly: AssemblyCopyright("2021 IT Center, RWTH Aachen University")]
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment