 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 |
|
z9hang
|
2fdc6ff988
|
全站搜索的结果中不重复显示引用的资源
|
11 years ago |
|
z9hang
|
78ba3abc23
|
引用列表为选择课程提示恢复
|
11 years ago |
|
z9hang
|
29d4266c6c
|
引用次数的统计修改及按引用排序
|
11 years ago |
|
alan
|
63c9804da8
|
添加course_group表单到数据库中，并建立对应于members和courses之间的关联，
对相应页面的修改
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
bc6db4adc7
|
修改获取作业老师列表
|
11 years ago |
|
sw
|
6fd68806d5
|
修改课程教师就具有开启、关闭匿评、修改作业的权限
|
11 years ago |
|
sw
|
21c4caa7a6
|
修改作业添加评论、删除评论、留言值设定逻辑混乱
|
11 years ago |
|
sw
|
9a61354328
|
1.评分、评论作为一个action发送到服务器
2.修改作业的show方法获取参数不正确的问题
|
11 years ago |
|
sw
|
f5b1cbcfe4
|
优化作业弹出框效率
|
11 years ago |
|
sw
|
38a912672a
|
手写评分相关js
|
11 years ago |
|
sw
|
046757fbd3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
179b6852da
|
修改超级管理员可以访问课程作业列表
|
11 years ago |
|
z9hang
|
514dcb97a0
|
完成资源按时间、下载次数排序功能
|
11 years ago |
|
z9hang
|
c2d618ce9c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
71e7d2c872
|
修改全站搜索结果显示策略：私有资源属于当前课程，且当前用户为当前课程的成员时可见，其他情况私有资源不可见
|
11 years ago |
|
sw
|
2b5160f2d9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
9898e1650b
|
1、学生看不到私有资源bug。2、引用资源弹框中无课程可显示时不显示引入我的课程按钮。3、引用资源时提示信息样式修改
|
11 years ago |
|
sw
|
ad2cf141cb
|
删除竞赛后跳到竞赛主页 #1600
|
11 years ago |
|
sw
|
a934908439
|
1.修改资料时学校列表手形状
2.高校列表鼠标悬浮在学校上面是指针变为手形状
|
11 years ago |
|
z9hang
|
f267a3daf8
|
引用课程中已有的资源时提示资源已存在
|
11 years ago |
|
sw
|
8c81346ffb
|
取消实名回复#1622
|
11 years ago |
|
sw
|
b9118a0212
|
#1612 修改下载学生作业为学号_学生姓名_作品名称.rar
|
11 years ago |
|
z9hang
|
ad2a4487c8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
5a20945e0d
|
选入我得课程列表中添加课程学期的显示
|
11 years ago |
|
sw
|
1fee210924
|
1.修改新建、修改作业提交、取消按钮样式
2.修改作业时关联项目会自动清空
|
11 years ago |
|
z9hang
|
874936a131
|
恢复被还原的代码
|
11 years ago |
|
sw
|
be31444b43
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/tags/_tag.html.erb
|
11 years ago |
|
alan
|
760083ad20
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
ace5b514c6
|
修改bug<测试版--注册登录：成功激活注册的用户后，登录返回资料修改的页面，姓氏、名字还是标识为必填项>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
fef005d2d3
|
修改搜索用户报错
|
11 years ago |
|
sw
|
b475cd51e7
|
修改作业留言实名回复
|
11 years ago |
|
sw
|
88764f1a4b
|
修复老师评分时删除评论不可用#1574
|
11 years ago |
|
sw
|
edd68baa85
|
修改当作业没有附件时老师能打包下载一个空包的问题
|
11 years ago |
|
alan
|
735cb44877
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
526e9bc923
|
修改《IE登录不了》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
897b06cd0e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
79e37fbf2c
|
关联了项目的作业附件提交不了
|
11 years ago |
|
alan
|
4221f5edb3
|
<还原>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
6963d494ae
|
还原《注册》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
949867c50b
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
3417b2bce1
|
还原《登录跳转》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
3784149112
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
8414e92bbe
|
用户主页修改为跳转到项目托管平台主页
|
11 years ago |
|
sw
|
d788e46546
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
z9hang
|
436cf1175f
|
修改课程资源模块相关问题
|
11 years ago |
|
sw
|
74f9bc6404
|
修改右键项目分数页面报500的BUG
|
11 years ago |
|
z9hang
|
e2892453de
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
36e7b222bb
|
课程资源修改为公开的也需登录才能下载
|
11 years ago |
|
sw
|
56150e44ce
|
修复邮件课程作业在新窗口打开网页报500的BUG
|
11 years ago |
|
alan
|
4e0f4d0a55
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
70e8c4ebe7
|
修改bug<注册后，用户第一次登陆都得转到《修改资料》页面>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
moon
|
600afdc6e0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
moon
|
e4e4c94d53
|
封掉所有列表入口，及页面中更多入口
|
11 years ago |
|
z9hang
|
cf808598d2
|
全站搜索不在搜索非本人的私有资源，且他人的公开资源亦不能修改其公开私有属性2、添加迁移文件
|
11 years ago |
|
sw
|
f9b3cc6588
|
Merge branch 'szzh' into CouerseResources
Conflicts:
db/schema.rb
|
11 years ago |
|
z9hang
|
68505239f9
|
课程资源搜索功能，暂时屏蔽排序功能
|
11 years ago |
|
sw
|
6b48e90e77
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
 gonglexin
