 sw
|
2506e8e50d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
108866b8ba
|
1
|
11 years ago |
|
sw
|
016ef25019
|
1.注释无效代码
2.修改软件总包列表分页统一使用@bid_count
|
11 years ago |
 z9hang
|
d525220aca
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
2dd249a105
|
修正发帖不填主题报错问题，修正发帖内容为空可成功发布bug、修改主页贴吧动态里回帖数字颜色、修改昵称字符为不超过25个
|
11 years ago |
 nwb
|
dc0180988f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
d001b4416a
|
1.优化课程首页
2.优化课程首页搜索逻辑
|
11 years ago |
|
sw
|
7acf73c4ca
|
修复未登陆用户进入学校主页列表出错的问题
|
11 years ago |
|
sw
|
fd1f3b45c9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
6e53796aa9
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
sw
|
f86e889c23
|
修复学校列表链接
|
11 years ago |
|
nwb
|
42a602a9bc
|
修改首页
|
11 years ago |
|
sw
|
2bdb0e20e9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/course.html.erb
|
11 years ago |
|
sw
|
3e185c3a4b
|
修改学校链接
|
11 years ago |
|
nwb
|
1a666900c0
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
98ba57b819
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
4d25ec1623
|
1.添加课程垃圾数据清理迁移文件
2.课程首页逻辑更改
|
11 years ago |
|
sw
|
b42d742c06
|
1.增加我的学校链接
2.修改当我的学校未开设课程时报出的BUG
|
11 years ago |
 yanxd
|
271af6ead5
|
Merge branch 'szzh' into develop
|
11 years ago |
|
yanxd
|
0e2b7ba362
|
tag search fix
|
11 years ago |
|
sw
|
fe4e1cc175
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
a03cdf272e
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
9f7951a22c
|
修改BUG
|
11 years ago |
|
nwb
|
41ff47b839
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
52ddee2b2f
|
界面优化
|
11 years ago |
|
nwb
|
bc50390a2e
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
5c0b1f3a47
|
修改界面
|
11 years ago |
|
sw
|
740f6a19ec
|
项目名称唯一
|
11 years ago |
|
nwb
|
8564f7a904
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
8d22ccd23a
|
修改BUG
|
11 years ago |
|
sw
|
5abee0a06c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
nwb
|
39b4bd37d4
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
b928eb6ed8
|
修改课程首页“更多”链接错误
|
11 years ago |
|
nwb
|
ae8093c400
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
2a6cbe28f0
|
修正课程首页错误
|
11 years ago |
|
sw
|
3c7e680b1b
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
nwb
|
41999e64b7
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
2d9e0d507e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
31e338f1e5
|
修正http://127.0.0.1:3000/?course.trustie.net链接跳转问题
|
11 years ago |
|
sw
|
967c377191
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
yanxd
|
10a844c67f
|
合并导致的，任务列表分页错误
|
11 years ago |
|
yanxd
|
f664ec10b4
|
Merge branch 'szzh' into develop
Conflicts:
app/views/bids/_bid_homework_show.html.erb
|
11 years ago |
|
yanxd
|
663634b9da
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
11 years ago |
|
z9hang
|
050a780b50
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
6f5d6c382b
|
给用户留言的回复若为查看计入新留言数
|
11 years ago |
|
nwb
|
70dc5e2b49
|
去除主版本库标识允许为空的设置
|
11 years ago |
|
nwb
|
898ecb443a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
e8705bccb1
|
修改文件上传界面样式
|
11 years ago |
|
z9hang
|
fe3861c1d7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
54a2fb8a9c
|
主页项目得分与项目页面的项目得分保持一致
|
11 years ago |
|
nwb
|
fb0597ab4a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
2b855badf9
|
修正课程资源库关联已有资源功能
|
11 years ago |
yanxd
|
e1d9d6ab45
|
tag查询崩溃
|
11 years ago |
xianbo
|
830e2d4fb4
|
隐藏 站长统计
|
11 years ago |
|
sw
|
063460f119
|
tt
|
11 years ago |
|
z9hang
|
cc2862ae0f
|
修正缺陷不能踩自己提示错误
|
11 years ago |
|
z9hang
|
8b0f155be7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
d34ab220cc
|
登录名区分大小写
|
11 years ago |
|
nwb
|
138211efba
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
e94ed86ead
|
部分BUG修正
|
11 years ago |
|
z9hang
|
2e38f66899
|
搜索用户修改为按昵称搜索
|
11 years ago |
|
z9hang
|
a7fa444f9e
|
修正项目个人得分问题：统计时只计算项目成员，user_grade表user_id和project_id联合不重复验证，user_grade分数部位负验证
|
11 years ago |
|
sw
|
4470f0dd73
|
添加作业时增加教师评分所占比例设置
|
11 years ago |
|
z9hang
|
0f9c098df9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
0bcc0beaf1
|
修复留言计分
|
11 years ago |
|
sw
|
12b6525cc6
|
t
|
11 years ago |
|
sw
|
bb86ef4612
|
修复获取作业列表时课程老师参数获取不正确的问题
|
11 years ago |
|
sw
|
bc434a82a4
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
z9hang
|
33c883146a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
4906bad7d2
|
修正进项目报错异常
|
11 years ago |
|
sw
|
98d2c144ae
|
修改时间排序为升序排序
|
11 years ago |
|
nwb
|
671eaa8d45
|
测试
|
11 years ago |
|
sw
|
d03718e30f
|
修复新评分规则下按分数排序不正确的问题
|
11 years ago |
|
nwb
|
6141cc56e6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
e863c30352
|
部分BUG修正
|
11 years ago |
|
z9hang
|
9a8c5ebecc
|
个人得分规则显示
留言回复未加分bug修改
|
11 years ago |
|
sw
|
f6d9bfc91d
|
修改新建作业时传递参数
|
11 years ago |
|
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
|
11 years ago |
 linchun
