yanxd
|
b06abd0b83
|
Merge remote-tracking branch 'origin/forum' into forum
Conflicts:
app/views/memos/show.html.erb
|
2013-11-26 16:37:30 +08:00 |
|
yanxd
|
16c0bc3ac3
|
memo edit/destory.
|
2013-11-26 16:32:08 +08:00 |
 huangjingquan
|
10ce6a87c2
|
修改了一些新建、编辑权限
|
2013-11-26 16:27:56 +08:00 |
|
yanxd
|
0a88d16a7d
|
one more chance.
|
2013-11-24 20:11:55 +08:00 |
|
yanxd
|
54c6ed72c1
|
memos
|
2013-11-24 20:09:24 +08:00 |
|
yanxd
|
c6f4dbbafa
|
10%
|
2013-11-23 21:13:59 +08:00 |
 fanqiang
|
6e1913d00d
|
修改新建topic界面
|
2013-11-23 20:56:22 +08:00 |
|
fanqiang
|
17cb97828d
|
修改forum的show界面
|
2013-11-23 20:31:48 +08:00 |
|
fanqiang
|
a4d4dd5d97
|
haha
|
2013-11-23 20:04:26 +08:00 |
|
yanxd
|
4a51f08009
|
memos unfinish.
|
2013-11-23 20:02:15 +08:00 |
|
fanqiang
|
c50c77a7ca
|
frame
|
2013-11-23 08:20:03 +08:00 |