 sw
|
f101037b26
|
Merge branch 'szzh' into develop
|
11 years ago |
 huang
|
293b3a3b42
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
f7c1b76b3d
|
用户反馈弹框模块！
|
11 years ago |
 z9hang
|
666facd483
|
Merge branch 'szzh' into develop
|
11 years ago |
|
sw
|
f4e30f77cc
|
1.打包下载异常捕获去除
2.打包下载寻找课程、项目方法隐藏
|
11 years ago |
 alan
|
6c9f5136c0
|
修改《竞赛主页显示错误》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
 zhuhao
|
92cf3d86cc
|
Merge branch 'develop' into szzh
|
11 years ago |
|
sw
|
9ef3849fe3
|
如果缺少某一附件。在下载后的文件增加相关说明文档
|
11 years ago |
|
sw
|
82c2a659df
|
修复当作业打包下载时，某一文件不存在时，跳过该文件继续下载其他的文件
|
11 years ago |
|
alan
|
53b57d4c53
|
修改《个人主页积分弹框显示错误》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
7ae9556404
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
ee9d82bfc7
|
1.实现文件调查的model、control、view的架构
2.修正完善新增表之间的关系
3.修正代码中单复数不正确的问题
|
11 years ago |
|
alan
|
2262997c31
|
修改《新建课程时：课程名中有空格或者特殊符号会提示名称无效,》
《 缺陷 Trustie-Forge#1782 (已解决): lable标签和对应的显示值之间间距过大的问题，例如个人主页左侧的信息，具体如图所示》
《本地版中关于学生列表的分组出现的问题：当前已存在A组，再次添加A组应给出提示“A组已存在”，该功能目前只有在学生列表首次加载时才正常》
《托管，课程，竞赛主页中任意点击某一项目，进入该项目主页，右上角的搜索按钮风格和大小不统一。》
《进入某竞赛主页，点击创新竞赛链接没反应》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
c9de30bd83
|
增加问卷调查相关表，以及对应的model、control、view的文件夹
|
11 years ago |
|
z9hang
|
b711793d7c
|
修正加入课程接口问题
|
11 years ago |
|
sw
|
2277d388c0
|
修改了两处语法错误
|
11 years ago |
|
z9hang
|
f252438f85
|
修改编辑课程接口
|
11 years ago |
|
sw
|
805de7fc28
|
修改课程首页课程列表显示策略
|
11 years ago |
|
alan
|
c1705bd65b
|
增加《导入student_for_course数据》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
fc7447ba6b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
9fc7ed8233
|
修复老师第一次评分报错问题的BUG
|
11 years ago |
|
alan
|
275d691b13
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
app/controllers/homework_attach_controller.rb
app/views/courses/_member_list.html.erb
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
ba524675e0
|
修改<打分更新表单>bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
77e8d412ea
|
修改评分列表中教师评分未最后一名教师的评分
|
11 years ago |
|
sw
|
3dc7c55aef
|
去除评分时部分重复查询
|
11 years ago |
|
alan
|
7a727bfed7
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
486f0b69b1
|
数据迁移student_for_course的数据
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
171d743fa1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
b79ec2b50f
|
#1761 修复关闭匿评不可用
|
11 years ago |
|
z9hang
|
4b923ed483
|
修改导出作品列表的名称
|
11 years ago |
|
z9hang
|
42b3fd9584
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
d3f9f23465
|
修改课程列表导出的文件名
|
11 years ago |
|
alan
|
23140307aa
|
实现<去存储过程功能，并修改打分的表更新>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
35dce16924
|
课程成员列表excel导出
|
11 years ago |
|
sw
|
a07bb18dcb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
z9hang
|
899ac6f654
|
添加作品列表导出excel功能
|
11 years ago |
|
sw
|
ee1df78f13
|
课程、项目首页增加用户姓名、邮箱、昵称等搜索功能
|
11 years ago |
|
sw
|
0bce2ae8f3
|
#1752“竞赛通知”，“参加竞赛”时,左侧以及上方布局不同
|
11 years ago |
|
alan
|
36eca5e425
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
e39e801c61
|
增加《学生列表按作业评分排序功能》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
058d19f8d5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
61e1f0fa52
|
导出作品列表功能
|
11 years ago |
|
sw
|
05b9b26314
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
sw
|
70083789cb
|
1.修复匿评列表查询有错
2.修复当身份改变时修改分数初始分数为之前身份的评分，修改为修改之前身份的评分的BUG
3.是否已经评分判断增加在当前角色下是否已经评分
|
11 years ago |
|
alan
|
fb398904b6
|
优化《学生列表》分页查询
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
aa06251fd3
|
修改当用户角色改变时，该用户评分所属角色也跟着改变的BUG
|
11 years ago |
|
alan
|
329be27567
|
增加《分班查询》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
6192a36481
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
b79b08fa8f
|
编写《作业查询存储过程》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
68cadba317
|
#1710 测试版--项目--作品下载：选择任意内容类型、文件类型，都弹出error的提示框
|
11 years ago |
|
alan
|
d2aef552e6
|
优化《作业评分》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
f8dc9dcd35
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
app/controllers/courses_controller.rb
|
11 years ago |
|
alan
|
b17d4840b1
|
《作业优化》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
9545b1da0c
|
优化课程成员列表访问效率
|
11 years ago |
|
alan
|
0e7f7a4254
|
优化《作业评分》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
8e87e83ad8
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
abdd6458d3
|
优化《作业评分》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
819c4c0bc1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/users_controller.rb
|
11 years ago |
|
sw
|
b512bc53e9
|
修改用户搜索无法精确搜索的bUG
|
11 years ago |
|
z9han
|
93762e89d3
|
修改加入课程、退出课程接口调用，添加创建课程，编辑课程的参数说明
|
11 years ago |
|
alan
|
b8e00e16df
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
629641d065
|
《调整学生列表页面》和《优化个人主页查询》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9han
|
67ffc03fee
|
#1708 课程--资源库：非课程成员可以引用私有课程里面的公开资源,改为提示没有权限引用
|
11 years ago |
|
sw
|
73afb7e6c8
|
调用作业课程时首先判断该作业的所属课程是否存在
|
11 years ago |
|
alan
|
c99af4cb7b
|
修改《个人主页出现没权限访问链接》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
683acfcafc
|
优化《学生列表作业评分查询太慢》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
d81240e63c
|
修改《关注老师后，老师发布的作业都会在我主页的动态中显示出来，若我未加入该课程但感兴趣点击后返回403页面，提示不够人性化》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
815d2ceb3d
|
添加《添加相同组时应该给出相关提示信息》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
f9a86356ad
|
添加《重新发送激活邮件》功能to注册模块
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
c560ca617b
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
1965b75d92
|
添加《学生列表按作业评分排序》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
=
|
226d5e9889
|
修改作业详、匿评
新增作品留言
|
11 years ago |
|
sw
|
b6327460a8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
=
|
53d85136a3
|
修改课程中一个错误，完善匿评
|
11 years ago |
|
alan
|
8e592bae98
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
7c1b86556d
|
增加《作业评分弹窗》《学生列表增加作业评分》两项功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
=
|
bb23468c7d
|
Merge branch 'szzh' into api
Conflicts:
app/controllers/account_controller.rb
app/controllers/courses_controller.rb
db/schema.rb
|
11 years ago |
|
z9han
|
7f9386180d
|
部分接口添加权限验证接口、新闻详情及对应评论接口
|
11 years ago |
|
sw
|
5966a1edb6
|
修改老师开启匿评时的提示信息
|
11 years ago |
|
sw
|
cf2810f1c6
|
#1712点击打开某竞赛作品，网页名显示为托管项目的名称
|
11 years ago |
|
z9hang
|
36967eeec0
|
修改注册接口、添加作业列表接口
|
11 years ago |
|
z9hang
|
95d8c1a09d
|
修改课程成员列表接口，增加权限判断
|
11 years ago |
|
sw
|
9ffe32e121
|
修改老师第一次可以不对学生作业进行评分，只进行评价
|
11 years ago |
|
z9hang
|
c0a0c41e14
|
私有课程的公开资源能下载bug
|
11 years ago |
|
sw
|
363e681254
|
修复课程获取出错的BUG
|
11 years ago |
|
sw
|
595f6805f9
|
修改删除附件是方法
|
11 years ago |
|
z9hang
|
6c4d358b7e
|
加入课程、退出课程、编辑课程接口
|
11 years ago |
|
sw
|
b7b1a81a54
|
修改下载附件传入参数有误
|
11 years ago |
|
sw
|
f46240a5eb
|
修复学号为空下载附件报错的BUG
|
11 years ago |
|
z9hang
|
1851181768
|
新建课程接口
|
11 years ago |
|
sw
|
c067d3e4c5
|
修改保存评分时报错
|
11 years ago |
|
z9hang
|
73ac2e562d
|
课程通知接口
|
11 years ago |
|
sw
|
d3e7f484ca
|
#1684 某课程主页--不输入搜索条件，直接点击搜索按钮返回404页面
|
11 years ago |
|
sw
|
e768abbf31
|
修复有时留言回复失败的BUG
|
11 years ago |
|
z9hang
|
6dc057d03c
|
课程老师、学生接口
|
11 years ago |
|
z9hang
|
1494821b67
|
用户搜索接口
|
11 years ago |
|
z9hang
|
2ab2abe9e5
|
课程搜索接口
|
11 years ago |
|
sw
|
cf5b03a379
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/courses/_member_list.html.erb
|
11 years ago |
|
sw
|
9957cfd401
|
修复学生无学号时打包下载其上传作业附件报错的问题
|
11 years ago |
|
sw
|
8a2d22265c
|
修复访问不存在的项目时报500的问题
|
11 years ago |
|
z9hang
|
7d70a6b2cb
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
|
11 years ago |
|
z9hang
|
96004b3270
|
修改密码接口
|
11 years ago |
guange
|
6a3ebb5e94
|
关注接口完成
|
11 years ago |
|
z9hang
|
41fa6f02f1
|
关注列表、关注与取消关注接口
|
11 years ago |
|
z9hang
|
fbd38b4a53
|
关注列表与关注
|
11 years ago |
|
sw
|
0044f17fba
|
#1688修改竞赛搜索报404
|
11 years ago |
|
alan
|
90a01c8d84
|
对新增功能《添加学生列表班内搜索和课内搜索》样式微调
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
d8a568e685
|
增加《分班搜索学生》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
5c33c578bb
|
增减功能《课程分班模块添加当分班中没有学生时，可以删除该分班》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
060b856b23
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/courses/_member_list.html.erb
|
11 years ago |
|
alan
|
19936fa05f
|
修改《角色发生变化时分班人数不对》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
03a8d8ccc9
|
修改《教师列表中不应该有搜索功能》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
fa1e7c9a04
|
修正密码长度判断错误问题
|
11 years ago |
|
sw
|
b51cd1aabb
|
取消教师列表的搜索功能
|
11 years ago |
|
alan
|
63a9fcd483
|
修改《加入分组后分组人数未改变》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
c5a7baa454
|
修改合并引起的bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
4b11e78b89
|
#1630 删除文件的同时在硬盘和数据库上删除该文件
|
11 years ago |
|
sw
|
0d793ee4bc
|
解决冲突
|
11 years ago |
|
sw
|
d5de3dcb56
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/courses_controller.rb
|
11 years ago |
|
sw
|
dc5be133c2
|
课程留言、讨论区增加权限控制
|
11 years ago |
|
sw
|
a2537899b7
|
课程通知访问增加权限控制
|
11 years ago |
|
sw
|
d2814b4b47
|
课程教师列表增加权限控制
|
11 years ago |
|
sw
|
9fd48e5cfe
|
修改作业打包下载时有一个README的文件
|
11 years ago |
|
sw
|
4d9fc8d74f
|
#1657 新建课程时如用户没有对应的身份、姓名信息，跳转到修改资料界面
|
11 years ago |
|
alan
|
020242a8c9
|
增减《查询显示人数以及显示全部人数》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
078639b35a
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group
|
11 years ago |
|
alan
|
cfb8edbfe2
|
分组功能样式微调
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
bed9adaa7a
|
1.修改添加评论、留言的action
2.添加评论、留言时界面数据刷新
3.修改删除留言的action
4.删除留言后界面刷新
5.增加权限控制
|
11 years ago |
|
alan
|
c9b84d0a35
|
增加《学生加入，退出分组》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
66f93150f6
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group
|
11 years ago |
|
alan
|
9765f11f7e
|
增加<修改，添加分组>功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
4bbc76a217
|
1.重写homework_attach的show方法，优化弹出框的弹出效率
2.修改相关的view层代码
3.增加获取指定评分的评论的方法
|
11 years ago |
|
z9hang
|
2a7e0365b8
|
注册修改
|
11 years ago |
|
sw
|
c1852670dd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
077476f39d
|
#1659 修改助教点击编辑作业报403
|
11 years ago |
|
sw
|
64497b10e4
|
#1653 修改开启匿评之后，学生仍可以通过url进行作业的修改和删除
|
11 years ago |
|
sw
|
192a2f8549
|
修改课程资源排序报错
|
11 years ago |
|
z9hang
|
d71581d834
|
修正修改资料时报密码过短错误
|
11 years ago |
|
alan
|
3d12d6f0e8
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group
Conflicts:
db/schema.rb
|
11 years ago |
|
alan
|
615bc7d444
|
增加课程分组的功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
f025922312
|
去掉部分无用的代码
|
11 years ago |
|
z9hang
|
c7ceea445a
|
修改注册方法，调用保存用户的公共方法
|
11 years ago |
|
guange
|
c303d2b4ca
|
将注册功能移动到UserService中
|
11 years ago |
|
z9hang
|
ec21a98e64
|
修改密码验证的方法
|
11 years ago |
|
z9hang
|
843811cf99
|
添加创建于保存用户的方法
|
11 years ago |
|
sw
|
634f707425
|
修复作业的创建者会随着更新变动
|
11 years ago |
|
z9hang
|
c139213f52
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
e788cd9a0f
|
#1149 资源搜索：平台提示说不会搜索私有项目中的内容，实际上却可搜索得到私有项目中文件资源
|
11 years ago |
|
sw
|
f934824175
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
277e5ecad3
|
1.老师评价、学生匿评、学生留言不同情况下页面刷新
2.修改老师评价、学生匿评、学生留言是载入中在弹出窗后面显示
3.修改老师未批列表
4.取消关闭作业详细信息列表时界面刷新，改为评论时刷新页面
5.修改作业显示界面缺失参数报错
|
11 years ago |
