beenull/tellform
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'stage' of github.com:whitef0x0/tellform into stage

Browse source
This commit is contained in:
David Baldwynn 2016-06-18 14:03:38 -07:00
parent 2f5dd4283e c5607c7c61
commit 5ad79e621f
5 changed files with 664 additions and 143 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bower.json
View file

@ -36,7 +36,8 @@
"js-yaml": "^3.6.1",
"angular-ui-select": "whitef0x0/ui-select#compiled",
"angular-translate": "~2.11.0",
"ng-device-detector": "^3.0.1"
"ng-device-detector": "^3.0.1",
"ng-translate": "*"
},
"resolutions": {
"angular-bootstrap": "^0.14.0",

2
config/env/production.js vendored
View file

@ -3,7 +3,7 @@
module.exports = {
baseUrl: process.env.BASE_URL || 'tellform.com',
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: {
user: '',
pass: process.env.MONGOLAB_PASS || ''

791
public/dist/application.js vendored
View file

File diff suppressed because one or more lines are too long

2
public/dist/application.min.css vendored
View file

File diff suppressed because one or more lines are too long

9
public/dist/application.min.js vendored
View file

File diff suppressed because one or more lines are too long