|
81420df6b9
|
Fix #1523 新建缺陷时高亮显示 TAB 页
|
11 years ago |
|
z9hang
|
f2da5704ef
|
课程应用的功能实现
|
11 years ago |
|
sw
|
9277b3007a
|
修复引用贴吧描述时显示不正确
|
11 years ago |
|
sw
|
1adb5925b5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
eb15db64ee
|
美化项目工具栏样式显示
修复当缺陷列表为空时缺陷列表样式显示异常
|
11 years ago |
|
sw
|
0e409445cc
|
隐藏我的工作台更多按钮
|
11 years ago |
|
z9hang
|
63b91e2cfb
|
资源上传
|
11 years ago |
|
alan
|
972b788687
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
public/stylesheets/application.css
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
b2ce8c78bd
|
<修改资料>页面<课程成员><admin/settings>页面样式修改，注册后页面跳转路由修改
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
eeda25add1
|
设置资源公开与私有功能
|
11 years ago |
|
sw
|
91cb6e29d5
|
数据库增加是否开启匿评字段
新建作业是增加是否开启匿评功能以及相关页面效果显示
修改相关js判断
|
11 years ago |
|
z9hang
|
0821320dfe
|
tag删除功能完成，翻页样式修改
|
11 years ago |
|
z9hang
|
a7a6fbcd22
|
课程资源界面修改
|
11 years ago |
|
moon
|
f21767cb16
|
增加其他角色新建课程权限
|
11 years ago |
|
sw
|
512f16a036
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
alan
|
e0cf3bd6de
|
修改bug<贴吧换行显示不正确>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
fae3de8e04
|
老师打包后姓和名反了
|
11 years ago |
|
sw
|
23f4d760e6
|
修改老师打包下载第二次文件名为学生真实姓名_学生学号_时间
|
11 years ago |
|
alan
|
e9d75bde6f
|
《修改资料》页面：工作单位为不必填
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
baacf328b7
|
增加《注册跳转邮箱页面》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
56cc2a7ad3
|
修复老师编辑作业时课程作业tab没有高亮显示
|
11 years ago |
|
sw
|
a24d1493f9
|
1.修复点击课程动态，课程动态tab页不高亮显示
2.修复点击新建作业，课程作业tab页不高亮显示
|
11 years ago |
|
alan
|
ad6b32ff50
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
2cea3178d6
|
添加邮箱验证功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
dbf08bc486
|
Merge branch 'Homework' into szzh
|
11 years ago |
|
sw
|
31ad012bee
|
修改第一次打包下载成功，后面打包下载失败的BUG
|
11 years ago |
|
sw
|
1c50646677
|
修改打包下载文件名为创建该作业的学生姓名_学生学号
|
11 years ago |
|
sw
|
ecd5a7b2fb
|
修复作业打包下载无法下载的BUG
|
11 years ago |
|
sw
|
9d971069b5
|
Merge branch 'Homework' into szzh
|
11 years ago |
|
sw
|
e3d735ecfc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
dd95335a67
|
没有附件时打包下载500错误问题
|
11 years ago |
|
alan
|
1468f4a8df
|
修改《修改资料》页面
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
460ba55dde
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/models/user.rb
app/views/courses/_course_form.html.erb
db/schema.rb
|
11 years ago |
|
z9hang
|
b45e23d837
|
学生匿评份初始值显示修正
|
11 years ago |
|
z9hang
|
e297bb2687
|
修改匿评
|
11 years ago |
|
z9hang
|
f0377ffae7
|
学生匿评修改
|
11 years ago |
|
sw
|
e0d85f72a1
|
1.匿评作业列表我的分数显示不正确
2.学生可多次进行匿评评分
|
11 years ago |
|
sw
|
759d69892e
|
修改弹出框样式
|
11 years ago |
|
sw
|
be500eb0d2
|
增加开启匿评关闭匿评弹出框动态显示
|
11 years ago |
|
sw
|
b8c9651079
|
111
|
11 years ago |
|
sw
|
e2c034dcef
|
修改关闭匿评之后，学生匿评列表显示为已评列表，学生评分显示为我的评分
分数显示为我对该作业的评分
|
11 years ago |
|
alan
|
591fc409b3
|
修改bug<forge网站的项目缺陷的关联问题机制有问题>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
6178919735
|
修改创建课程时当前学期的默认选择设置
|
11 years ago |
|
sw
|
cd83ebbe91
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
sw
|
5e91a258fe
|
修改已经提交过作业、再次提交报403
|
11 years ago |
|
sw
|
bc36e16e57
|
1.修改创建作业后跳转到作业列表
2.修改作业创建成功提示
|
11 years ago |
|
z9hang
|
b462d4e00a
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
z9hang
|
b141db6624
|
用户留言修复
|
11 years ago |
|
sw
|
0151caa00c
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
sw
|
54a9044679
|
修改匿评个数可配置、以及增加其相关js验证
|
11 years ago |
|
z9hang
|
24dc839a39
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
z9hang
|
7d4d3f590c
|
项目、课程、竞赛留言模块分页控件修复
|
11 years ago |
|
sw
|
eb551788ac
|
1.修复匿评列表查询不正确
2.匿评分配支持2份作业分配
3.匿评分配不正确提示
|
11 years ago |
|
gonglexin
|
ed258a98ba
|
作业分配算法优化
|
11 years ago |
|
z9hang
|
13c3ac8551
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
z9hang
|
07c21e97d6
|
修复竞赛、课程、项目留言模块样式
|
11 years ago |
|
alan
|
2ac9456201
|
增加功能<管理员在用户列表中通过用户的“名字”和“邮件地址”来搜索用户>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
1d76d559dd
|
添加功能<用户搜索的问题>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
2f8f8593eb
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
sw
|
def7a7f5e3
|
作业增加按教师评分/匿评/时间排序
|
11 years ago |
|
sw
|
334a99bcef
|
1.取消老师修改作业时启动互评按钮显示
2创建作业改为提交作业
3.修改不能评分时的样式
|
11 years ago |
|
sw
|
0f14fbef98
|
增加判断：作业总数大于4份时才可以开启匿评
增加不可重复开启匿评
|
11 years ago |
|
z9hang
|
b506a961a1
|
1、回复匿名评论时显示出了名字bug。2、样式调整
|
11 years ago |
|
z9hang
|
316c407a87
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
z9hang
|
4a72dd3380
|
1、留言中时间显示不正确问题。2教师评论失败问题
|
11 years ago |
|
sw
|
df7744e22e
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
sw
|
6c75dc6af3
|
增加老师、学生评分后列表界面刷新的js
|
11 years ago |
|
z9hang
|
1ec82a923e
|
1、重新进入留言界面后，不能删除自己的留言bug。2、删除留言后留言数量未变问题
|
11 years ago |
|
z9hang
|
c3152b55de
|
创建作业后路由跳转错误问题
|
11 years ago |
|
z9hang
|
2d157e1898
|
匿评逻辑判断完善
|
11 years ago |
|
z9hang
|
157010bdad
|
匿评、教师评论
|
11 years ago |
|
alan
|
8cec84dca7
|
添加<公共贴吧 无帖子置顶功能 建议增加>，<管理员可以根据贴吧的热度选择将贴吧置顶>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
c2fe1b7c72
|
修正评分不能点问题，作品留言
|
11 years ago |
|
z9hang
|
2628ab4808
|
修改评分列表获取方式
|
11 years ago |
|
z9hang
|
e0ff4ec949
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
sw
|
f3ac5a0a84
|
1.修改学生创建作业界面
2.取消老师修改作业界面启动互评按钮
3.修改css.css文件中样式
|
11 years ago |
|
z9hang
|
8bfcbcc602
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
z9hang
|
cb87d6337c
|
留言修改
|
11 years ago |
|
gonglexin
|
e8e7708d6e
|
作业匿评功能
|
11 years ago |
|
sw
|
8a6da7a0a1
|
作业参与人员增加退出作业按钮显示，实现参与人员自主退出作业的功能
|
11 years ago |
|
sw
|
58295bc97a
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
sw
|
ac59bc8623
|
实现点赞功能
|
11 years ago |
|
z9hang
|
96626eeb6b
|
恢复respond_path路由并修改部分respond_path
恢复homework_list.html.erb文件
|
11 years ago |
|
z9hang
|
c3bfbf7a97
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
Conflicts:
app/views/homework_attach/_homeworks_list.html.erb
|
11 years ago |
|
z9hang
|
44433e1672
|
评分界面修改
|
11 years ago |
|
sw
|
8a7757f3c2
|
1.整理踩、赞页面代码
2.增加作业点赞功能
3.作业列表界面增加是否已经点赞判断
|
11 years ago |
|
sw
|
243803cc5e
|
1.增加点赞样式
2.修改学生进入作业列表，未评列表只能点赞
3.学生修改作品、创建作品报错
4.增加点赞图片
|
11 years ago |
|
z9hang
|
5cbbb98536
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
Conflicts:
app/views/bids/_bid_homework_show.html.erb
|
11 years ago |
|
z9hang
|
79b7373446
|
留言修改
|
11 years ago |
|
sw
|
2dc79889b9
|
1.增加访问界面时根据角色不同显示不同界面
2.增加学生创建作业、删除作业功能
3.修改学生创建作业时的路由
|
11 years ago |
|
sw
|
58d2306728
|
增加学生进入课程作业界面后相关的路由、界面动态切换显示
|
11 years ago |
|
alan
|
012db21b0d
|
修改bug<测试版--项目版--作品下载：成功上传某些资源，正确选择内容类型，却并未正确显示相关内容类型的资源>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
6a34cef31e
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
Conflicts:
app/views/homework_attach/get_homework_jours.js.erb
|
11 years ago |
|
sw
|
a3c5d7eb5e
|
1.获取作业列表时增加老师和学生的判断
2.增加学生进入作业列表时的界面
|
11 years ago |
|
z9hang
|
15b4cedaba
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
z9hang
|
364ac06527
|
留言回复页面修改
|
11 years ago |
|
sw
|
e6fdda1702
|
修改未批、已批、全部作业、留言action的路由
|
11 years ago |
|
sw
|
d61eb60aba
|
1.作业增加按时间、评分的升序、降序排列
2.修改升序、降序排序判断参数不正确的问题
|
11 years ago |
|
gonglexin
|
4d9fb3e3c4
|
去掉.
|
11 years ago |
|
gonglexin
|
6cb2a5562f
|
未批作业排序
|
11 years ago |
|
gonglexin
|
b2f75d5826
|
给时间和分数排序增加顺序和倒序排序功能
|
11 years ago |
|
sw
|
fe65e3619c
|
点击评分增加弹出框
|
11 years ago |
|
sw
|
00fec13367
|
增加先按总评得分然后按时间排序
|
11 years ago |
|
sw
|
f65a852bc8
|
1.修改分页，使用封装好的分页方法
2.修正作业总数统计
3.修改留言界面样式
4.修正点击各个标签页之后TAB的显示样式
|
11 years ago |
|
sw
|
3fa5a4b3c5
|
1.增加课程留言界面的路由
2.增加点击已批作业、未批作业、全部作业、留言的ajax调用
3.实现点击已批作业、未批作业、全部作业、留言时界面切换
|
11 years ago |
|
sw
|
afa1ef22d5
|
1.未批作业改为动态页面
2.优化分页查询代码
3.修改页面css样式
4.增加查找未批作业路由以及相应的action
|
11 years ago |
|
sw
|
f39d7e374a
|
修改教师评分为所有教师的平均评分(包括非主讲教师)
|
11 years ago |
|
sw
|
bccdd5d3e5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
9645d6f0c0
|
1
|
11 years ago |
|
z9hang
|
84edab5929
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
7c331cf49c
|
还原对tags做的修改(上次的修改对一个系统文件做了修改，无法应用到本系统)
|
11 years ago |
|
sw
|
bbae10d5e8
|
修改作业描述最大限制为5000个字符
|
11 years ago |
|
alan
|
b7cac9427b
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
7d3a18197b
|
修改bug<注册时用户可以不填真实姓名，将其设置为可选>和《测试版：项目--点击作品下载报500错误》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
2a8df37cfc
|
修改作业打包下载报错的BUG
|
11 years ago |
|
sw
|
da2e1bc264
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
e52fbd0f19
|
#1419修改作业打包下载后压缩文件名为学号+名字
|
11 years ago |
|
sw
|
2e253d00c3
|
#1333修复course网站的对作业留言回复无法成功提交的BUg
|
11 years ago |
|
alan
|
a6698bf2f1
|
修改bug《选定了内容类型后再点击表头进行排序总是返回一个空白页》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
2bd08d1aaa
|
修改bug《选定了内容类型后再点击表头进行排序总是返回一个空白页》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
dde40ed3b3
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
78af80394a
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
95c2edad20
|
修改bug《新建版本时输入wiki页面为非汉字类型且长度够长，点击提交报500错误》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
21c6f01d5f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
8cbc4eb938
|
#1318 课程/项目，点击打开该标签，不显示对应的课程/项目名称,原实现逻辑与现存的数据有冲突，扩展了其实现方式，使之兼容现有的数据
|
11 years ago |
|
sw
|
01120d063d
|
#1127修复发布作业时，菜单栏相关父菜单变色问题
|
11 years ago |
|
sw
|
943b9656d1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
da11b88a9b
|
#1137修复项目文档排序时hash中若有空key排序报错的BUG
|
11 years ago |
|
alan
|
72ed73fb05
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
ed292c8216
|
修改参数作品打分。把百分比变成人数
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
9723d62d16
|
有编码转换错误时，不进行转码
|
11 years ago |
|
alan
|
66aa72d210
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
efc247f2e7
|
1、各个页面在，没有数据情况下的显示调整。2、点击竞赛列表，在没有竞赛的情况下显示的是无搜索结果界面修正为列表界面
|
11 years ago |
|
gonglexin
|
0ed9fab16f
|
#994 修复项目资源下载排序问题
|
11 years ago |
|
sw
|
0d0a16fdcd
|
编辑冲突
|
11 years ago |
|
alan
|
6e77c5a0b8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/my_controller.rb
app/views/contestnotifications/index.html.erb
app/views/courses/_join_private_course.html.erb
app/views/wiki/edit.html.erb
|
11 years ago |
|
alan
|
e044f5b615
|
修改contest中出现的逻辑错误
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
e9124c62ce
|
#1250修改帐号后将帐号更新成功放在一个显眼的位置
|
11 years ago |
|
z9hang
|
491020b6df
|
修改403,404页面添加layout，传入一些其他参数
|
11 years ago |
|
sw
|
82aa52e44f
|
修复课程成员不能加入作业中私有资源的BUG
|
11 years ago |
|
sw
|
59c143a9f1
|
修复加入课程逻辑判断有误的问题
|
11 years ago |
|
sw
|
bf49f46b22
|
修复加入课程报错的BUG
|
11 years ago |
|
sw
|
34c7b47580
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
87788ab34c
|
代码优化
|
11 years ago |
|
z9hang
|
38345c0c68
|
重新修改编辑角色有label字未显示全问题（前次修改影响了其他地方），新建合作单位，填写字段不正确时不清空用户填写的数据
|
11 years ago |
|
sw
|
9b82d9c1ba
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
60368341ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
f15c870053
|
1、代码优化。2、项目新建项目后个人主页中项目tab页点击报错问题
|
11 years ago |
|
sw
|
6530c657ee
|
课程allow_join方法增加课程的传入，减少课程获取次数
|
11 years ago |
|
gonglexin
|
aa83609c9d
|
#759 完善课程-资源库 资源大小, 下载次数升序降序功能
|
11 years ago |
|
sw
|
22a5d6a6b0
|
修复当课程ID不存在时加入课程按钮报404而不会给出提示的BUG
|
11 years ago |
|
sw
|
90d4140a25
|
#1377 当指定ID不存在时，给出该课程不存在的提示
|
11 years ago |
|
sw
|
f5a7aec3c0
|
#1342项目--配置--版本库--连接到已有的SVN版本库：返回500错误
解决方案：参数传递错误，修正参数传递
|
11 years ago |
|
z9hang
|
aef3847290
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
e4ff85894d
|
1、部分代码优化。2、未参加课程或项目的用户个人主页界面不显示对应的tab页
|
11 years ago |
|
sw
|
98c2313a66
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
045d124faa
|
#1374 修复项目--讨论区：删除帖子却返回404窗口且导航栏丢失的BUG
解决方案：删除帖子后跳转错误
|
11 years ago |
|
sw
|
f7ac267b42
|
还原修改
|
11 years ago |
|
sw
|
ef10ccb76f
|
增加未登录用户不可通过首页加入课程按钮加入相应课程
|
11 years ago |
|
z9hang
|
2cabec22f2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
258967263e
|
1、代码优化。2、很多页面标题不正确问题
|
11 years ago |
|
sw
|
496ad85469
|
1
|
11 years ago |
|
sw
|
6a33934122
|
1.优化加入课程页面
2.增加是否已经加入课程的判断
|
11 years ago |
|
z9hang
|
57776d67c5
|
优化代码
|
11 years ago |
|
sw
|
4c41c10e0d
|
首页增加加入课程按钮，用户可以输入课程ID以及课程密码加入对应的课程，已过期课程会给出对应提示
|
11 years ago |
|
z9hang
|
fadddcc09a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
76bab839c7
|
1、根据代码评审修改代码。2、修正部分页面标题。
|
11 years ago |
|
sw
|
802c0ea565
|
1.修改未配置页脚时进入首页报错的BUG
|
11 years ago |
|
sw
|
602982a124
|
龚乐鑫修改意见4：redirect_to后使用 url
|
11 years ago |
|
sw
|
f05aee0ca2
|
龚乐鑫修改意见4：去除render action 之前调用对应的 action 方法。
|
11 years ago |
|
sw
|
e543ad1bdf
|
龚乐鑫修改意见2：将系统中control.all.first改为control.all
|
11 years ago |
|
sw
|
97f66a2b08
|
Merge branch 'develop' into szzh
|
11 years ago |
|
z9hang
|
f957666b25
|
部分网页标题不标准问题，补交之前漏掉未添加的文件
|
11 years ago |
|
sw
|
64ee96b526
|
修复课程作业留言回复报500的BUG
产生原因：截取路由正则表达式有误
解决方案：修正正则表达式
|
11 years ago |
|
z9hang
|
328b9b5e5b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
7529a944cf
|
修改课程首页显示课程：
1.3-8月份为显示春季课程，9-2月份为显示秋季课程
1.当前用户未登录：显示系统中在当前年度、季度中人数最多的10个公开课程
2.当前用户以登录，或者选择指定学校：显示该用户所在学校/指定学校在当前年度、季度中人数最多的10门该用户可见的课程(包括该用户可见的私有课程)，如果该学校课程数量不足，向用户推荐其他课程补充数量
|
11 years ago |
|
z9hang
|
af59cef90b
|
网站页脚配置功能
|
11 years ago |
|
sw
|
864d969c15
|
#1173 重启课程、关闭课程、加入课程、退出课程等按钮页面的刷新
|
11 years ago |
|
sw
|
13ee0dc9b2
|
修改403、403页面显示
|
11 years ago |
|
sw
|
f372b7126a
|
老师打包下载增加异常捕获
|
11 years ago |
|
sw
|
b9fe6d6777
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
3dca123b0f
|
#1209 修复老师打包下载报错的BUg
|
11 years ago |
|
z9hang
|
97522f273e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
0633d5661e
|
1、课程讨论区，项目讨论区资源下载权限控制添加。2、课程讨论区、项目讨论区附件公开私有设置无效问题，原因代码中未处理讨论附件情况，解决添加判断并处理
|
11 years ago |
|
sw
|
8cd3dd0287
|
1.#1249 未登录和非本人进入用户课程界面时隐藏课程不显示
解决方案：判断当前用户和所查看的用户是否一致，不一致取消隐藏课程的显示
2.国际化代码以及页面代码调整
|
11 years ago |
|
sw
|
7f08652cd1
|
#1250 修改资料保存后提示信息显示问题
解决方案：flash显示一次后自动清空
|
11 years ago |
|
sw
|
65de079ad9
|
课程作业列表增加分页
|
11 years ago |
|
sw
|
f83668bf73
|
修改作业界面、功能修改以及增加js验证
|
11 years ago |
|
sw
|
caabbd44cb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
30ae933e27
|
#1326 编辑帖子却不能编辑上传的附件 解决：添加编辑上传的附件功能
|
11 years ago |
|
sw
|
43b204e0a7
|
1.修护课程作业编辑页面，没权限通过url访问时报错的BUG
2.修复用户可通过url访问课程配置页面的BUG
|
11 years ago |
|
z9hang
|
ddca1a0316
|
#1331 创新竞赛：点击竞赛“ 2014 年 Android 程序设计竞赛 ”返回404错误 原因，1、路由缺失，补上路由。2、更多链接处加上参数。3、对应show_contest_user方法中一个@users写错成@uers修正之
|
11 years ago |
|
sw
|
ecfcbf1078
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
z9hang
|
6a41ccbc7c
|
#1325 发布的作业添加删除附件功能，编辑时附件的是否公开加上“公开”2字
|
11 years ago |
|
sw
|
2238c42826
|
课程实践模块权限判断不全面
|
11 years ago |
|
sw
|
8ac2640a09
|
#1293修复用户可以通过课程实践页面url进入加入私有课程界面的BUG
解决方案：加入课程按钮增加权限判断；课程实践界面增加权限判断
|
11 years ago |
|
z9hang
|
2f2c6c39b5
|
去掉教师列表的学号
|
11 years ago |
|
sw
|
ca519ce22d
|
教师用户查看课程学生列表时显示真实姓名
|
11 years ago |
|
z9hang
|
42d0f420a8
|
公共贴吧附件删除报错问题修正，竞赛作品附件删除报错问题修正
|
11 years ago |
|
alan
|
43e940eb1d
|
修复竞赛作品附件删除报错的bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
b35defe270
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
24cdea1f34
|
下载资源只有贴吧资源可以下载，原因：其他资源的权限控制暂未实现，解决先直接返回true，讨论区主题...显示过早，解决：多显示几个数字
|
11 years ago |
|
sw
|
53bb8442b9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
045a09e2ed
|
添加贴吧资源下载权限控制
|
11 years ago |
|
sw
|
27ad49282c
|
控制层增加退出项目的限制
|
11 years ago |
|
alan
|
8d657fd0af
|
修复bug:
1,竞赛通知，点击取消也能成功添加
2， “删除”二字竖的排列
3， 编辑竞赛显示为“新闻”
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
97156f0de1
|
enable_module表被还原问题，原因课程新建失败时，@course对象未保存故其id为null，却做了删除操作级联删除enable_module表时sql语句就成了DELETE FROM `enabled_modules` WHERE `enabled_modules`.`course_id` IS NULL 而这刚好对应了所有项目数据。解决办法：去掉删除课程语句，未保存成功时不需删除
|
11 years ago |
|
z9hang
|
64107ca5cc
|
#1279 主页--“我要提问”/“我要反馈” 置所有条件为空，点击发布按钮，未给出类似于“主题/内容不能为空字符”的提示信息,给出错误信息后跳转错误，修正，将两个按钮并排
|
11 years ago |
|
z9hang
|
ee00d7d20a
|
贴吧资源下载开放，判断贴吧资源修改为根据资源的container_type是否为‘Memo’判断
|
11 years ago |
|
alan
|
02470491bd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/contests/index.html.erb
|
11 years ago |
|
alan
|
0e07bed1ad
|
将contest 中的中文转换成zh.yml中的标签
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
98b6be61ba
|
1.修复回复贴吧信息错误后错误信息不及时清除的BUG
2.修复课程讨论区新建帖子跳转页面为回复的BUG
3.修复新建作业后报错的BUg
解决方案：路由错误
|
11 years ago |
|
sw
|
7c97c0391b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
51a783c9a9
|
1.修改竞赛首页通知公告
2.调整竞赛首页页面布局
解决方案：查找系统中最新的最多5条通知公告，显示在首页，用户可以点击相应公告进入公告详细信息页面
|
11 years ago |
linhk
|
111e5bea7c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
linhk
|
aabd183299
|
注册界面姓氏文本框内容修改
|
11 years ago |
|
z9hang
|
943f428aad
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
bce403f624
|
#1242 点击项目得分在弹出的框中点击各项目得分明细反应慢。原因需要向服务器请求数据。解决：使用js在客户端处理各链接，不在向服务器发送请求
|
11 years ago |