|
79f68c2231
|
Merge branch 'szzh' into develop
|
11 years ago |
|
nwb
|
25a3114a5a
|
老师的学生列表显示为真实姓名
|
11 years ago |
|
nwb
|
917288c84c
|
修正课程讨论区、课程通知等创建时BUG修正
|
11 years ago |
|
sw
|
3f8f141107
|
修复 创建作业时，由于输入参数错误导致保存失败后，再次输入错误参数会报错。如再次输入参数正确，会进入一个空白页面 的BUG
|
11 years ago |
|
nwb
|
99c9f81aea
|
BUG修正
|
11 years ago |
|
nwb
|
1a4ee62853
|
修正课程错误信息显示2遍的问题
|
11 years ago |
|
nwb
|
ad97066a45
|
课程名称有效性判断
|
11 years ago |
|
nwb
|
c0f0e294e5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
beeab518e8
|
课程动态中留言链接BUG修复
|
11 years ago |
|
z9hang
|
0717148a0a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
bc587f3e7d
|
屏蔽个人分数实时刷新功能
修复个人分数计分异常
|
11 years ago |
|
nwb
|
3565b9da88
|
修正用户课程界面关闭、重启课程，数据刷新不及时的问题
|
11 years ago |
|
sw
|
09d79ae4e0
|
添加作业增加默认日期为当前时间的下一天
|
11 years ago |
|
sw
|
745727b8e7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
d57688413e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
74603e1256
|
解决直接访问ajax链接地址报错问题
|
11 years ago |
|
sw
|
08bfb8e80a
|
修复教师评分后星星显示不正常的BUG
|
11 years ago |
|
nwb
|
33baf88886
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
38baa247bf
|
BUG修正
|
11 years ago |
|
sw
|
12b16f0bb6
|
1.修复作业界面点击所属任务链接出错的BUG
2.点击所属任务返回作业列表界面
|
11 years ago |
|
z9hang
|
2501f31ef1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
z9hang
|
7399e1aca2
|
添加项目个人得分统计功能
|
11 years ago |
