 sw
|
6b48e90e77
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
3215786538
|
修改非课程成员能看到提交作业按钮
|
11 years ago |
 gonglexin
|
81420df6b9
|
Fix #1523 新建缺陷时高亮显示 TAB 页
|
11 years ago |
 z9hang
|
f2da5704ef
|
课程应用的功能实现
|
11 years ago |
|
sw
|
dc480ecd44
|
调整页面代码，修复公共贴吧引用显示不正确的BUG
|
11 years ago |
|
sw
|
9277b3007a
|
修复引用贴吧描述时显示不正确
|
11 years ago |
 alan
|
f90927313d
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
cb7cd581f6
|
修改bug<admin删除用户出错>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
bc0f3840aa
|
贴吧描述增加自动换行
|
11 years ago |
|
sw
|
1eb9004259
|
调整页面代码
|
11 years ago |
zhuhao
|
de5aa252e0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
1adb5925b5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
aef1cb31fa
|
1.设置帖子创建者可修改、删除帖子
2.设置新建、修改帖子时主题最大长度
3.修改权限判断
|
11 years ago |
|
zhuhao
|
cc32bee0f7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
zhuhao
|
0b5ee5dc4b
|
按钮样式修改（发布课程通知页，新建缺陷页）
|
11 years ago |
|
sw
|
eb15db64ee
|
美化项目工具栏样式显示
修复当缺陷列表为空时缺陷列表样式显示异常
|
11 years ago |
|
sw
|
0e409445cc
|
隐藏我的工作台更多按钮
|
11 years ago |
|
sw
|
43f9d82f5e
|
修改课程老师名称过长时页面显示异常
|
11 years ago |
|
sw
|
4633a13a59
|
修改课程名称过长时页面显示异常
|
11 years ago |
|
sw
|
ddd25f96aa
|
修复课程首页当前学校课程数为9时，页面显示有问题
|
11 years ago |
|
sw
|
14da0c7d73
|
优化base_head代码
|
11 years ago |
|
sw
|
5c4a9ac1f8
|
修改右上角课程的域名
|
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 |
|
sw
|
4917c63298
|
取消作业截至时间的显示
|
11 years ago |
|
sw
|
82233a4b54
|
修复老师开启匿评、学生匿评提示以及进入学生作业详细信息界面时界面会自动拉下去的BUG
|
11 years ago |
|
sw
|
f560e9f494
|
1.修改未开启匿评学生界面取消匿评列表界面显示
2.修改未开启匿评学生直接进入众评点赞界面
|
11 years ago |
|
z9hang
|
eeda25add1
|
设置资源公开与私有功能
|
11 years ago |
|
sw
|
ff185852eb
|
未开启匿评时老师界面取消开启/关闭匿评按钮显示
|
11 years ago |
|
sw
|
91cb6e29d5
|
数据库增加是否开启匿评字段
新建作业是增加是否开启匿评功能以及相关页面效果显示
修改相关js判断
|
11 years ago |
|
z9hang
|
0821320dfe
|
tag删除功能完成，翻页样式修改
|
11 years ago |
|
z9hang
|
a7a6fbcd22
|
课程资源界面修改
|
11 years ago |
|
zhuhao
|
c1361e37b8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
zhuhao
|
126c7f558d
|
修改用户信息处控件对齐，新建课程通知提交取消按钮样式统一
|
11 years ago |
|
sw
|
861dbc854e
|
修复个人动态主页课程连接错误
|
11 years ago |
|
sw
|
6245b6ba33
|
修改编辑、启动匿评、关闭匿评、提交作业按钮样式
|
11 years ago |
|
sw
|
6bfbf5bd2b
|
1.增加匿评阶段课程作业列表界面不可提交作业
2.增加匿评关闭阶段可提交作业
|
11 years ago |
|
sw
|
d0e549fc85
|
增加作业倒计时显示
|
11 years ago |
|
sw
|
2de2355e5c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
3ac023e7a5
|
悬浮框增加屏幕绝对定位
问题：貌似IE6不兼容
|
11 years ago |
moon
|
e0571a888e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
moon
|
e359b987e5
|
增加“课程作业”权限提示
|
11 years ago |
|
sw
|
90f5cd2e60
|
修改缩放html页面时悬浮框位置显示不正确的BUG
|
11 years ago |
|
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 |
