 z9hang
|
5c93442c79
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-05 11:44:21 +08:00 |
|
z9hang
|
01da0852e3
|
新建贴吧错误提示修改
|
2014-07-05 11:44:05 +08:00 |
 sw
|
6365d01051
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-05 11:21:27 +08:00 |
|
sw
|
f1b8b7caed
|
t
|
2014-07-05 11:20:59 +08:00 |
|
z9hang
|
470f40db82
|
去除绝对网址
|
2014-07-05 11:00:01 +08:00 |
|
z9hang
|
c709545809
|
提交后点击版本库才刷新项目积分问题（尚需测试）
|
2014-07-04 16:55:59 +08:00 |
 yanxd
|
8ccc39ae71
|
首页更多报错
|
2014-07-04 14:43:57 +08:00 |
 nwb
|
b6ebbab830
|
项目版本库名称限定优化
|
2014-07-04 14:19:34 +08:00 |
|
yanxd
|
36c90f1dfd
|
取不到学校，再拿id直接空指针
|
2014-07-04 11:30:41 +08:00 |
|
z9hang
|
d525220aca
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 10:10:41 +08:00 |
|
z9hang
|
2dd249a105
|
修正发帖不填主题报错问题，修正发帖内容为空可成功发布bug、修改主页贴吧动态里回帖数字颜色、修改昵称字符为不超过25个
|
2014-07-04 10:10:20 +08:00 |
|
nwb
|
dc0180988f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 09:10:36 +08:00 |
|
nwb
|
d001b4416a
|
1.优化课程首页
2.优化课程首页搜索逻辑
|
2014-07-04 09:10:17 +08:00 |
|
sw
|
2bdb0e20e9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/course.html.erb
|
2014-07-03 18:14:44 +08:00 |
|
sw
|
3e185c3a4b
|
修改学校链接
|
2014-07-03 18:11:10 +08:00 |
|
nwb
|
98ba57b819
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-03 17:28:20 +08:00 |
|
nwb
|
4d25ec1623
|
1.添加课程垃圾数据清理迁移文件
2.课程首页逻辑更改
|
2014-07-03 17:28:13 +08:00 |
|
yanxd
|
0e2b7ba362
|
tag search fix
|
2014-07-03 17:22:48 +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
|
2a6cbe28f0
|
修正课程首页错误
|
2014-07-03 15:24:06 +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
|
e8705bccb1
|
修改文件上传界面样式
|
2014-07-02 14:58:52 +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 |
|
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 |
|
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 |
|
sw
|
98d2c144ae
|
修改时间排序为升序排序
|
2014-06-30 17:52:01 +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 |
|
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
|
917288c84c
|
修正课程讨论区、课程通知等创建时BUG修正
|
2014-06-27 15:58:41 +08:00 |
|
sw
|
3f8f141107
|
修复 创建作业时，由于输入参数错误导致保存失败后，再次输入错误参数会报错。如再次输入参数正确，会进入一个空白页面 的BUG
|
2014-06-27 15:35:55 +08:00 |
|
nwb
|
99c9f81aea
|
BUG修正
|
2014-06-27 15:26:42 +08:00 |
|
nwb
|
3565b9da88
|
修正用户课程界面关闭、重启课程，数据刷新不及时的问题
|
2014-06-27 10:50:23 +08:00 |
|
sw
|
745727b8e7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-26 17:55:18 +08:00 |
|
z9hang
|
d57688413e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-26 17:55:21 +08:00 |
|
z9hang
|
74603e1256
|
解决直接访问ajax链接地址报错问题
|
2014-06-26 17:55:01 +08:00 |
|
sw
|
08bfb8e80a
|
修复教师评分后星星显示不正常的BUG
|
2014-06-26 17:49:23 +08:00 |
|
nwb
|
38baa247bf
|
BUG修正
|
2014-06-26 17:47:27 +08:00 |
|
sw
|
392dc0c365
|
增加访问作业显示列表的权限
|
2014-06-26 14:58:59 +08:00 |
|
sw
|
dbd5c49246
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-26 14:48:31 +08:00 |
|
nwb
|
a115edea9d
|
修改课程标签页选中状态
|
2014-06-26 14:47:29 +08:00 |
|
sw
|
ed9b97f987
|
增加访问作业显示列表的权限
|
2014-06-26 14:42:32 +08:00 |
|
nwb
|
7425178419
|
Merge branch 'CourseModify' into szzh
Conflicts:
app/views/layouts/base_courses.html.erb
app/views/layouts/base_homework.html.erb
app/views/projects/_course.html.erb
db/schema.rb
lib/redmine/activity/fetcher.rb
|
2014-06-26 08:53:16 +08:00 |