Update README

i40-Tools · Aug 28, 2017 · 1c921e8 · 1c921e8
1 parent 663091f
commit 1c921e8
Show file tree

Hide file tree

Showing 14 changed files with 24,067 additions and 3,543 deletions.
diff --git a/.sbtserver/connections/master.log b/.sbtserver/connections/master.log
diff --git a/.sbtserver/master.log b/.sbtserver/master.log
diff --git a/.sbtserver/previous.log b/.sbtserver/previous.log
diff --git a/app/views/main.scala.html b/app/views/main.scala.html
@@ -17,10 +17,11 @@
         <meta name="author" content="">
         <title>Alligator</title>
             <!-- Bootstrap Core CSS -->
-        <link rel="stylesheet" href='@routes.Assets.versioned("stylesheets/styles.css")'> title="mainStyle">
         <link href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.6/cosmo/bootstrap.min.css" type="text/css" rel="stylesheet"/>
+        <link rel="stylesheet" type="text/css" href='@routes.Assets.versioned("stylesheets/codemirror.css")' />
+        <link rel="stylesheet" type="text/css" href='@routes.Assets.versioned("stylesheets/mergely.css")' />
+        <link rel="stylesheet" href='@routes.Assets.versioned("stylesheets/styles.css")' title="mainStyle">
     </head>
-
     <section class="well well-lg">
         <div class="container">
             <div class="row">
@@ -41,6 +42,8 @@ <h2>Alligator - Semantic Integration for Industry 4.0 Standards</h2>
         <script type='text/javascript' src='@routes.WebJarAssets.at(WebJarAssets.fullPath("react", "react.js"))'></script>
 
         <div  id="app"></div>
+        <script type="text/javascript" src='@routes.Assets.versioned("javascripts/codemirror.js")'></script>
+        <script type="text/javascript" src='@routes.Assets.versioned("javascripts/mergely.min.js")'></script>
         <script type="text/javascript" src='@routes.Assets.versioned("javascripts/client.min.js")'></script>
 
     </body>

diff --git a/logs/application.log b/logs/application.log
@@ -1,3 +1 @@
-2017-08-13 05:58:02,870 [INFO] from play.api.Play in ForkJoinPool-1-worker-1 - Application started (Dev)
-2017-08-13 06:01:32,422 [INFO] from play.api.Play in application-akka.actor.default-dispatcher-3 - Application started (Dev)
-2017-08-13 06:06:54,025 [INFO] from play.api.Play in application-akka.actor.default-dispatcher-2 - Application started (Dev)
+2017-08-28 11:01:18,027 [INFO] from play.api.Play in ForkJoinPool-1-worker-1 - Application started (Dev)
diff --git a/project/.sbtserver b/project/.sbtserver
@@ -1,3 +1,3 @@
-#Server Startup at 2017-08-13T00:09+0000
-#Sun Aug 13 03:09:27 EEST 2017
-server.uri=http\://0.0.0.0\:62722
+#Server Startup at 2017-08-28T09:03+0000
+#Mon Aug 28 11:03:26 CEST 2017
+server.uri=http\://0.0.0.0\:2523
diff --git a/public/javascripts/client.min.js b/public/javascripts/client.min.js