diff --git a/.travis.yml b/.travis.yml index 4713501b..4290ba94 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,14 +9,14 @@ services: script: - docker build --build-arg VCS_REF=`git rev-parse --short HEAD` --build-arg BUILD_DATE=`date -u +”%Y-%m-%dT%H:%M:%SZ”` -t scoreucsc/bassa-prod-ui ui - - docker build -f Dockerfile.dev --build-arg VCS_REF=`git rev-parse --short HEAD` --build-arg BUILD_DATE=`date -u +”%Y-%m-%dT%H:%M:%SZ”` -t scoreucsc/bassa-dev-ui ui - - docker build -f Dockerfile.prod --build-arg VCS_REF=`git rev-parse --short HEAD` --build-arg BUILD_DATE=`date -u +”%Y-%m-%dT%H:%M:%SZ”` -t scoreucsc/bassa-prod-server components/core + - docker build -f ui/Dockerfile.dev --build-arg VCS_REF=`git rev-parse --short HEAD` --build-arg BUILD_DATE=`date -u +”%Y-%m-%dT%H:%M:%SZ”` -t scoreucsc/bassa-dev-ui ui + - docker build -f components/core/Dockerfile.prod --build-arg VCS_REF=`git rev-parse --short HEAD` --build-arg BUILD_DATE=`date -u +”%Y-%m-%dT%H:%M:%SZ”` -t scoreucsc/bassa-prod-server components/core - docker build --build-arg VCS_REF=`git rev-parse --short HEAD` --build-arg BUILD_DATE=`date -u +”%Y-%m-%dT%H:%M:%SZ”` -t scoreucsc/bassa-dev-server components/core - docker build --build-arg VCS_REF=`git rev-parse --short HEAD` --build-arg BUILD_DATE=`date -u +”%Y-%m-%dT%H:%M:%SZ”` -t scoreucsc/bassa-aria2c components/aria2c after_success: - - if [ "$TRAVIS_BRANCH" == "master" -a "$TRAVIS_PULL_REQUEST" == "false" ]; then + - if [ "$TRAVIS_BRANCH" == "develop" -a "$TRAVIS_PULL_REQUEST" == "true" ]; then docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"; docker push scoreucsc/bassa-prod-ui; docker push scoreucsc/bassa-dev-ui; diff --git a/ui/src/app/completed/services/tableService.js b/ui/src/app/completed/services/tableService.js index 4b4d003c..72e6e0ab 100755 --- a/ui/src/app/completed/services/tableService.js +++ b/ui/src/app/completed/services/tableService.js @@ -17,9 +17,6 @@ method: 'POST', url: BassaUrl + '/api/compress', data: { 'gid': gids }, - headers: { - 'token': window.localStorage.getItem("Token") - } }) }; var compressionProgress = function (progressId) { diff --git a/ui/src/app/signup/controllers/SignupCtrl.js b/ui/src/app/signup/controllers/SignupCtrl.js index 4bd067c2..ce466ad6 100755 --- a/ui/src/app/signup/controllers/SignupCtrl.js +++ b/ui/src/app/signup/controllers/SignupCtrl.js @@ -46,6 +46,6 @@ ToastService.showToast('Please ensure entered details are correct'); } }; - }; + } -})(); \ No newline at end of file +})();