Refactored loadscript to also receive css not only js
To fix bug due to calls to deprecated method which caused js error in high dimensional popup for Scatter Plot and Survival Analysis
To fix bug due to calls to deprecated method which caused js error in high dimensional popup for Scatter Plot and Survival Analysis
UAT-27 Fix jquery/prototype conflict on admin page
Merge branch 'rc2_dev' of https://github.com/thehyve/transmartApp into rc2_dev
Add mandatory "from" attribute to select tag
Add daliance and transmart-mydas

So test-build and the nighly image pick it up.
To have hashtable of supported high dimensional data type that can be used as reference accross the application.
Refactored conditional logic to use global supported high dimensional data type and fix some error handling.
Adapt to class move in core-api; rem unsed fields
Work around Groovy bug

Getting this otherwise:

| Error Fatal error during compilation org.apache.tools.ant.BuildException: BUG! exception in phase 'class generation' in source unit '/home/gustavo/repos/transmartApp/grails-app/services/com/recomdata/transmart/data/export/ACGHDataService.groovy' At line 86 column 39
On receiver: row with message: getAt and arguments: assay
This method should not have been called. Please try to create a simple example reproducing this error and filea bug report at http://jira.codehaus.org/browse/GROOVY (Use --stacktrace to see the full trace)

My 10 minute attempt to reproduce this was uncessuful. Funny thing is,
it was working fine until RegionRow's package was moved.
Removed comments to avoid known grails issue http://jira.grails.org/browse/GRAILS-10763
Removed comments to avoid known grails issue http://jira.grails.org/browse/GRAILS-10763
Merge branch 'master' into rc2_dev
Add layoutResources to each parent sitemash layout

It's fix to render tags like <g:javascript>,.. in last grails version
Replace url-mappings due to buginess in 2.2.3

Replaced with version in grails-core commit dc99c9b223e1f256a.
Merge branch 'master' into rc2_dev

Conflicts:
	grails-app/conf/BuildConfig.groovy
Add layoutResources to editMetaData page
Merge branch 'rc2_dev' of https://github.com/thehyve/transmartApp into rc2_dev