Commit Graph

15 Commits

Author SHA1 Message Date
z9hang a7fa444f9e 修正项目个人得分问题:统计时只计算项目成员,user_grade表user_id和project_id联合不重复验证,user_grade分数部位负验证 2014-07-01 15:19:08 +08:00
nwb 099e8a0912 Merge branch 'szzh' into CourseModify
Conflicts:
	app/controllers/application_controller.rb
	app/views/attachments/upload.js.erb
	app/views/courses/_homework_form.html.erb
	app/views/layouts/base_courses.html.erb
	app/views/users/_my_joinedcourse.html.erb
	db/schema.rb
	lib/redmine.rb
	lib/redmine/access_control.rb
2014-06-17 10:12:44 +08:00
yanxd 70abac4c1e Merge branch 'competition' into develop
Conflicts:
	app/controllers/application_controller.rb
	config/locales/en.yml
	config/locales/zh.yml
	db/schema.rb
2014-06-13 10:59:43 +08:00
nwb 3933817570 1.修改课程配置界面
2.新增课程成员修改
3.删除课程成员修改
4.课程成员类型更改支持
2014-06-12 16:01:38 +08:00
wanglinchun 1c28edd5d4 修改竞赛通知相关文件 2014-06-06 16:03:47 +08:00
wanglinchun bf71a38608 竞赛通知相关文件修改 2014-05-30 20:32:37 +08:00
nwb 68b9a7efc5 修正批准成员申请未选择角色时的BUG 2014-05-27 14:21:59 +08:00
nwb 4f9625b265 修改BUG 2014-05-22 13:40:41 +08:00
nwb dd4ef11b3d 添加项目管理员审核已申请用户界面及逻辑 2014-05-22 11:58:43 +08:00
huangjingquan 5febe8a58d 个人主页课程列表加入了“退出课程”和加入课程按钮 2013-11-01 09:06:06 +08:00
nieguanghui 224a194759 修复成员 bug,修复作业显示bug‘ 2013-10-30 10:45:37 +08:00
xianbo 2589d429b0 add the project what one watch 2013-10-24 08:24:56 +08:00
baiyu 64f36f2c9d 修改了一些BUG 2013-09-30 17:27:58 +08:00
nieguanghui c00575ce84 修改新建项目显示,优化列表显示速度 2013-08-12 17:11:41 +08:00
huangjingquan 70b211e355 first commit 2013-08-01 10:33:49 +08:00