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 |
|
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 |
|
fanqiang
|
4a4d1159f8
|
小改怡情，大改伤身，强改灰飞烟灭
|
2013-11-22 11:19:08 +08:00 |
|
fanqiang
|
16f70437d1
|
forum init.
|
2013-11-22 10:24:15 +08:00 |
|
yanxd
|
5de8e1c2f2
|
new welcome index.
|
2013-11-22 08:19:40 +08:00 |
 huangjingquan
|
0f652b4955
|
首页显示样式
|
2013-11-21 17:27:14 +08:00 |
|
huangjingquan
|
b8db0f59d2
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-21 17:12:00 +08:00 |
|
yanxd
|
67bec27f34
|
.
|
2013-11-21 17:11:55 +08:00 |
|
yanxd
|
a6d0482804
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-21 14:46:01 +08:00 |
xianbo
|
6ae9f2bd5f
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-21 10:48:36 +08:00 |
|
xianbo
|
9f1c03ee10
|
fix edit about forum
|
2013-11-21 10:48:11 +08:00 |
 baiyu
|
c17148a151
|
给竞赛添加了“参与人”与“参与竞赛”的大号数字显示
|
2013-11-21 10:18:46 +08:00 |
|
fanqiang
|
6a0d362241
|
修改了以附件形式提交作业时，当作业为空时也能提交的BUG
修改了匿名用户提交作业的BUG
|
2013-11-21 09:44:54 +08:00 |
|
huangjingquan
|
45fad95d48
|
冲突处理
|
2013-11-21 09:41:30 +08:00 |
|
huangjingquan
|
9b044f8d13
|
修改了讨论区显示
|
2013-11-21 09:38:03 +08:00 |
|
yanxd
|
78b65f363f
|
move boards to tab_new, remove board from tool list on sidebar.
|
2013-11-21 08:59:58 +08:00 |
|
yanxd
|
0381179536
|
自动添加讨论区当项目课程创建的时候，学生是否能回复需要在全线报表里配置.
|
2013-11-20 17:02:47 +08:00 |
|
yanxd
|
9491781b45
|
.
|
2013-11-20 15:54:52 +08:00 |
|
yanxd
|
d7f0b42bb7
|
.
|
2013-11-20 15:26:26 +08:00 |
|
yanxd
|
8ec2d8342b
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-20 10:46:59 +08:00 |
|
yanxd
|
349020182a
|
.
|
2013-11-20 10:44:54 +08:00 |
|
huangjingquan
|
ec9e989361
|
修改了课程学号显示
|
2013-11-20 09:30:30 +08:00 |
|
baiyu
|
1a42cdd013
|
增加了课程与竞赛的人名超链接
|
2013-11-20 08:57:37 +08:00 |
|
baiyu
|
e8aa5633d8
|
修正了竞赛配置的问题
|
2013-11-19 16:08:55 +08:00 |
|
baiyu
|
9293ef53b9
|
修正了竞赛配置的问题
|
2013-11-19 16:05:52 +08:00 |
|
baiyu
|
6c9c849e7c
|
1、增加了竞赛的配置功能
2、增加了课程的成员学号显示
|
2013-11-19 15:15:54 +08:00 |
|
yanxd
|
356a48caa8
|
move constant to module, fixed some translate.
|
2013-11-18 08:48:38 +08:00 |
|
huangjingquan
|
16611d8eff
|
修改了管理员权限
|
2013-11-16 11:09:10 +08:00 |
|
baiyu
|
eb36cb40ce
|
竞赛参与者的人数统计
|
2013-11-16 10:51:22 +08:00 |
|
yanxd
|
2932f5a940
|
第一次db:migrate时创建admin的用户扩展表，防止第一次部署出错;为项目版本库diff增加过滤器。
|
2013-11-16 10:37:47 +08:00 |
|
yanxd
|
dd1f972edd
|
Revert "move courses mixed To projecthelper From applicantionHelper"
This reverts commit 42332201f2.
|
2013-11-15 16:10:09 +08:00 |
|
yanxd
|
42332201f2
|
move courses mixed To projecthelper From applicantionHelper
|
2013-11-15 15:48:48 +08:00 |
|
yanxd
|
c4bf9a8f72
|
refactor gender avatar html.erb => helper
|
2013-11-15 15:36:45 +08:00 |
|
yanxd
|
26d75af51a
|
fix homework uri error ,after joined xxx_show.html.erb.
|
2013-11-15 11:23:28 +08:00 |
|
yanxd
|
a9ec58f245
|
prepare fix admin/
new file: app/views/layouts/base_admin.html.erb
|
2013-11-15 10:55:11 +08:00 |
|
baiyu
|
e5baf0959b
|
1、竞赛里的参与者名字显示全称
2、个人主页里的“关注”与“粉丝”列表名字显示全称
3、区别了“关注”里个人参与的项目与课程
4、竞赛里的参与者的项目与课程数量的显示做出了区分
5、竞赛的参与者列表增加了学员学号
|
2013-11-15 10:25:07 +08:00 |
|
huangjingquan
|
48f34f25ae
|
修改了自己能看到自己下载的文件
|
2013-11-14 21:03:11 +08:00 |
|
xianbo
|
abea7add69
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-14 20:15:24 +08:00 |
|
xianbo
|
6279041361
|
fix links
|
2013-11-14 20:15:08 +08:00 |