Skip to content

Commit

Permalink
Merge pull request #15 from AdrianBZG/master
Browse files Browse the repository at this point in the history
Update IM browser repo with new features (road to version 1.1)
  • Loading branch information
yochannah committed Jan 18, 2019
2 parents b4874e5 + 868012b commit e248d19
Show file tree
Hide file tree
Showing 38 changed files with 2,485 additions and 1,182 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -10,7 +10,7 @@ Please note that development is very early on and the project is not ready to us

## DEPLOYMENT

Try it out with the Heroku deployment (may be outdated!): [http://im-browser-prototype.herokuapp.com/](http://im-browser-prototype.herokuapp.com/)
Try it out with the Heroku deployment (automatic deployment, may have some delay): [http://im-browser-prototype.herokuapp.com/](http://im-browser-prototype.herokuapp.com/)

## DEPENDENCIES

Expand Down
18 changes: 9 additions & 9 deletions package.json
@@ -1,7 +1,7 @@
{
"title": "InterMine Data Brpwser",
"name": "intermine-data-browser",
"version": "0.0.4",
"version": "1.0.8",
"description": "A web-based data browser for InterMine",
"homepage": "https://github.com/AdrianBZG/InterMine-Data-Browser-Tool",
"bugs": {
Expand All @@ -23,7 +23,7 @@
"url": "https://github.com/AdrianBZG/InterMine-Data-Browser-Tool"
},
"dependencies": {
"bootstrap": "4.0.0",
"bootstrap": "4.1.2",
"browser-sync": "2.23.6",
"chart.js": "2.7.1",
"cookie-parser": "~1.4.3",
Expand All @@ -43,12 +43,7 @@
"jquery.easing": "^1.4.1",
"jsdom": "^11.11.0",
"morgan": "~1.9.0",
"pug": "2.0.0-beta11"
},
"devDependencies": {
"browser-sync": "2.23.6",
"chai": "^4.1.2",
"chai-http": "^4.0.0",
"pug": "2.0.0-beta11",
"gulp": "^3.9.1",
"gulp-clean-css": "3.9.2",
"gulp-header": "2.0.1",
Expand All @@ -57,7 +52,12 @@
"gulp-rename": "^1.2.2",
"gulp-sass": "^3.1.0",
"gulp-uglify": "3.0.0",
"imjs": "^3.15.1",
"imjs": "^3.15.1"
},
"devDependencies": {
"browser-sync": "2.23.6",
"chai": "^4.1.2",
"chai-http": "^4.0.0",
"mocha": "^5.2.0"
}
}
2 changes: 1 addition & 1 deletion public/javascripts/common.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/javascripts/genes-view.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions public/javascripts/main-view.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public/javascripts/proteins-view.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions public/javascripts/request-handler.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions public/javascripts/request_handler.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e248d19

Please sign in to comment.