change to postgres
devise secret key
modifying .gitignore
Merge branch 'master' of https://github.com/alaashafaee/Coolsoft-14
Merge branch 'master' of https://github.com/alaashafaee/Coolsoft-14
fix server compile error
fix some css
add .env to .gitignore
return application.css
move jquery to vendor
split editor js to use require
add jquery-ui css images
add elasticSearch in foreman start
add Procfile to gitignore
remove Procfile to gitignore
add makefile
add Makefile
change environment settings for mailer and adding host
Merge branch 'master' of https://github.com/alaashafaee/Coolsoft-14 into dev_database