 nwb
|
0f340a7cda
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-21 11:04:36 +08:00 |
|
nwb
|
624a7f7bdd
|
还原资源文件管理的tag显示为一行
|
2014-05-21 11:03:16 +08:00 |
 yanxd
|
0ab17f1e90
|
contest image show
|
2014-05-21 09:46:40 +08:00 |
 z9hang
|
45339e53d8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-20 18:07:25 +08:00 |
|
yanxd
|
c4bd9aaabd
|
Merge branch 'szzh' into develop
|
2014-05-20 15:56:51 +08:00 |
|
yanxd
|
4aed14228a
|
project/course/ members remove link
|
2014-05-20 15:53:23 +08:00 |
|
yanxd
|
85c77ca074
|
xss, ckeditor js bug.
|
2014-05-20 15:48:02 +08:00 |
|
yanxd
|
dac992548a
|
course_form
|
2014-05-20 15:47:48 +08:00 |
|
nwb
|
0b4c95711a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-20 15:06:18 +08:00 |
|
nwb
|
4156983494
|
缺陷添加缩略图显示
|
2014-05-20 15:05:54 +08:00 |
|
yanxd
|
7189d9a14a
|
course_form
|
2014-05-20 14:52:30 +08:00 |
|
yanxd
|
d47facc9e8
|
Merge branch 'szzh' into develop
Conflicts:
app/views/contests/show_attendingcontest.html.erb
db/schema.rb
|
2014-05-20 14:33:50 +08:00 |
|
yanxd
|
9ae8494c97
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-20 13:58:37 +08:00 |
|
z9hang
|
5b8b2045f1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-20 11:36:12 +08:00 |
|
z9hang
|
b3489d3e68
|
修改删除文件后跳转错误问题
|
2014-05-20 11:36:01 +08:00 |
|
nwb
|
097489e594
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-20 11:33:36 +08:00 |
|
nwb
|
4d21933e09
|
1.优化资源文件上传下载界面
2.教师的课程界面优化
|
2014-05-20 11:33:17 +08:00 |
|
yanxd
|
2aeb12616b
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-20 10:09:09 +08:00 |
|
yanxd
|
112b8de921
|
issues#575
|
2014-05-20 09:50:28 +08:00 |
|
yanxd
|
f9166a71a7
|
issues#555
|
2014-05-20 09:12:15 +08:00 |
 sw
|
c141501085
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-20 08:49:00 +08:00 |
|
sw
|
9a62fe22c6
|
修复作业留言模块先回复留言然后删除回复留言界面不会及时刷新的BUG
|
2014-05-20 08:48:42 +08:00 |
|
yanxd
|
9373666576
|
混淆课程数量
|
2014-05-19 17:56:50 +08:00 |
|
sw
|
b80c51475f
|
1.增加作业参与人员类homework_users及相关代码
2.homework_attach增加字段：name，description，state
|
2014-05-19 17:44:36 +08:00 |
|
sw
|
0de77bdc44
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-19 16:53:47 +08:00 |
|
sw
|
14a468066f
|
修复打开首页，SQL没有默认的school_id的问题
|
2014-05-19 16:53:38 +08:00 |
|
yanxd
|
a76620a741
|
welcome footer
判断成员列表的查看
|
2014-05-19 16:12:18 +08:00 |
|
z9hang
|
e78a309842
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-19 15:23:43 +08:00 |
|
z9hang
|
19d1682077
|
修改编辑作业提交文件处样式
|
2014-05-19 15:23:34 +08:00 |
|
z9hang
|
eaa9c94290
|
自己的用户界面也不现实邮箱
|
2014-05-19 12:00:13 +08:00 |
|
z9hang
|
2b12d31fb8
|
去除网站中的邮箱地址显示
|
2014-05-19 11:02:07 +08:00 |
|
sw
|
7ead12dba6
|
1.优化路由代码
2.修改当查询学校课程数数量少于8个时，推荐9-当前学校课程数量门最好的课程给用户，并且排除当前学校课程
|
2014-05-19 10:00:24 +08:00 |
|
z9hang
|
edf2a84072
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-17 16:20:59 +08:00 |
|
z9hang
|
2524600aeb
|
修正贴吧留言删除附件后跳转错误问题
|
2014-05-17 16:20:48 +08:00 |
|
sw
|
3fee4211a2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-17 15:39:28 +08:00 |
|
sw
|
6c9b9841b8
|
课程作业留言增加回复以及回复的评论删除功能
|
2014-05-17 15:39:18 +08:00 |
|
z9hang
|
ea095a6f61
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-17 15:17:09 +08:00 |
|
z9hang
|
fc1d5baf95
|
课程、竞赛、项目的主页的上下间距缩小
logo和大学名称的居中对齐，以及搜索条的上下居中。
|
2014-05-17 15:15:33 +08:00 |
|
nwb
|
5ca9d96acd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-17 14:39:00 +08:00 |
|
nwb
|
7df6be8ff4
|
调整资源文件界面
|
2014-05-17 14:07:57 +08:00 |
|
sw
|
8a6fa2166e
|
课程作业显示列表增加该作业平均评分
|
2014-05-17 13:49:27 +08:00 |
|
sw
|
4c6b514d03
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-17 11:15:40 +08:00 |
|
sw
|
f79679f05a
|
1.修改作业列表显示效果
2.增加作业互评功能
3.增加作业留言、留言删除功能以及相关操作后页面数据刷新
|
2014-05-17 11:15:27 +08:00 |
|
yanxd
|
63af60d7b6
|
edit 图标丢失
bid修改文件保存
|
2014-05-17 10:44:01 +08:00 |
|
z9hang
|
cb23b54d01
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-16 17:45:31 +08:00 |
|
z9hang
|
5d15349482
|
编辑作业时显示已添加的附件
|
2014-05-16 17:45:20 +08:00 |
|
nwb
|
7e4343f00f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-16 17:29:59 +08:00 |
t430
|
00b866f06a
|
Merge branch 'develop'
|
2014-05-16 17:28:30 +08:00 |
 wanglinchun
|
31ec9bc353
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
2014-05-16 17:06:38 +08:00 |
|
nwb
|
8f153520b4
|
调整上传资源界面
|
2014-05-16 16:29:01 +08:00 |