Merge branch 'stage' of github.com:whitef0x0/tellform into stage
This commit is contained in:
commit
5ad79e621f
|
@ -36,7 +36,8 @@
|
||||||
"js-yaml": "^3.6.1",
|
"js-yaml": "^3.6.1",
|
||||||
"angular-ui-select": "whitef0x0/ui-select#compiled",
|
"angular-ui-select": "whitef0x0/ui-select#compiled",
|
||||||
"angular-translate": "~2.11.0",
|
"angular-translate": "~2.11.0",
|
||||||
"ng-device-detector": "^3.0.1"
|
"ng-device-detector": "^3.0.1",
|
||||||
|
"ng-translate": "*"
|
||||||
},
|
},
|
||||||
"resolutions": {
|
"resolutions": {
|
||||||
"angular-bootstrap": "^0.14.0",
|
"angular-bootstrap": "^0.14.0",
|
||||||
|
|
2
config/env/production.js
vendored
2
config/env/production.js
vendored
|
@ -3,7 +3,7 @@
|
||||||
module.exports = {
|
module.exports = {
|
||||||
baseUrl: process.env.BASE_URL || 'tellform.com',
|
baseUrl: process.env.BASE_URL || 'tellform.com',
|
||||||
db: {
|
db: {
|
||||||
uri: process.env.MONGOHQ_URL || process.env.MONGOLAB_URI || 'mongodb://' + (process.env.DB_1_PORT_27017_TCP_ADDR || '192.168.99.100:27017') + '/mean',
|
uri: process.env.MONGOHQ_URL || process.env.MONGOLAB_URI || 'mongodb://' + (process.env.DB_1_PORT_27017_TCP_ADDR || 'localhost') + '/mean',
|
||||||
options: {
|
options: {
|
||||||
user: '',
|
user: '',
|
||||||
pass: process.env.MONGOLAB_PASS || ''
|
pass: process.env.MONGOLAB_PASS || ''
|
||||||
|
|
791
public/dist/application.js
vendored
791
public/dist/application.js
vendored
File diff suppressed because one or more lines are too long
2
public/dist/application.min.css
vendored
2
public/dist/application.min.css
vendored
File diff suppressed because one or more lines are too long
9
public/dist/application.min.js
vendored
9
public/dist/application.min.js
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue