 sw
|
740f6a19ec
|
项目名称唯一
|
2014-07-03 15:50:36 +08:00 |
 nwb
|
8d22ccd23a
|
修改BUG
|
2014-07-03 15:45:50 +08:00 |
|
sw
|
5abee0a06c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-03 15:41:15 +08:00 |
|
nwb
|
b928eb6ed8
|
修改课程首页“更多”链接错误
|
2014-07-03 15:30:52 +08:00 |
|
nwb
|
2a6cbe28f0
|
修正课程首页错误
|
2014-07-03 15:24:06 +08:00 |
|
sw
|
3c7e680b1b
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-07-03 10:33:35 +08:00 |
|
nwb
|
2d9e0d507e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-03 10:12:46 +08:00 |
|
nwb
|
31e338f1e5
|
修正http://127.0.0.1:3000/?course.trustie.net链接跳转问题
|
2014-07-03 10:12:30 +08:00 |
|
sw
|
967c377191
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-03 10:09:25 +08:00 |
 z9hang
|
050a780b50
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-02 17:07:10 +08:00 |
|
z9hang
|
6f5d6c382b
|
给用户留言的回复若为查看计入新留言数
|
2014-07-02 17:06:34 +08:00 |
|
nwb
|
70dc5e2b49
|
去除主版本库标识允许为空的设置
|
2014-07-02 15:10:33 +08:00 |
|
nwb
|
898ecb443a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-02 14:59:02 +08:00 |
|
nwb
|
e8705bccb1
|
修改文件上传界面样式
|
2014-07-02 14:58:52 +08:00 |
|
z9hang
|
fe3861c1d7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-02 11:33:00 +08:00 |
|
z9hang
|
54a2fb8a9c
|
主页项目得分与项目页面的项目得分保持一致
|
2014-07-02 11:32:49 +08:00 |
|
nwb
|
fb0597ab4a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-02 09:11:56 +08:00 |
|
nwb
|
2b855badf9
|
修正课程资源库关联已有资源功能
|
2014-07-02 09:11:45 +08:00 |
yanxd
|
e1d9d6ab45
|
tag查询崩溃
|
2014-07-01 18:20:30 +08:00 |
|
xianbo
|
830e2d4fb4
|
隐藏 站长统计
|
2014-07-01 18:18:25 +08:00 |
|
sw
|
063460f119
|
tt
|
2014-07-01 17:49:12 +08:00 |
|
z9hang
|
cc2862ae0f
|
修正缺陷不能踩自己提示错误
|
2014-07-01 17:21:16 +08:00 |
|
z9hang
|
8b0f155be7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-01 17:13:08 +08:00 |
|
z9hang
|
d34ab220cc
|
登录名区分大小写
|
2014-07-01 17:12:48 +08:00 |
|
nwb
|
138211efba
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-01 16:56:33 +08:00 |
|
nwb
|
e94ed86ead
|
部分BUG修正
|
2014-07-01 16:56:23 +08:00 |
|
z9hang
|
37acecae61
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-01 16:33:26 +08:00 |
|
z9hang
|
2e38f66899
|
搜索用户修改为按昵称搜索
|
2014-07-01 16:31:40 +08:00 |
|
nwb
|
cf00942261
|
更新迁移文件
|
2014-07-01 16:19:42 +08:00 |
|
nwb
|
7881a3f20f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-01 15:29:44 +08:00 |
|
nwb
|
993ac23a36
|
课程各数据迁移时不再做验证，以兼容老数据
|
2014-07-01 15:29:16 +08:00 |
|
z9hang
|
a7fa444f9e
|
修正项目个人得分问题：统计时只计算项目成员，user_grade表user_id和project_id联合不重复验证，user_grade分数部位负验证
|
2014-07-01 15:19:08 +08:00 |
|
sw
|
4470f0dd73
|
添加作业时增加教师评分所占比例设置
|
2014-07-01 11:53:55 +08:00 |
|
z9hang
|
0f9c098df9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-01 10:31:54 +08:00 |
|
z9hang
|
0bcc0beaf1
|
修复留言计分
|
2014-07-01 10:31:44 +08:00 |
|
sw
|
12b6525cc6
|
t
|
2014-07-01 10:29:37 +08:00 |
|
sw
|
bb86ef4612
|
修复获取作业列表时课程老师参数获取不正确的问题
|
2014-07-01 09:23:49 +08:00 |
|
sw
|
bc434a82a4
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
db/schema.rb
|
2014-07-01 09:23:16 +08:00 |
|
z9hang
|
33c883146a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-01 09:16:17 +08:00 |
|
z9hang
|
4906bad7d2
|
修正进项目报错异常
|
2014-07-01 09:15:53 +08:00 |
|
sw
|
98d2c144ae
|
修改时间排序为升序排序
|
2014-06-30 17:52:01 +08:00 |
|
nwb
|
671eaa8d45
|
测试
|
2014-06-30 17:49:55 +08:00 |
|
sw
|
d03718e30f
|
修复新评分规则下按分数排序不正确的问题
|
2014-06-30 17:44:29 +08:00 |
|
nwb
|
6141cc56e6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-30 17:26:25 +08:00 |
|
nwb
|
e863c30352
|
部分BUG修正
|
2014-06-30 17:26:11 +08:00 |
|
z9hang
|
9a8c5ebecc
|
个人得分规则显示
留言回复未加分bug修改
|
2014-06-30 16:19:28 +08:00 |
|
sw
|
f6d9bfc91d
|
修改新建作业时传递参数
|
2014-06-30 11:15:52 +08:00 |
|
sw
|
be2faea15b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/bids_controller.rb
app/views/courses/new_homework.html.erb
|
2014-06-30 11:15:25 +08:00 |
|
nwb
|
25a3114a5a
|
老师的学生列表显示为真实姓名
|
2014-06-27 16:44:53 +08:00 |
|
nwb
|
917288c84c
|
修正课程讨论区、课程通知等创建时BUG修正
|
2014-06-27 15:58:41 +08:00 |