Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Commit 279f16a

Browse files
author
Parth Shah
committed
Merge branch 'hotfix/filestack-config-fix' into dev
2 parents 15ddf89 + ed6b7a7 commit 279f16a

File tree

5 files changed

+3
-3
lines changed

5 files changed

+3
-3
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ styleguide
1212
.project
1313
.awspublish-app.topcoder-dev.com
1414
npm-debug.log
15+
*.swp

app/directives/tc-fp-file-input/tc-fp-file-input.directive.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ import _ from 'lodash'
5555

5656
// set default services
5757
scope.fpServices = scope.fpServices || 'COMPUTER,GOOGLE_DRIVE,BOX,DROPBOX'
58-
scope.fpContainer = CONSTANTS.FILE_PICKER_SUBMISSION_CONTAINER_NAME || 'submission-staging-dev'
58+
scope.fpContainer = CONSTANTS.FILE_PICKER_SUBMISSION_CONTAINER_NAME
5959

6060
// set max size
6161
scope.maxSize = 500 * 1024 * 1024

assets/css/directives/badge-tooltip.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
float: left;
2121
}
2222

23-
2423
.subBadge {
2524
height: 48px;
2625
float: left;

assets/images/badge.grid.large.png

552 Bytes
Loading

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"devDependencies": {
1111
"angular-mocks": "^1.4.9",
12-
"appirio-tech-webpack-config": "^0.3.6",
12+
"appirio-tech-webpack-config": "^0.3.8",
1313
"babel-polyfill": "^6.7.2",
1414
"bardjs": "^0.1.8",
1515
"bower": "^1.6.8",

0 commit comments

Comments
 (0)