 nieguanghui
|
ad469d4e7d
|
Merge branch 'welcome' of 10.0.47.245:/home/trustie2 into welcome
|
2013-11-28 09:49:50 +08:00 |
|
nieguanghui
|
6e704872be
|
1
|
2013-11-28 09:49:20 +08:00 |
|
nieguanghui
|
fb9e9aa8ee
|
修改显示
|
2013-11-28 09:48:26 +08:00 |
|
nieguanghui
|
af0268d995
|
修改显示
|
2013-11-28 09:46:16 +08:00 |
xianbo
|
47a7bcaa31
|
add every user_agent infomation to production.log
|
2013-11-28 09:39:48 +08:00 |
yanxd
|
579e78df9b
|
讨论区回复最多的主题帖
|
2013-11-28 09:34:51 +08:00 |
|
yanxd
|
6a97cb69a8
|
welcome activity.
|
2013-11-28 09:29:59 +08:00 |
 huangjingquan
|
d955480184
|
tab讨论区显示
|
2013-11-28 08:57:42 +08:00 |
|
nieguanghui
|
eb2bf5b879
|
增加方法
|
2013-11-28 08:39:58 +08:00 |
|
nieguanghui
|
1f83ca612b
|
显示部分数据
|
2013-11-28 08:34:20 +08:00 |
|
huangjingquan
|
6dc692bb6a
|
修改了主页、论坛显示
|
2013-11-27 16:40:47 +08:00 |
|
nieguanghui
|
f0b17a1a10
|
主页界面设计
|
2013-11-27 15:37:43 +08:00 |
|
yanxd
|
16c218ccae
|
隐藏搜索栏 and something...
|
2013-11-27 14:52:36 +08:00 |
|
yanxd
|
7fe8d46bfc
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-27 10:35:04 +08:00 |
|
yanxd
|
348946c363
|
fix img overflow bug.
|
2013-11-27 10:34:41 +08:00 |
|
huangjingquan
|
860c46e1c7
|
修改了字体大小
|
2013-11-27 10:31:12 +08:00 |
|
yanxd
|
5d02d0adc1
|
封装memo
|
2013-11-27 10:16:35 +08:00 |
|
yanxd
|
3dfc917c87
|
en.yml
|
2013-11-27 08:17:09 +08:00 |
|
huangjingquan
|
3165e7c7c3
|
添加了讨论区menu
|
2013-11-26 20:46:51 +08:00 |
|
yanxd
|
617f31de39
|
show img bug
|
2013-11-26 20:33:15 +08:00 |
|
yanxd
|
ae8e81fd46
|
zh.yml
|
2013-11-26 20:14:06 +08:00 |
|
yanxd
|
cdbc26e8df
|
Merge branch 'forum' into develop
|
2013-11-26 17:32:28 +08:00 |
|
yanxd
|
f0b6c33217
|
修改一些删除权限问题
|
2013-11-26 16:55:46 +08:00 |
|
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 |
|
huangjingquan
|
dc00216603
|
修改了谈论区框架、列表等
|
2013-11-25 21:42:59 +08:00 |
|
huangjingquan
|
19f183cb2b
|
讨论区message样式
|
2013-11-25 15:07:34 +08:00 |
|
yanxd
|
24a12115b0
|
Merge branch 'forum' of 10.0.47.245:/home/trustie2 into forum
|
2013-11-25 15:06:18 +08:00 |
|
yanxd
|
8218fde509
|
memo controller.
|
2013-11-25 15:05:42 +08:00 |
 fanqiang
|
cb494f460a
|
Merge branch 'forum' of 10.0.47.245:/home/trustie2 into forum
|
2013-11-24 20:46:17 +08:00 |
|
fanqiang
|
4f00b12016
|
添加了论坛加tag功能
|
2013-11-24 20:45:04 +08:00 |
|
yanxd
|
0a88d16a7d
|
one more chance.
|
2013-11-24 20:11:55 +08:00 |
|
yanxd
|
bc76ed2f4b
|
Merge remote-tracking branch 'origin/forum' into forum
|
2013-11-24 20:09:39 +08:00 |
|
yanxd
|
54c6ed72c1
|
memos
|
2013-11-24 20:09:24 +08:00 |
|
fanqiang
|
d882dde164
|
one more time
|
2013-11-24 20:03:19 +08:00 |
|
fanqiang
|
d77fed5d34
|
不好说啊，赶紧结束吧~~~~~~~~~~~~~
|
2013-11-24 20:02:53 +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 |
|
yanxd
|
69d3ab5bef
|
add memo controller
|
2013-11-23 10:47:28 +08:00 |
xianbo
|
cc12a461a8
|
modify default setting
|
2013-11-23 09:43:21 +08:00 |
|
fanqiang
|
c50c77a7ca
|
frame
|
2013-11-23 08:20:03 +08:00 |
|
yanxd
|
48650a2a91
|
init forum. again.
|
2013-11-22 21:55:21 +08:00 |
|
yanxd
|
c03f17e3b4
|
Revert "小改怡情，大改伤身，强改灰飞烟灭"
This reverts commit 4a4d1159f8.
|
2013-11-22 20:03:56 +08:00 |
|
xianbo
|
9e6414e810
|
add the show about student number
|
2013-11-22 17:21:27 +08:00 |
|
yanxd
|
f5b61a8db0
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-22 14:34:48 +08:00 |
|
yanxd
|
ae1fe0027a
|
optimization project helper.
|
2013-11-22 14:34:05 +08:00 |