Skip to content
This repository has been archived by the owner on Apr 5, 2018. It is now read-only.

Commit

Permalink
Merge pull request #38 from ga4gh/feature/fixes_for_release
Browse files Browse the repository at this point in the history
Feature/fixes for release
  • Loading branch information
Andrew Duncan committed Mar 1, 2016
2 parents 7c01260 + 0188220 commit 8780585
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
4 changes: 3 additions & 1 deletion app/scripts/controllers/containerfileviewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ angular.module('dockstore.ui')
});
var tags = [];
for (var i = 0; i < sortedTagObjs.length; i++) {
tags.push(sortedTagObjs[i].name);
if (!sortedTagObjs[i].hidden) {
tags.push(sortedTagObjs[i].name);
}
}
return tags;
};
Expand Down
6 changes: 3 additions & 3 deletions app/scripts/services/webservice.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ angular.module('dockstore.ui')
GITHUB_CLIENT_ID: 'a70739297a7d67f915de',
GITHUB_REDIRECT_URI: 'http://localhost:9000/login',
GITHUB_SCOPE: 'read:org',

QUAYIO_AUTH_URL: 'https://quay.io/oauth/authorize',
QUAYIO_CLIENT_ID: 'RWCBI3Y6QUNXDPYKNLMC',
QUAYIO_REDIRECT_URI: 'http://localhost:9000/auth/quay.io',
Expand All @@ -31,6 +31,6 @@ angular.module('dockstore.ui')
BITBUCKET_AUTH_URL: 'https://bitbucket.org/site/oauth2/authorize',
BITBUCKET_CLIENT_ID: 'K9VxydpaXKCgxxVpbx',

DSCLI_RELEASE_URL: 'https://github.com/CancerCollaboratory/dockstore/' +
'releases/download/0.2.1/dockstore'
DSCLI_RELEASE_URL: 'https://github.com/ga4gh/dockstore/' +
'releases/download/0.3-alpha.0/dockstore'
});

0 comments on commit 8780585

Please sign in to comment.