 sw
|
66d8609c56
|
作业截止时间已到，此后提交的作品将记为迟交 -> 截止了，可补交
|
11 years ago |
|
sw
|
9b5cbb0b4e
|
#1696作业提交时间已过->作业截止时间已到，此后提交的作品将记为迟交。
|
11 years ago |
 alan
|
90a01c8d84
|
对新增功能《添加学生列表班内搜索和课内搜索》样式微调
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
5c33c578bb
|
增减功能《课程分班模块添加当分班中没有学生时，可以删除该分班》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
a6fc79a474
|
将分组改成分班
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
c44eeb4ff8
|
修改项目成员显示为 Member
|
11 years ago |
|
alan
|
fbe6ce16d7
|
修改《分组界面》样式
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
9d0e39e708
|
修改孙涛提出的bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
020242a8c9
|
增减《查询显示人数以及显示全部人数》功能
Signed-off-by: alan <547533434@qq.com>
|
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 |
|
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 |
|
sw
|
19b61118ac
|
修改加入按钮失败后变为加入课程按钮
|
11 years ago |
 zhuhao
|
a7d7b790d2
|
公共页个性签名的提交按钮显示调整
|
11 years ago |
|
zhuhao
|
05a5b18710
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
 z9hang
|
f267a3daf8
|
引用课程中已有的资源时提示资源已存在
|
11 years ago |
|
zhuhao
|
da82a4e842
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
5bcc76d399
|
修改作业提交项目第一项为请选择
|
11 years ago |
|
zhuhao
|
535ec333c3
|
显示字样的改动：项目改为课程
|
11 years ago |
|
sw
|
62b6572d92
|
111
|
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
|
8d3a2ad7a2
|
是否开启匿评改为是否使用匿评
|
11 years ago |
|
alan
|
5ba33b6d6d
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
3317ca4a97
|
修改bug:
<资料修改--登录名不能编辑>
<注册时登录名被标识为只能是英文，但是可以为数字的>
<后台配置密码最短10个字符，注册时输入密码少于10个字符也给出提示信息“密码设置成功”>
<邮箱激活”页面修改若干建议>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
f9b3cc6588
|
Merge branch 'szzh' into CouerseResources
Conflicts:
db/schema.rb
|
11 years ago |
|
z9hang
|
68505239f9
|
课程资源搜索功能，暂时屏蔽排序功能
|
11 years ago |
|
z9hang
|
f2da5704ef
|
课程应用的功能实现
|
11 years ago |
|
sw
|
1adb5925b5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
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
|
e359b987e5
|
增加“课程作业”权限提示
|
11 years ago |
|
moon
|
c086009313
|
国际化
|
11 years ago |
|
moon
|
34d7208deb
|
课程联系界面
|
11 years ago |
|
alan
|
857578dc92
|
修改bug<contest网站的作品提交界面需要改进>
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 |
|
z9hang
|
43931e921a
|
合作单位修改时错误提示信息为英文问题
|
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
|
5d9f54c93b
|
#1490个人主页导航栏中显示课程作业
|
11 years ago |
|
sw
|
e3d735ecfc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
alan
|
421d47a687
|
注册的优化
Signed-off-by: alan <547533434@qq.com>
|
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 |
|
sw
|
63d233ee42
|
课程实践-->课程作业
|
11 years ago |
|
sw
|
35cb7273a8
|
课程实践->课程作业
|
11 years ago |
|
sw
|
be500eb0d2
|
增加开启匿评关闭匿评弹出框动态显示
|
11 years ago |
|
sw
|
e2c034dcef
|
修改关闭匿评之后，学生匿评列表显示为已评列表，学生评分显示为我的评分
分数显示为我对该作业的评分
|
11 years ago |
|
alan
|
591fc409b3
|
修改bug<forge网站的项目缺陷的关联问题机制有问题>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
bc36e16e57
|
1.修改创建作业后跳转到作业列表
2.修改作业创建成功提示
|
11 years ago |
|
sw
|
54a9044679
|
修改匿评个数可配置、以及增加其相关js验证
|
11 years ago |
|
sw
|
4d1730f92e
|
修改
|
11 years ago |
|
alan
|
1d76d559dd
|
添加功能<用户搜索的问题>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
13c362b08d
|
1.作业排序按钮显示顺序
2.配置课程->配置 关闭课程 -> 关闭 加入课程->加入
|
11 years ago |
|
z9hang
|
990c37061b
|
调整按钮样式
|
11 years ago |
|
alan
|
495c4db43e
|
增加功能<增加学生列表是否公开功能>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
8cec84dca7
|
添加<公共贴吧 无帖子置顶功能 建议增加>，<管理员可以根据贴吧的热度选择将贴吧置顶>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
c2fe1b7c72
|
修正评分不能点问题，作品留言
|
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 |
|
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 |
|
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 |
|
z9hang
|
b59ff98006
|
修改留言界面
|
11 years ago |
|
sw
|
58d32bcf2b
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
z9hang
|
f5e9528b12
|
修改base_homework界面
|
11 years ago |
|
sw
|
e6fdda1702
|
修改未批、已批、全部作业、留言action的路由
|
11 years ago |
|
z9hang
|
cc42511a38
|
修改base_homwwork显示的内容
|
11 years ago |
|
sw
|
3fa5a4b3c5
|
1.增加课程留言界面的路由
2.增加点击已批作业、未批作业、全部作业、留言的ajax调用
3.实现点击已批作业、未批作业、全部作业、留言时界面切换
|
11 years ago |
|
sw
|
afa1ef22d5
|
1.未批作业改为动态页面
2.优化分页查询代码
3.修改页面css样式
4.增加查找未批作业路由以及相应的action
|
11 years ago |
|
alan
|
7487c538f3
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
7d3a18197b
|
修改bug<注册时用户可以不填真实姓名，将其设置为可选>和《测试版：项目--点击作品下载报500错误》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
d2740c8a3a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
a594326bce
|
修改课程详细信息界面教师单位为开设课程单位
|
11 years ago |
|
z9hang
|
887a3cbe46
|
两个英文国际化丢失问题
|
11 years ago |
|
gonglexin
|
ab9a9628c0
|
解决#1220 甘特图 PNG 格式中文乱码问题
|
11 years ago |
|
sw
|
943b9656d1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
e220f100d6
|
#1163项目、课程讨论区新建帖子增加js验证
|
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
|
782098c6e7
|
修改测试版个人修改学校、学校列表跨域访问的问题
|
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
|
923a33add5
|
#1397、#1396新建竞赛通知增加js验证
|
11 years ago |
|
z9hang
|
2e3bdf1179
|
将上传资源权限从添加、编辑、缺陷及编辑缺陷注释权限中分离出来，修正未加入任何课程、项目的用户无法上传资源附件bug
|
11 years ago |
|
sw
|
34c7b47580
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
