 sw
|
804b23f0f6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
3aaf2247dc
|
修改作业右侧悬浮框css、js
|
11 years ago |
 z9hang
|
4b5ad833b0
|
课程资源界面各按钮失效问题
|
11 years ago |
|
sw
|
a167262fc0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
33555e598e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
22696fe4f9
|
#985 micros版：资源搜索，下载资源控件显示错误
|
11 years ago |
moon
|
f21767cb16
|
增加其他角色新建课程权限
|
11 years ago |
|
moon
|
c086009313
|
国际化
|
11 years ago |
|
moon
|
34d7208deb
|
课程联系界面
|
11 years ago |
|
sw
|
80e3e44f13
|
修复学生不能退出私有课程的BUG
|
11 years ago |
|
sw
|
aa0f10e9fd
|
修改课程通知页面访问报404
|
11 years ago |
|
sw
|
c74b5d7bb4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
63a141a75a
|
1.修改右上侧课程作业快捷栏显示js、css
|
11 years ago |
|
z9hang
|
46e97b7ae4
|
删除多出来的页脚
|
11 years ago |
|
z9hang
|
096b0e271f
|
课程页面页脚偏移问题
|
11 years ago |
|
z9hang
|
ae19532601
|
修改帮助的浮动边框
|
11 years ago |
 zhuhao
|
3fd1f77535
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
zhuhao
|
b1e58f3fd5
|
新增弹框
|
11 years ago |
|
sw
|
512f16a036
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
61c8feac8f
|
课程后增加课程作业的快捷栏
|
11 years ago |
 alan
|
857578dc92
|
修改bug<contest网站的作品提交界面需要改进>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
e0cf3bd6de
|
修改bug<贴吧换行显示不正确>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
e7545b1cd9
|
增加《注册后跳转邮箱》页面
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
12de248e87
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
e86ef8e6f0
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
b7a89d6108
|
Merge branch 'shaproup' into szzh
Conflicts:
app/models/course.rb
app/models/project.rb
app/views/contests/show_attendingcontest.html.erb
app/views/files/_course_file.html.erb
app/views/files/_course_new.html.erb
app/views/layouts/_base_footer.html.erb
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
43931e921a
|
合作单位修改时错误提示信息为英文问题
|
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 |
|
z9hang
|
227a7c1f31
|
z作业留言的字数控制
|
11 years ago |
|
sw
|
a24d1493f9
|
1.修复点击课程动态，课程动态tab页不高亮显示
2.修复点击新建作业，课程作业tab页不高亮显示
|
11 years ago |
|
z9hang
|
e6aa9d3592
|
修复用户、课程、项目、竞赛、留言模块样式，去除回复时的回复某某字样，及字数控制
|
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
|
3c2c9149b1
|
取消新建、修改作业的必填标志
|
11 years ago |
|
sw
|
ab791f6386
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
sw
|
1c50646677
|
修改打包下载文件名为创建该作业的学生姓名_学生学号
|
11 years ago |
|
sw
|
ecd5a7b2fb
|
修复作业打包下载无法下载的BUG
|
11 years ago |
|
z9hang
|
2b829db804
|
教师打开评分界面时，评分处显示其上次的评分
|
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 |
|
sw
|
7d93a4e4aa
|
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 |
|
alan
|
421d47a687
|
注册的优化
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
9bd1af9541
|
#1480 项目留言区回复时间显示问题
|
11 years ago |
|
z9hang
|
b707cbae16
|
评分保留两位小数点
|
11 years ago |
|
z9hang
|
dd95335a67
|
没有附件时打包下载500错误问题
|
11 years ago |
|
z9hang
|
3a9ef1cfff
|
暂时屏蔽作品打包下载
|
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
|
6157a67e23
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
sw
|
e0d85f72a1
|
1.匿评作业列表我的分数显示不正确
2.学生可多次进行匿评评分
|
11 years ago |
|
z9hang
|
cd1be67b8c
|
学生可多次评分、评分完毕不在提示评分成功
|
11 years ago |
|
sw
|
e550f9d91d
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
sw
|
ffaa9c51ba
|
修复作业列表报错
修复2个关闭按钮
|
11 years ago |
|
sw
|
759d69892e
|
修改弹出框样式
|
11 years ago |
|
sw
|
be500eb0d2
|
增加开启匿评关闭匿评弹出框动态显示
|
11 years ago |
 gonglexin
