Merge pull request #58 from DreamHackers/develop

0.1.0リリース分
DreamHackers · Nov 26, 2015 · 36a3d3c · 36a3d3c
2 parents 17a048b + a457b94
commit 36a3d3c
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 191 deletions.
diff --git a/README.md b/README.md
@@ -1,13 +1,18 @@
 
 
+# forex-future-forecast
+
+![logo](public/images/logo.png)
+
+必勝！FX未来予想チャート徹底比較についてのリポジトリです。
+
 # Summary
-[![Circle CI](https://circleci.com/gh/DreamHackers/fx-future-forecast/tree/master.svg?style=svg)](https://circleci.com/gh/DreamHackers/fx-future-forecast/tree/master)
+
+[![Circle CI](https://circleci.com/gh/DreamHackers/forex-future-forecast/tree/master.svg?style=svg)](https://circleci.com/gh/DreamHackers/fx-future-forecast/tree/master)
 [![Join the chat at https://gitter.im/DreamHackers/fx-future-forecast](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/DreamHackers/fx-future-forecast?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 https://pollseed.gitbooks.io/fx-future-forecast-doc/content/index.html
 
-# fx-future-forecast
-必勝！FX未来予想チャート徹底比較についてのリポジトリです
 
 # Develop
 
@@ -18,13 +23,14 @@ https://pollseed.gitbooks.io/fx-future-forecast-doc/content/index.html
 
 ## 初期設定・インストール
 ```.sh
-git clone [email protected]:DreamHackers/fx-future-forecast.git
-cd fx-future-forecast
+git clone [email protected]:DreamHackers/forex-future-forecast.git
+cd forex-future-forecast
+git checkout develop
 ./setup.sh
 ```
 
 ## mongo セッティング
-https://github.com/DreamHackers/fx-future-forecast/wiki/mongodb%E7%96%8E%E9%80%9A
+https://github.com/DreamHackers/forex-future-forecast/wiki/mongodb%E7%96%8E%E9%80%9A
 
 ## 起動 & 開発
 ```.sh
@@ -42,4 +48,6 @@ pm2 start bin/www --watch
 ```
 [こちら](http://localhost:3000/)にアクセスしてください
 
-```
+## [wiki](https://github.com/DreamHackers/forex-future-forecast/wiki)
+* [gitフロー && リリース](https://github.com/DreamHackers/forex-future-forecast/wiki/git-%E3%83%95%E3%83%AD%E3%83%BC-&&-%E3%83%AA%E3%83%AA%E3%83%BC%E3%82%B9)
+* [version管理](https://github.com/DreamHackers/forex-future-forecast/wiki/version%E7%AE%A1%E7%90%86%E3%81%AB%E3%81%A4%E3%81%84%E3%81%A6)
diff --git a/README.md.bak b/README.md.bak
diff --git a/app.js b/app.js
@@ -14,7 +14,7 @@ var users = require('./routes/users');
 var app = express();
 app.use(helmet());
 app.use(helmet.noCache());
-app.use(basicAuth('dream', 'hackers'));
+app.use(basicAuth(process.env.BASIC_AUTH_ID, process.env.BASIC_AUTH_PASSWORD));
 
 var mongoose = require('mongoose');
 var uristring = process.env.MONGOLAB_URI || 'mongodb://localhost/fx-dev';

diff --git a/app.js.bak b/app.js.bak
diff --git a/model.bak/sample.js b/model.bak/sample.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "forex-future-forecast",
-  "version": "0.0.0",
+  "version": "0.1.0",
   "private": true,
   "scripts": {
     "start": "node ./bin/www"

diff --git a/package.json.bak b/package.json.bak
diff --git a/public.bak/js/app.jsx b/public.bak/js/app.jsx
diff --git a/public.bak/js/client.js b/public.bak/js/client.js
diff --git a/public.bak/js/helloworld.jsx b/public.bak/js/helloworld.jsx
diff --git a/public.bak/js/main.js b/public.bak/js/main.js