Commits · c70ddf7071e709585700407cd64bde478dcdcb5a · VeNtura / rendezvous

20 Apr, 2014 5 commits
- Merge branch 'wip/130416_wysiwyg' into 140420/update_tag_page · c70ddf70
```
Conflicts:
	Gemfile.lock
```
  tady committed Apr 20, 2014
  c70ddf70 Browse Files
- Merge commit '515e6d57 ' into 140420/update_tag_page · c889b5a7
  tady committed Apr 20, 2014
  
  c889b5a7 Browse Files
- devise routing 修正 · dbb3c8b8
  tady committed Apr 20, 2014
  
  dbb3c8b8 Browse Files
- Merge commit 'ea703555' into wip/130416_wysiwyg · 5a4f1f2e
```
Conflicts:
	Gemfile.lock
	app/assets/javascripts/lib/mod-md-editor.js.coffee
	app/controllers/posts_controller.rb
	app/views/posts/_form.html.slim
```
  tady committed Apr 20, 2014
  5a4f1f2e Browse Files
- update gemfile · 21bec5f0
  tady committed Apr 20, 2014
  
  21bec5f0 Browse Files
18 Apr, 2014 1 commit
- Merge pull request #76 from tadyjp/feature/fix_readme · ea703555
```
Google APIの設定説明を修正
```
  tady committed Apr 18, 2014
  ea703555 Browse Files
08 Apr, 2014 1 commit
- テスト · 515e6d57
  tady committed Apr 08, 2014
  
  515e6d57 Browse Files
04 Apr, 2014 1 commit
- Google APIの設定説明を修正 · c1a07279
  kiiita committed Apr 04, 2014
  
  c1a07279 Browse Files
02 Apr, 2014 1 commit
- spacified_dateを一覧に表示 · 46338a4a
  tady committed Apr 02, 2014
  
  46338a4a Browse Files
01 Apr, 2014 4 commits
- Merge pull request #74 from tadyjp/wip/140401_fix_devise · 3dc9d1f6
```
Devideのエラー修正2
```
  tady committed Apr 01, 2014
  3dc9d1f6 Browse Files
- set default nickname · bd6ebbab
  tady committed Apr 01, 2014
  
  bd6ebbab Browse Files
- Merge pull request #73 from tadyjp/wip/140401_fix_devise · f4e2847e
```
[WIP] deviseのroutingエラー修正
```
  tady committed Apr 01, 2014
  f4e2847e Browse Files
- fix device routing · 36905501
  tady committed Apr 01, 2014
  
  36905501 Browse Files
28 Mar, 2014 4 commits
- Merge pull request #72 from tadyjp/wip/140328_post_date · 5480173c
```
postに日付追加
```
  tady committed Mar 28, 2014
  5480173c Browse Files
- postに日付追加 · 094a33b1
  tady committed Mar 28, 2014
  
  094a33b1 Browse Files
- Merge pull request #69 from tadyjp/wip/140320_user_page · 80f1d343
```
[WIP] ユーザー管理画面
```
  tady committed Mar 28, 2014
  80f1d343 Browse Files
- mypage · 1d537e20
  tady committed Mar 28, 2014
  
  1d537e20 Browse Files
20 Mar, 2014 3 commits
- text complete機能 · 280d2049
  tady committed Mar 20, 2014
  
  280d2049 Browse Files
- validations · e409130f
  tady committed Mar 20, 2014
  
  e409130f Browse Files
- ユーザー管理画面 · 8d3bed34
  tady committed Mar 20, 2014
  
  8d3bed34 Browse Files
19 Mar, 2014 6 commits
- Merge branch 'wip/140318_draft' · 86f64a99
  tady committed Mar 19, 2014
  
  86f64a99 Browse Files
- set newrelic yml · 4b7aece5
  tady committed Mar 19, 2014
  
  4b7aece5 Browse Files
- Merge pull request #68 from tadyjp/wip/140318_draft · a0040ac1
```
SQL ambiguous error.
```
  tady committed Mar 19, 2014
  a0040ac1 Browse Files
- SQL ambiguous error. · a16a613a
  tady committed Mar 19, 2014
  
  a16a613a Browse Files
- Merge pull request #67 from tadyjp/wip/140318_draft · 87add773
```
[WIP] 下書き保存機能
```
  tady committed Mar 19, 2014
  87add773 Browse Files
- 下書き機能 test通過 · afe9a937
  tady committed Mar 19, 2014
  
  afe9a937 Browse Files
18 Mar, 2014 1 commit
- 下書き保存機能 · b930d512
  tady committed Mar 18, 2014
  
  b930d512 Browse Files
16 Mar, 2014 3 commits
- teaspoon with coffeescript · 89ea2d01
  tady committed Mar 17, 2014
  
  89ea2d01 Browse Files
- js test on travis: teaspoon · b5c44df1
  tady committed Mar 16, 2014
  
  b5c44df1 Browse Files
- wysiwyg editor · 19f67ab8
  tady committed Mar 16, 2014
  
  19f67ab8 Browse Files
14 Mar, 2014 1 commit
- Merge pull request #64 from tadyjp/wip/130413_calendar · 3f0451f8
```
fullcalendar.js tag page
```
  tady committed Mar 14, 2014
  3f0451f8 Browse Files
13 Mar, 2014 6 commits
- fullcalendar.js tag page · 55d27387
  tady committed Mar 14, 2014
  
  55d27387 Browse Files
- Merge pull request #57 from tadyjp/wip/130410_flow_view · 61c45fc3
```
[WIP] create controller flow, stock
```
  tady committed Mar 13, 2014
  61c45fc3 Browse Files
- welcome controller, header nag style · 1de4d68a
  tady committed Mar 13, 2014
  
  1de4d68a Browse Files
- stock controller · c2bc335f
  tady committed Mar 13, 2014
  
  c2bc335f Browse Files
- spec devise macros · 2d068d29
  tady committed Mar 13, 2014
  
  2d068d29 Browse Files
- search page · 083a28fd
  tady committed Mar 13, 2014
  
  083a28fd Browse Files
12 Mar, 2014 2 commits
- flow view · 935b356a
  tady committed Mar 13, 2014
  
  935b356a Browse Files
- flow view large-view · 61e8e6be
  tady committed Mar 12, 2014
  
  61e8e6be Browse Files
11 Mar, 2014 1 commit
- flow view · fc172c54
  tady committed Mar 12, 2014
  
  fc172c54 Browse Files