|
972d748199
|
#1434 解决文件重复上传的问题
|
11 years ago |
|
sw
|
54aae26cbe
|
被除数为0时弹框报错
|
11 years ago |
|
z9hang
|
89732c51ef
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
Conflicts:
app/views/homework_attach/_homework.html.erb
|
11 years ago |
|
z9hang
|
9b4e9bd04a
|
1、部分星星显示不正确问题，2、评分初始值设置为0
|
11 years ago |
|
sw
|
6c13a682c0
|
修改评分为nil报错
|
11 years ago |
|
sw
|
0a8d0182fd
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
z9hang
|
0d31ec53b5
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
z9hang
|
5034769ab3
|
星星显示不全问题
|
11 years ago |
|
sw
|
2a8e40603c
|
修改作业弹出框样式
|
11 years ago |
|
sw
|
f3edbe4b79
|
修改作业连接错误
|
11 years ago |
|
alan
|
fd8a8d1fe2
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
a19a3b3f43
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
sw
|
b8c9651079
|
111
|
11 years ago |
|
z9hang
|
3689b5e228
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
z9hang
|
3416b4c047
|
#1435 课程--课程实践：“学生提问”应该有个数字标识学生留言的数量
|
11 years ago |
|
sw
|
14db93c10a
|
教师作业列表增加当前作业提交信息,匿评信息提示
|
11 years ago |
|
alan
|
0aae731eef
|
修改bug<点击排序后内容类型自动变为全部，但又并未显示全部资源>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
48aacc70c9
|
调整学生新建、修改作业时的样式
|
11 years ago |
|
sw
|
e2c034dcef
|
修改关闭匿评之后，学生匿评列表显示为已评列表，学生评分显示为我的评分
分数显示为我对该作业的评分
|
11 years ago |
|
sw
|
8fbbbe82e0
|
修改作业左上角课程、作业名称显示
|
11 years ago |
|
sw
|
f149dd3a57
|
我的作品应该是缺省显示的tab，等到老师启动匿评后，待评作品才是缺省tab
学生的作业主页中，“所有作品”应该是缺省的tab页
|
11 years ago |
|
sw
|
7d97889261
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
Conflicts:
app/views/bids/_bid_homework_show.html.erb
app/views/layouts/base_homework.html.erb
|
11 years ago |
|
sw
|
9520007bec
|
学生匿评列表隐藏教师评分
|
11 years ago |
|
gonglexin
|
c52e87c74f
|
统计数据
|
11 years ago |
|
sw
|
4267026ec1
|
111
|
11 years ago |
|
alan
|
591fc409b3
|
修改bug<forge网站的项目缺陷的关联问题机制有问题>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
09f89f23a1
|
设置作业总算大于2份是才显示开启匿评按钮
|
11 years ago |
|
sw
|
6178919735
|
修改创建课程时当前学期的默认选择设置
|
11 years ago |
|
sw
|
15e71ae85b
|
修改左上角作业显示名称和课程显示名称
|
11 years ago |
|
sw
|
e5874283f1
|
1.修改课程实践列表提交作业按钮链接
2.增加提交作业的控制
3.修改获取在指定课程提交作业的集合的方法判断
|
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 |
|
z9hang
|
8998c60746
|
无法评分时不显示评分项
|
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
|
4a7fcfaac9
|
增加关闭匿评是的提示
|
11 years ago |
|
sw
|
0151caa00c
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
sw
|
55b7d12908
|
增加判断：匿评分配数量必须大于0
|
11 years ago |
|
sw
|
54a9044679
|
修改匿评个数可配置、以及增加其相关js验证
|
11 years ago |
|
z9hang
|
3b073eec74
|
修正留言样式
|
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 |
|
sw
|
3f2aa9cad1
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
Conflicts:
app/views/layouts/base_homework.html.erb
|
11 years ago |
|
gonglexin
|
ed258a98ba
|
作业分配算法优化
|
11 years ago |
|
gonglexin
|
1c7b6aa17e
|
阻止用户多次点击启动匿评链接
|
11 years ago |
|
sw
|
cf952b5012
|
Merge branch 'Homework' into develop
|
11 years ago |
|
sw
|
a08f944d85
|
修复错误
|
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 |
|
sw
|
4d1730f92e
|
修改
|
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
|
b0886e0663
|
增加开启、关闭匿评之前的提示
|
11 years ago |
|
sw
|
d520f1cdb4
|
新增和修改作业增加js验证
|
11 years ago |
|
sw
|
13c362b08d
|
1.作业排序按钮显示顺序
2.配置课程->配置 关闭课程 -> 关闭 加入课程->加入
|
11 years ago |
|
sw
|
cc69b06616
|
作业左侧增加开启/关闭匿评按钮
|
11 years ago |
|
z9hang
|
ff343b437c
|
调整匿评评论的样式
|
11 years ago |
|
sw
|
def7a7f5e3
|
作业增加按教师评分/匿评/时间排序
|
11 years ago |
|
z9hang
|
fced7dcb91
|
进入自己的作业不让评分
|
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 |
|
sw
|
e7a1e9b325
|
修改弹出框样式，使其位于屏幕中间，且增加边框
|
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
|
385009b688
|
留言区时间显示问题
|
11 years ago |
|
z9hang
|
1ec82a923e
|
1、重新进入留言界面后，不能删除自己的留言bug。2、删除留言后留言数量未变问题
|
11 years ago |
|
z9hang
|
c3152b55de
|
创建作业后路由跳转错误问题
|
11 years ago |
|
z9hang
|
b876a7b063
|
将评论标签页切换改为鼠标点击切换
|
11 years ago |
|
gonglexin
|
f9cc819ab3
|
解决点击清楚留言页面跳动的问题
|
11 years ago |
|
gonglexin
|
6dfb997ffe
|
评分之后关闭弹出窗口之后刷新未评分作品页面
|
11 years ago |
|
sw
|
1ec6b53d76
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
sw
|
a4b14c3a53
|
修改作业详细信息弹出框js关闭窗口以及弹出框关闭按钮样式
|
11 years ago |
|
sw
|
e2897b3d1a
|
修改匿评弹出框样式
|
11 years ago |
|
z9hang
|
990c37061b
|
调整按钮样式
|
11 years ago |
|
z9hang
|
86653c7b66
|
修改按钮样式
|
11 years ago |
|
z9hang
|
e3b0b8e9e1
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
z9hang
|
2d157e1898
|
匿评逻辑判断完善
|
11 years ago |
|
sw
|
b625a857e9
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
alan
|
495c4db43e
|
增加功能<增加学生列表是否公开功能>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
caec663fe4
|
修改编辑作业界面样式
|
11 years ago |
|
sw
|
bde5cb9302
|
1.修改作业界面修改
2.作业附件取消加粗显示
3.作业创建、修改建业页面高度为自动
4.删除作业成员增加相关提示
|
11 years ago |
|
z9hang
|
4f00e974e9
|
能否匿评参数暂设为TRUE
|
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 |
|
sw
|
0896610464
|
1.增加创建作业时创建项目的连接
2.增加只有在老师布置作业和开启匿评这段时间内才能创建作业
|
11 years ago |
|
z9hang
|
b65fe236ef
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
z9hang
|
2628ab4808
|
修改评分列表获取方式
|
11 years ago |
|
sw
|
fbc66484a0
|
1。作业处于匿评阶段时学生才可对作业进行评分，否则不可对作业进行评分
2。作业处于匿评阶段且匿评作业列表不为空时才给用户弹出匿评提示
3。修改已关闭匿评为匿评结束
|
11 years ago |
|
sw
|
66641e6507
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
sw
|
978cfcaa5e
|
1.匿评列表隐藏学生姓名显示，学生头像显示为默认头像
2.取消左边提交作业学生头像列表显示
|
11 years ago |
|
z9hang
|
e0ff4ec949
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
z9hang
|
47c8ffd22a
|
作业修改
|
11 years ago |
|
sw
|
f3ac5a0a84
|
1.修改学生创建作业界面
2.取消老师修改作业界面启动互评按钮
3.修改css.css文件中样式
|
11 years ago |
|
z9hang
|
8e4f55253a
|
评分留言功能
|
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 |
|
z9hang
|
ba742cd910
|
评分弹窗的留言部分样式修改
|
11 years ago |
|
sw
|
27aca11715
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
sw
|
8a6da7a0a1
|
作业参与人员增加退出作业按钮显示，实现参与人员自主退出作业的功能
|
11 years ago |
|
sw
|
78bc458e84
|
1.修改匿评提示弹出提示样式
2.增加新增作业静态页面
|
11 years ago |
|
z9hang
|
4ce1ac9f94
|
修改留言回复的样式
|
11 years ago |
|
sw
|
c2e9363d44
|
学生进入作业列表，如果已经被分配匿评作业且该学生未对此作业进行打分的情况下，弹出匿评相关提示
|
11 years ago |
|
z9hang
|
aeaa212c35
|
评分控件不能用问题
|
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 |
|
alan
|
fecf9513b9
|
修改bug《课程讨论区老师不能给帖子置顶》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
14ca7bcf9c
|
修改bug<项目--讨论区：不登录状态下讨论区的帖子是不能进行回复等操作的，建议直接跳转到登录窗口或给出相关提示信息>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
2ac89fcdbc
|
整理踩、赞页面
|
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
|
e53ebbcec2
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
z9hang
|
79b7373446
|
留言修改
|
11 years ago |
|
sw
|
2dc79889b9
|
1.增加访问界面时根据角色不同显示不同界面
2.增加学生创建作业、删除作业功能
3.修改学生创建作业时的路由
|
11 years ago |
|
z9hang
|
356ed9b116
|
修正留言回复样式
|
11 years ago |
|
sw
|
58d2306728
|
增加学生进入课程作业界面后相关的路由、界面动态切换显示
|
11 years ago |
|
alan
|
9c4c1679af
|
修改bug<有些课程school_id=0 或为空则课程进不去>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
b59ff98006
|
修改留言界面
|
11 years ago |
|
sw
|
c045b4682a
|
增加匿评分配作业表，以及和作业、作品、用户表关系键确认
|
11 years ago |
|
sw
|
52dabc6b98
|
1.取消新建、修改作业时互评功能的添加
2.格式化页面代码、取消删除老师布置作业按钮
|
11 years ago |
|
sw
|
6a10e19f63
|
增加留言回复的样式显示
|
11 years ago |
|
alan
|
cbc2d2e99d
|
修改bug<course主页-加入课程，建议修复“取消”按钮样式与“加入”保持一致>
Signed-off-by: alan <547533434@qq.com>
|
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
|
9b64027ed6
|
1.当用户真实姓名为空时作业列表界面显示为昵称
2.修改分页控件样式
3.作业用户图像增加链接，修改鼠标悬浮样式
4.增加当前选中页显示样式
|
11 years ago |
|
sw
|
58d32bcf2b
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
sw
|
fd5b7ac468
|
1.更新css样式文件
2.增加相关图片
3.分页空间支持ajax刷新界面
4.修改分页控件显示样式
|
11 years ago |
|
z9hang
|
f5e9528b12
|
修改base_homework界面
|
11 years ago |
|
sw
|
e6fdda1702
|
修改未批、已批、全部作业、留言action的路由
|
11 years ago |
|
sw
|
70495af3ef
|
修改弹出界面样式
|
11 years ago |
|
sw
|
d61eb60aba
|
1.作业增加按时间、评分的升序、降序排列
2.修改升序、降序排序判断参数不正确的问题
|
11 years ago |
|
z9hang
|
22e2ac26bb
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
z9hang
|
cc42511a38
|
修改base_homwwork显示的内容
|
11 years ago |
|
gonglexin
|
4d9fb3e3c4
|
去掉.
|
11 years ago |
|
gonglexin
|
6cb2a5562f
|
未批作业排序
|
11 years ago |
|
gonglexin
|
811b6383f7
|
初次加载页面时给定一个默认排序
|
11 years ago |
|
gonglexin
|
b2f75d5826
|
给时间和分数排序增加顺序和倒序排序功能
|
11 years ago |
|
gonglexin
|
bb642d320d
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
gonglexin
|
f3d8aebfe4
|
给排序设置正确的路径
|
11 years ago |
|
sw
|
557c414b27
|
1.修改网页底部显示位置不正确
2.修该弹出框长宽
|
11 years ago |
|
sw
|
fe65e3619c
|
点击评分增加弹出框
|
11 years ago |
|
sw
|
f45a9cc6fb
|
增加对迟交作业的显示
|
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
|
2b279e124b
|
111
|
11 years ago |
|
sw
|
ceb181e669
|
实现新流程作业列表静态页面
|
11 years ago |
|
sw
|
7ec738dd87
|
增加相关css文件
|
11 years ago |
|
alan
|
620675b718
|
修改bug《创新竞赛--参赛作品列表，个别作品“所属类别”描述字体重叠》，《测试版：course/contest主页--贴吧动态：每条动态未清晰地分隔开来》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
9434ec69d2
|
1
|
11 years ago |
|
sw
|
bccdd5d3e5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
alan
|
7696e34ecf
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
7487c538f3
|
Signed-off-by: alan <547533434@qq.com>
|
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
|
435e5a4d51
|
项目首页用户动态增加悬浮框显示动态所有内容
|
11 years ago |
|
sw
|
7e8ab97713
|
作业描述最大长度限制为3000个字符
|
11 years ago |
|
sw
|
2a8df37cfc
|
修改作业打包下载报错的BUG
|
11 years ago |
|
sw
|
a54edd9047
|
111
|
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
|
f3e8c8b688
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
dde40ed3b3
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
gonglexin
|
dc5525f100
|
#1182 修正wiki历史纪录查看差别页面宽度
|
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
|
f6ed31b1eb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
51e22cc2a9
|
#1383 项目--wiki：编辑wiki却不能编辑已经成功上传的附件
|
11 years ago |
|
sw
|
d2740c8a3a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
7aa2e5c553
|
修复部分浏览器课程作业界面左边课程信息部分显示不正确的问题
|
11 years ago |
|
sw
|
fb26708007
|
修复课程实践上传附件人悬浮框显示不正确的问题
|
11 years ago |
|
sw
|
591aa78dcf
|
调整页面代码
|
11 years ago |
|
z9hang
|
65a89bb9a5
|
#1412个人主页--课程--当该用户加入多个课程时，建议“关闭课程”字样对齐
|
11 years ago |
|
sw
|
a594326bce
|
修改课程详细信息界面教师单位为开设课程单位
|
11 years ago |
|
sw
|
205c78454f
|
#1414设置首页描述最小高度，且贴吧动态显示条数改为9条
|
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
|
9d91e85fe4
|
#863 增加已有远程地址，创建一个远程分支，并切换到该分支的示例
|
11 years ago |
|
sw
|
0ff7eec412
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
4e7965d060
|
优化页面代码
|
11 years ago |
|
alan
|
521158a086
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
cc81695bc3
|
修改《修改资料》中英文不对称的bug,见缺陷http://forge.trustie.net/issues/1846_Trustie-Forge(1328-1418)
Signed-off-by: alan <547533434@qq.com>
|
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 |
|
sw
|
cf9f33fce7
|
取消回复帖子时对主题的js验证
|
11 years ago |
|
sw
|
e220f100d6
|
#1163项目、课程讨论区新建帖子增加js验证
|
11 years ago |
|
sw
|
5aa68ba9b4
|
#1175修改代码评审中的中文问题
|
11 years ago |
|
sw
|
4090834c2e
|
#1247修改限制输入框最大长度
|
11 years ago |
|
sw
|
29e6158fa4
|
修改版本列表名称过长时显示为隐藏
|
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 |
|
sw
|
986f48f012
|
修改页面代码
|
11 years ago |
|
z9hang
|
3cd3989ead
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
0a1713da20
|
课程列表中，自己的课程没星号标志问题
|
11 years ago |
|
sw
|
6db235cf3c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
9707049703
|
修改js判断指定字符串是否含有指定子串不正确的问题
|
11 years ago |
|
z9hang
|
ef15c15605
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
30e355fa35
|
#948 admin配置管理--用户列表--项目列表：如图下拉框显示超出边框且项目问题，解决，说小选项长度，添加title属性，鼠标悬停时显示选项的完整信息
|
11 years ago |
|
sw
|
54e8df06cd
|
1.修改Micros版学校列表不可用的问题
2.修改正式版、测试学校列表访问版跨域的问题
|
11 years ago |
|
sw
|
782098c6e7
|
修改测试版个人修改学校、学校列表跨域访问的问题
|
11 years ago |
|
sw
|
a451385d13
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
e6d1a127a9
|
修复Micros版学校列表无法显示的BUG
|
11 years ago |
|
sw
|
526b34d623
|
修改加入课程弹出框样式
|
11 years ago |
|
z9hang
|
49beaa4f42
|
去掉ajax错误提示
|
11 years ago |
|
sw
|
b732944a2a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
9723d62d16
|
有编码转换错误时，不进行转码
|
11 years ago |
|
sw
|
1f9c6b66ca
|
修复wiki页面表格超出页面的BUG
|
11 years ago |
|
sw
|
c8c57b3f76
|
#1404修复帖子描述为表格，切表格设置大于页面宽度的宽度时，显示超出页面的BUG
解决方案：增加js改宽度
|
11 years ago |
|
alan
|
66aa72d210
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
84e8a40174
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
da35ee123b
|
美化界面
|
11 years ago |
|
sw
|
4991f2b549
|
#1180取消项目配置中新建项目赋予角色功能
|
11 years ago |
