Announcement of devonfw-oasp merger

oasp · Apr 19, 2018 · 3ac6edb · 3ac6edb
1 parent dd5e4a8
commit 3ac6edb
Show file tree

Hide file tree

Showing 21 changed files with 114,165 additions and 701 deletions.
diff --git a/assets/content/OASP/about.md b/assets/content/OASP/about.md
@@ -1,2 +1,5 @@
-## Open Application Standard Platform
-The OASP is a solution to building business applications which combine best-in-class frameworks and libraries as well as industry proven practices and code conventions.
+## devonfw goes Open Source
+
+devonfw is a platform which provides solutions to building business applications which combine best-in-class frameworks and libraries as well as industry proven practices and code conventions. devonfw is 100% Open Source (Apache License version 2.0) since the beginning of 2018. 
+
+devonfw is build on OASP, the Open Application Standard Platform, also licensed under the Apache License. With the move to Open Source, devonfw will fully merge with OASP. This is a work in progress and far from complete. But we will be finalizing the merger in the months to come.
diff --git a/assets/images/devonfw-oasp.png b/assets/images/devonfw-oasp.png
diff --git a/favicon.ico b/favicon.ico
diff --git a/index.html b/index.html
@@ -1,4 +1,25 @@
-<!doctype html><html><head><meta charset="utf-8"><title>OASP</title><base href="/"><!--jquery--><script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script><!--bootstrap--><link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous"><!--bootstrap--><link rel="stylesheet" href="./assets/font-awesome-4.7.0/css/font-awesome.min.css"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" type="image/x-icon" href="favicon.ico"><!--Markdown Prism css--><link href="https://cdnjs.cloudflare.com/ajax/libs/prism/1.6.0/themes/prism.min.css" rel="stylesheet"/><!-- Start Single Page Apps for GitHub Pages --><script type="text/javascript">// Single Page Apps for GitHub Pages
+<!doctype html>
+<html>
+
+<head>
+  <meta charset="utf-8">
+  <title>devonfw</title>
+  <base href="/">
+  <!--jquery-->
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+  <!--bootstrap-->
+  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ"
+    crossorigin="anonymous">
+  <!--bootstrap-->
+  <link rel="stylesheet" href="./assets/font-awesome-4.7.0/css/font-awesome.min.css">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="icon" type="image/x-icon" href="favicon.ico">
+  <!--Markdown Prism css-->
+  <link href="https://cdnjs.cloudflare.com/ajax/libs/prism/1.6.0/themes/prism.min.css" rel="stylesheet" />
+
+  <!-- Start Single Page Apps for GitHub Pages -->
+  <script type="text/javascript">
+    // Single Page Apps for GitHub Pages
     // https://github.com/rafrex/spa-github-pages
     // Copyright (c) 2016 Rafael Pedicini, licensed under the MIT License
     // ----------------------------------------------------------------------
@@ -24,11 +45,25 @@
           );
         }
       }
-    }(window.location))</script><!-- End Single Page Apps for GitHub Pages --><link href="styles.a3833aaca16a8294b832.bundle.css" rel="stylesheet"/></head><body><app-root>Loading...</app-root><script>$(window).on("scroll", function () {
+    }(window.location))
+
+  </script>
+  <!-- End Single Page Apps for GitHub Pages -->
+</head>
+
+<body>
+  <app-root>Loading...</app-root>
+  <script>
+    $(window).on("scroll", function () {
       if ($(window).scrollTop() > 500) {
         $(".navbar").addClass("active");
       } else {
         //remove the background property so it comes transparent again (in css)
         $(".navbar").removeClass("active");
       }
-    });</script><script type="text/javascript" src="inline.4d733743d9c3af8f9537.bundle.js"></script><script type="text/javascript" src="polyfills.c2ee5918bccbe6881910.bundle.js"></script><script type="text/javascript" src="vendor.9540867b5d810dd64edf.bundle.js"></script><script type="text/javascript" src="main.50a0cf658936d35529d8.bundle.js"></script></body></html>
+    });
+
+  </script>
+<script type="text/javascript" src="inline.a07175516c55c4014717.bundle.js"></script><script type="text/javascript" src="polyfills.ccd1aacf9c32f76596f8.bundle.js"></script><script type="text/javascript" src="styles.b6004af8e43fc0c9b7b4.bundle.js"></script><script type="text/javascript" src="vendor.5d7ecfdd5d93a2a60045.bundle.js"></script><script type="text/javascript" src="main.e3c8670696e5af08382a.bundle.js"></script></body>
+
+</html>
diff --git a/inline.4d733743d9c3af8f9537.bundle.js b/inline.4d733743d9c3af8f9537.bundle.js
diff --git a/inline.a07175516c55c4014717.bundle.js b/inline.a07175516c55c4014717.bundle.js
diff --git a/inline.a07175516c55c4014717.bundle.js.map b/inline.a07175516c55c4014717.bundle.js.map
diff --git a/main.50a0cf658936d35529d8.bundle.js b/main.50a0cf658936d35529d8.bundle.js