summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-04-05Uploading master via RestClientpc_unified_from_jlAndreas Maunz
2012-04-02Removed Java ENVAndreas Maunz
2012-04-02Remove PC descriptorAndreas Maunz
2012-03-28Merge remote branch 'origin/development'; commit ↵jldavor
'e145f4add589228ee9b2aa5500396035668b5085' into jl
2012-03-28Fixed dataset uri bug in load_dataset. davor
2012-03-20Merge remote branch 'origin/development' into jldavor
2012-03-20fix id-multithread issue via id-filemguetlein
2012-03-20Merge branch 'development' into jldavor
Conflicts: application.rb
2012-03-13add cleanup method for failed crossvalidationsmguetlein
2012-02-21Added description of pcdescAndreas Maunz
2012-02-20Support for progress (task)Andreas Maunz
2012-02-20Added pc descriptor calc serviceAndreas Maunz
2011-09-23Merge branch 'master' into developmentv3.1.0v3.0.1v3.0.0pcnumericmr
2011-09-23require opentox gem in ~>3mr
2011-09-23Merge branch 'release/v3.0.0'mr
2011-09-14fix: list jsonfiles for GET '/' call | prettify json view in htmlmr
2011-08-25Merge branch 'feature/json' into developmentChristoph Helma
2011-08-25yaml export fixedChristoph Helma
2011-08-24datasets stored as json (with Yajl) to improve performanceChristoph Helma
2011-08-17move data directory from public to data / add some subjectidsmr
2011-08-16fix indentmr
2011-08-04Merge branch 'release/v2.1.0'v2.1.0mr
2011-07-29SDF export with data itemsChristoph Helma
2011-07-28Merge branch 'feature/sdf-import' into developmentChristoph Helma
2011-07-28Merge branch 'development' into feature/sdf-importChristoph Helma
2011-07-28sdf upload enabledChristoph Helma
2011-07-28Added support for uri-list and sdfAndreas Maunz
2011-07-21Support for SDF in GETAndreas Maunz
2011-06-29add html support for dataset listingmguetlein
2011-06-06halts (partially) substituted by OpenTox errorsChristoph Helma
2011-05-23Merge branch 'master' of github.com:opentox/datasetmr
2011-05-23Merge branch 'development' of github.com:opentox/dataset into developmentmr
2011-05-23Hotfix: forgot to update versionAndreas Maunz
2011-05-23Hotfix: forgot to update versionAndreas Maunz
2011-05-23Merge branch 'release/2.0.0' into developmentmr
2011-05-23Merge branch 'release/2.0.0'v2.0.0mr
2011-05-23configure new version requested opentox-ruby gemmr
2011-04-05Merge branch 'master' into developmentChristoph Helma
2011-03-28Merge branch 'hotfix/v1.0.2' into developmentChristoph Helma
2011-03-28Merge branch 'hotfix/v1.0.2'v1.0.2Christoph Helma
2011-03-28extensions fixedChristoph Helma
2011-03-28dataset extensions fixedChristoph Helma
2011-03-11Merge branch 'release/v1.0.1' into developmentChristoph Helma
2011-03-11Merge branch 'release/v1.0.1'v1.0.1Christoph Helma
2011-03-11README converted to markdown, .yardopts addedChristoph Helma
2011-03-10Merge branch 'release/v1.0.0'v1.0.0Christoph Helma
2011-03-10README updatedChristoph Helma
2011-03-09Merge branch 'release/v1.0.0' into developmentChristoph Helma
2011-03-09Merge branch 'release/v1.0.0'Christoph Helma
2011-03-09version bumped to 1.0.0Christoph Helma