Merge branch 'release/v0.6.0'

cloudogu · Sep 18, 2024 · 5e29c9f · 5e29c9f
2 parents f9831fe + 5b54886
commit 5e29c9f
Show file tree

Hide file tree

Showing 13 changed files with 784 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,10 +5,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+## [0.6.0]
+### Changed
+- Relicense to AGPL-3.0-only
+
+## [v0.5.0] - 2024-07-01
+### Added
+- Add "written offer"-page
+
 ### Changed
-- deleted wrong information of imprint
-- seperated open source 3rd party licenses and dogu licenses
-- fixed licenses and addes missing licenses
+- Chang address to new cloudogu-address
+- Delete wrong information of imprint
+- Separate open source 3rd party licenses and dogu licenses
+- Fix licenses and add missing licenses
 
 ## [v0.4.0] - 2023-11-07
 ### Added

diff --git a/LICENSE b/LICENSE
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-VERSION=0.4.0
+VERSION=0.6.0
 target_dir=target
 page_root=info
 

diff --git a/README.md b/README.md
@@ -12,3 +12,22 @@ Navigate to the integrationTests directory.
 Make sure that the Development server is running.
 Run `yarn cypress run` to execute the end-to-end tests via [Cypress](https://www.cypress.io/).
 Before running the tests make sure the development server is running.
+
+---
+## What is the Cloudogu EcoSystem?
+The Cloudogu EcoSystem is an open platform, which lets you choose how and where your team creates great software. Each service or tool is delivered as a Dogu, a Docker container. Each Dogu can easily be integrated in your environment just by pulling it from our registry.
+
+We have a growing number of ready-to-use Dogus, e.g. SCM-Manager, Jenkins, Nexus Repository, SonarQube, Redmine and many more. Every Dogu can be tailored to your specific needs. Take advantage of a central authentication service, a dynamic navigation, that lets you easily switch between the web UIs and a smart configuration magic, which automatically detects and responds to dependencies between Dogus.
+
+The Cloudogu EcoSystem is open source and it runs either on-premises or in the cloud. The Cloudogu EcoSystem is developed by Cloudogu GmbH under [AGPL-3.0-only](https://spdx.org/licenses/AGPL-3.0-only.html).
+
+## License
+Copyright © 2020 - present Cloudogu GmbH
+This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, version 3.
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
+You should have received a copy of the GNU Affero General Public License along with this program. If not, see https://www.gnu.org/licenses/.
+See [LICENSE](LICENSE) for details.
+
+
+---
+MADE WITH :heart:&nbsp;FOR DEV ADDICTS. [Legal notice / Imprint](https://cloudogu.com/en/imprint/?mtm_campaign=ecosystem&mtm_kwd=imprint&mtm_source=github&mtm_medium=link)
diff --git a/ces-about-routes.conf b/ces-about-routes.conf
@@ -23,3 +23,8 @@ location ~ /termsAndConditions|/termsAndConditions/ {
 location ~ /imprint|/imprint/ {
   try_files /info/imprint.html $uri;
 }
+
+location ~ /writtenOffer|/writtenOffer/ {
+  try_files /info/writtenOffer.html $uri;
+}
+
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ces-about",
-  "version": "0.4.0",
-  "license": "MIT",
+  "version": "0.6.0",
+  "license": "AGPL-3.0-only",
   "repository": "https://github.com/cloudogu/ces-about",
   "scripts": {
     "postinstall": "./postinstall.sh"

diff --git a/src/doguLicenses.html b/src/doguLicenses.html
@@ -30,6 +30,7 @@
           <li><a href="/info/privacyPolicy">Privacy Policy</a></li>
           <li><a href="/info/termsAndConditions">Terms and Conditions</a></li>
           <li><a href="/info/imprint">Imprint</a></li>
+          <li><a href="/info/writtenOffer">Written Offer</a></li>
         </ul>
       </div>
     </div>

diff --git a/src/imprint.html b/src/imprint.html
@@ -33,6 +33,7 @@
           <li><a href="/info/privacyPolicy">Privacy Policy</a></li>
           <li><a href="/info/termsAndConditions">Terms and Conditions</a></li>
           <li class="active"><a href="/info/imprint">Imprint</a></li>
+          <li><a href="/info/writtenOffer">Written Offer</a></li>
         </ul>
       </div>
     </div>
@@ -53,7 +54,7 @@ <h1 class="heading text-muted">Imprint</h1>
     <div class="col-md-offset-2 col-md-8" align="justify">
       <p>
         Cloudogu GmbH<br/>
-        Brabandtstr. 9-10<br/>
+        Garküche 1<br/>
         38100 Braunschweig<br/>
       </p>
       <p>
@@ -62,8 +63,7 @@ <h1 class="heading text-muted">Imprint</h1>
       </p>
       <p>
         <strong>Contact</strong><br/>
-        Phone: +49 (531) 61808880<br/>
-        Fax: +49 (531) 2352819<br/>
+        Phone: +49 531 61 80 88-80<br/>
         Email: <a href="mailto:[email protected]" target="_top">[email protected]</a><br/>
       </p>
       <p>

diff --git a/src/index.html b/src/index.html
@@ -30,6 +30,7 @@
           <li><a href="/info/privacyPolicy">Privacy Policy</a></li>
           <li><a href="/info/termsAndConditions">Terms and Conditions</a></li>
           <li><a href="/info/imprint">Imprint</a></li>
+          <li><a href="/info/writtenOffer">Written Offer</a></li>
         </ul>
       </div>
     </div>

diff --git a/src/licenses.html b/src/licenses.html
@@ -30,6 +30,7 @@
           <li><a href="/info/privacyPolicy">Privacy Policy</a></li>
           <li><a href="/info/termsAndConditions">Terms and Conditions</a></li>
           <li><a href="/info/imprint">Imprint</a></li>
+          <li><a href="/info/writtenOffer">Written Offer</a></li>
         </ul>
       </div>
     </div>

diff --git a/src/privacyPolicy.html b/src/privacyPolicy.html
@@ -30,6 +30,7 @@
           <li class="active"><a href="/info/privacyPolicy">Privacy Policy</a></li>
           <li><a href="/info/termsAndConditions">Terms and Conditions</a></li>
           <li><a href="/info/imprint">Imprint</a></li>
+          <li><a href="/info/writtenOffer">Written Offer</a></li>
         </ul>
       </div>
     </div>

diff --git a/src/termsAndConditions.html b/src/termsAndConditions.html
@@ -30,6 +30,7 @@
           <li><a href="/info/privacyPolicy">Privacy Policy</a></li>
           <li class="active"><a href="/info/termsAndConditions">Terms and Conditions</a></li>
           <li><a href="/info/imprint">Imprint</a></li>
+          <li><a href="/info/writtenOffer">Written Offer</a></li>
         </ul>
       </div>
     </div>

diff --git a/src/writtenOffer.html b/src/writtenOffer.html
@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>Imprint</title>
+  <link rel="stylesheet" href="/info/assets/css/ces.css">
+  <link rel="stylesheet" href="/info/styles.css">
+  <link rel="icon" type="image/x-icon" href="/info/assets/images/favicon.ico">
+</head>
+<body>
+<br>
+<br>
+<br>
+<div>
+  <div class="navbar navbar-default navbar-fixed-top">
+    <div class="container-fluid">
+      <div class="navbar-header">
+        <button class="navbar-toggle collapsed" id="collapse-button" type="button">
+          <span class="sr-only">Toggle navigation</span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </button>
+        <a class="navbar-brand">
+          <img class="img-responsive" alt="Cloudogu" src="/info/assets/images/blib-white-30px.png">
+        </a>
+      </div>
+      <div class="collapse navbar-collapse" id="collapseExample">
+        <ul class="nav navbar-nav navbar-left">
+          <li><a href="/info/about" style="font-size: 18px;">About Cloudogu</a></li>
+          <li><a href="/info/dogulicenses">Dogu Licenses</a></li>
+          <li><a href="/info/licenses">3rd Party Licenses</a></li>
+          <li><a href="/info/privacyPolicy">Privacy Policy</a></li>
+          <li><a href="/info/termsAndConditions">Terms and Conditions</a></li>
+          <li><a href="/info/imprint">Imprint</a></li>
+          <li class="active"><a href="/info/writtenOffer">Written Offer</a></li>
+        </ul>
+      </div>
+    </div>
+  </div>
+</div>
+<div class="text-center">
+  <img alt="" src="/info/assets/images/blib-blue-160px.png">
+  <br>
+  <br>
+  <h1 class="heading text-muted">Written Offer for Source Code</h1>
+</div>
+<br>
+<br>
+<br>
+
+<div class="container">
+  <div class="row">
+    <div class="col-md-offset-2 col-md-8" align="justify">
+      <p>Information on the license conditions and - if required by the license - on the source code is available free of charge on request.</p>
+      <p>However, some licenses require the provision of physical copies of the source or object code. 
+        If this is the case, you can request a physical copy of the source code. 
+        A small fee is charged for these services to cover the cost of physical distribution.
+      </p>
+      <p>To receive a copy of the source code you can either submit a written request to      <br><br>
+        Cloudogu GmbH<br>
+        Garküche 1<br>
+        38100 Braunschweig<br><br>
+        or you may send an email to [email protected].
+      </p>
+      <p>Your request must be sent within three years from the date you received the software from Cloudogu that is the subject of your request or, 
+        in the case of source code licensed under the AGPL/GPL/LGPL v3, for as long as Cloudogu offers spare parts or customer support for the product, 
+        including the components or binaries that are the subject of your request.
+      </p>
+    </div>
+  </div>
+</div>
+<script src="/info/assets/js/navbar.js"></script>
+</body>
+</html>