From a588a7bc125f7cf3bdac1d1fca2640cfeabddfd4 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 17 Sep 2019 16:11:36 +0200 Subject: [PATCH 1/4] links_to_imprint_and_privacy_policy_changed_to_human-connection.org --- webapp/components/PageFooter/PageFooter.vue | 12 ++++++++++-- webapp/locales/de.json | 4 ++-- webapp/locales/en.json | 4 ++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/webapp/components/PageFooter/PageFooter.vue b/webapp/components/PageFooter/PageFooter.vue index d970792bb..b3e02fc75 100644 --- a/webapp/components/PageFooter/PageFooter.vue +++ b/webapp/components/PageFooter/PageFooter.vue @@ -2,13 +2,21 @@ diff --git a/webapp/locales/de.json b/webapp/locales/de.json index 381e493f8..aa471d5b9 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -2,7 +2,7 @@ "maintenance": { "title": "Human Connection befindet sich in der Wartung", "explanation": "Zurzeit führen wir einige geplante Wartungsarbeiten durch, bitte versuch es später erneut.", - "questions": "Bei Fragen oder Problemen erreichst du uns per E-Mail an" + "questions": "Bei Fragen oder Problemen erreichst du uns per E-Mail an" }, "index": { "no-results": "Keine Beiträge gefunden.", @@ -590,7 +590,7 @@ }, "data-privacy": { "title": "Du und deine Daten", - "description": "Bitte beachte, dass wir die Inhalte der Alphaversion zu Werbezwecken, Webpräsentationen usw. verwenden, aber wir glauben, dass das auch in Deinem Interesse ist. Am besten keinen Nachnamen eingeben und bei noch mehr Datensparsamkeit ein Profilfoto ohne Identität verwenden. Mehr in unserer Datenschutzerklärung" + "description": "Bitte beachte, dass wir die Inhalte der Alphaversion zu Werbezwecken, Webpräsentationen usw. verwenden, aber wir glauben, dass das auch in Deinem Interesse ist. Am besten keinen Nachnamen eingeben und bei noch mehr Datensparsamkeit ein Profilfoto ohne Identität verwenden. Mehr in unserer Datenschutzerklärung" }, "work-in-progress": { "title": "Baustellen", diff --git a/webapp/locales/en.json b/webapp/locales/en.json index 66ab4a47b..f4c36e3af 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -2,7 +2,7 @@ "maintenance": { "title": "Human Connection is under maintenance", "explanation": "At the moment we are doing some scheduled maintenance, please try again later.", - "questions": "Any Questions or concerns, send an email to" + "questions": "Any Questions or concerns, send an email to" }, "index": { "no-results": "No contributions found.", @@ -591,7 +591,7 @@ }, "data-privacy": { "title": "You and your data", - "description": "Please note that the content of the alpha version will be used for public web presentations etc. but we are sure, this is in your interest. Avoid real names and use anonymous profile pictures without your face. You can find more information in our data privacy policy" + "description": "Please note that the content of the alpha version will be used for public web presentations etc. but we are sure, this is in your interest. Avoid real names and use anonymous profile pictures without your face. You can find more information in our data privacy policy" }, "work-in-progress": { "title": "Work in progress", From 3f6cec8e276bfa7a2696529e82c6645dbc5ce2e4 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Tue, 17 Sep 2019 16:22:12 +0200 Subject: [PATCH 2/4] update backslash --- webapp/locales/de.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/locales/de.json b/webapp/locales/de.json index aa471d5b9..86d435b0f 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -2,7 +2,7 @@ "maintenance": { "title": "Human Connection befindet sich in der Wartung", "explanation": "Zurzeit führen wir einige geplante Wartungsarbeiten durch, bitte versuch es später erneut.", - "questions": "Bei Fragen oder Problemen erreichst du uns per E-Mail an" + "questions": "Bei Fragen oder Problemen erreichst du uns per E-Mail an" }, "index": { "no-results": "Keine Beiträge gefunden.", @@ -619,4 +619,4 @@ "have-fun": "Jetzt aber viel Spaß mit der Alpha von Human Connection! Für den ersten Weltfrieden. ♥︎", "closing": "Herzlichst

Euer Human Connection Team" } -} \ No newline at end of file +} From 4bed7435eca750655179ca43b66cadf839cd59d9 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Tue, 17 Sep 2019 16:23:01 +0200 Subject: [PATCH 3/4] update add backslash --- webapp/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/locales/en.json b/webapp/locales/en.json index f4c36e3af..1932c309a 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -2,7 +2,7 @@ "maintenance": { "title": "Human Connection is under maintenance", "explanation": "At the moment we are doing some scheduled maintenance, please try again later.", - "questions": "Any Questions or concerns, send an email to" + "questions": "Any Questions or concerns, send an email to" }, "index": { "no-results": "No contributions found.", @@ -620,4 +620,4 @@ "have-fun": "Now have fun with the alpha version of Human Connection! For the first universal peace. ♥︎", "closing": "Thank you very much

your Human Connection Team" } -} \ No newline at end of file +} From 94599c624b77253720b6a3a7f87069737e621e1a Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 18 Sep 2019 10:10:24 +0200 Subject: [PATCH 4/4] Delete dead code --- webapp/nuxt.config.js | 2 - webapp/pages/data-privacy.vue | 395 ---------------------------------- webapp/pages/imprint.vue | 83 ------- 3 files changed, 480 deletions(-) delete mode 100644 webapp/pages/data-privacy.vue delete mode 100644 webapp/pages/imprint.vue diff --git a/webapp/nuxt.config.js b/webapp/nuxt.config.js index 858294f37..a801d3a34 100644 --- a/webapp/nuxt.config.js +++ b/webapp/nuxt.config.js @@ -43,10 +43,8 @@ export default { // 'registration-verify-nonce', 'registration-create-user-account', 'pages-slug', - 'imprint', 'terms-and-conditions', 'code-of-conduct', - 'data-privacy', 'changelog', ], // pages to keep alive diff --git a/webapp/pages/data-privacy.vue b/webapp/pages/data-privacy.vue deleted file mode 100644 index 021fe5b78..000000000 --- a/webapp/pages/data-privacy.vue +++ /dev/null @@ -1,395 +0,0 @@ - - - diff --git a/webapp/pages/imprint.vue b/webapp/pages/imprint.vue deleted file mode 100644 index 657d0e651..000000000 --- a/webapp/pages/imprint.vue +++ /dev/null @@ -1,83 +0,0 @@ - - -