updates to gene tracker. prototype plugin is now in place due to a bug fix missing in upstream

mlist · mlist · commit 42b635dc545d · 2014-05-07T09:30:37.000+02:00
diff --git a/.gitmodules b/.gitmodules
@@ -18,3 +18,10 @@
 	path = modules/OpenLabAttachments
 	url = git@github.com:NanoCAN/OpenLabAttachments.git
 	branch = master
+[submodule "modules/OpenLabNotes"]
+	path = modules/OpenLabNotes
+	url = git@github.com:NanoCAN/OpenLabNotes.git
+	branch = master
+[submodule "prototype"]
+	path = prototype
+	url = git@github.com:mlist/grails-prototype.git
diff --git a/application.properties b/application.properties
@@ -1,5 +1,5 @@
 #Grails Metadata file
-#Tue Apr 15 16:58:25 GMT 2014
+#Tue May 06 15:00:38 CEST 2014
 app.grails.version=2.2.5
 app.name=OpenLabFramework
 app.servlet.version=2.4
@@ -10,6 +10,5 @@ plugins.cloud-foundry=1.2.3
 plugins.export=1.5
 plugins.grails-ui=1.2.3
 plugins.joda-time=1.4
-plugins.prototype=1.0
 plugins.quartz=0.4.2
 plugins.yui=2.8.2.1
diff --git a/grails-app/conf/BuildConfig.groovy b/grails-app/conf/BuildConfig.groovy
@@ -32,6 +32,7 @@ def pluginDir = new File('modules')
 pluginDir.eachDir {
   grails.plugin.location."$it.name" = it.path
 }
+grails.plugin.location.prototype = "prototype"
 
 grails.project.class.dir = "target/classes"
 grails.project.test.class.dir = "target/test-classes"
diff --git a/grails-app/views/login/auth.gsp b/grails-app/views/login/auth.gsp
@@ -52,6 +52,12 @@
 			</p>
 		</form>
 	</div>
+    <a class="twitter-timeline" data-dnt="true" href="https://twitter.com/search?q=openlabframework" data-widget-id="463641420083904512">Tweets</a>
+    <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+
+
+
+
 </div>
 <script type='text/javascript'>
 	<!--
diff --git a/logs/openlabframework.log b/logs/openlabframework.log
diff --git a/modules/OpenLabAttachments b/modules/OpenLabAttachments
@@ -1 +1 @@
-Subproject commit 19898110d97e8cec6feef4195956fecc283c6714
+Subproject commit 2089dc19fb98bc66e5573731cbc9f11e072f568b
diff --git a/modules/OpenLabBackend b/modules/OpenLabBackend
@@ -1 +1 @@
-Subproject commit a2637e112095a6e59a8feafa7a687a8773eb3aed
+Subproject commit 69a0501e5898a6cae7339ab86ee4bd445cbb3e5c
diff --git a/modules/OpenLabBarcode b/modules/OpenLabBarcode
@@ -1 +1 @@
-Subproject commit 1d891f96c4ad0efbc4ddf23a577a8324a5a745b9
+Subproject commit 7634c543a01708838208ace785d0bec224ba2915
diff --git a/modules/OpenLabGeneTracker b/modules/OpenLabGeneTracker
@@ -1 +1 @@
-Subproject commit ef17c5634aa3b65513ef6d48b7d7afdf8d5d5d12
+Subproject commit 62321f9edbeab9ddc82612c0ba30077a30860b4b
diff --git a/modules/OpenLabStorage b/modules/OpenLabStorage
@@ -1 +1 @@
-Subproject commit 59b554acee7dd964a3e63efb3e19e6efe5352ed7
+Subproject commit a9ae33441debb63b600ef32a1a2e32734b529e0e
diff --git a/prototype b/prototype
@@ -0,0 +1 @@
+Subproject commit 32092bf98467729f4f9cd916d4a7835a1049181d

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ def pluginDir = new File('modules')`
`32`	`32`	`pluginDir.eachDir {`
`33`	`33`	`grails.plugin.location."$it.name" = it.path`
`34`	`34`	`}`
	`35`	`+grails.plugin.location.prototype = "prototype"`
`35`	`36`
`36`	`37`	`grails.project.class.dir = "target/classes"`
`37`	`38`	`grails.project.test.class.dir = "target/test-classes"`