Commit Graph

73 Commits

Author SHA1 Message Date
sw ce526fde77 Merge branch 'dev_zanle' into szzh
Conflicts:
	config/routes.rb
2015-01-30 09:05:47 +08:00
lizanle 90661374a5 Merge branch 'szzh' into dev_zanle
Conflicts:
	Gemfile
	app/controllers/projects_controller.rb
	config/locales/zh.yml
2015-01-23 10:33:07 +08:00
lizanle 49ff5659d9 系统日志查看相关代码,资源 2015-01-19 14:09:53 +08:00
lizanle aca74bf937 Merge remote-tracking branch 'origin/dev_zanle' into szzh
Conflicts:
	Gemfile
	app/views/welcome/index.html.erb
2015-01-14 16:15:09 +08:00
z9hang 0f9915fc2a Merge branch 'szzh' into api
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/bids_controller.rb
	app/controllers/users_controller.rb
	db/schema.rb
2015-01-13 15:12:05 +08:00
alan d65239ef48 <merge code from dev_dingxu>
Signed-off-by: alan <547533434@qq.com>
2015-01-10 17:27:42 +08:00
alan a31088cc1b Signed-off-by: alan <547533434@qq.com> 2015-01-10 17:27:08 +08:00
lizanle 3047b523b0 add expire_helper and change the code way of set cache expire! 2015-01-09 15:28:43 +08:00
sw c9de30bd83 增加问卷调查相关表,以及对应的model、control、view的文件夹 2015-01-08 12:00:43 +08:00
= bb23468c7d Merge branch 'szzh' into api
Conflicts:
	app/controllers/account_controller.rb
	app/controllers/courses_controller.rb
	db/schema.rb
2014-12-17 16:41:28 +08:00
guange c303d2b4ca 将注册功能移动到UserService中 2014-12-03 17:29:03 +08:00
alan 63c9804da8 添加course_group表单到数据库中,并建立对应于members和courses之间的关联,
对相应页面的修改

Signed-off-by: alan <547533434@qq.com>
2014-12-02 14:41:36 +08:00
alan 12de248e87 Signed-off-by: alan <547533434@qq.com> 2014-11-13 10:18:07 +08:00
alan 421d47a687 注册的优化
Signed-off-by: alan <547533434@qq.com>
2014-11-10 16:08:41 +08:00
alan e044f5b615 修改contest中出现的逻辑错误
Signed-off-by: alan <547533434@qq.com>
2014-10-23 11:30:34 +08:00
z9hang f957666b25 部分网页标题不标准问题,补交之前漏掉未添加的文件 2014-10-14 16:50:22 +08:00
nwb 801025d967 添加测试用例 2014-08-29 16:56:59 +08:00
z9hang 56aa2fb8dc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	db/schema.rb
2014-08-13 11:21:37 +08:00
yanxd 281c48c0b3 . 2014-07-30 10:18:49 +08:00
yanxd 233f041cc5 . 2014-07-29 12:05:24 +08:00
yanxd f18e828632 usercontroller#test 2014-07-28 15:37:26 +08:00
yanxd 4fae105b96 project testing. 2014-07-25 17:43:19 +08:00
z9hang 138d90a887 添加数据迁移文件 2014-07-25 10:09:38 +08:00
yanxd 1755d7a790 issues controller & unit testing, word log print. 2014-07-24 17:23:46 +08:00
yanxd 9be52f6cf7 testing doc. 2014-07-23 09:32:41 +08:00
yanxd 8496d6e0d2 删除project多余导致删除项目失败的关联关系 2014-07-22 09:17:21 +08:00
yanxd 04ec6ff27a course model validations testing. 2014-07-21 15:50:40 +08:00
yanxd 472b61fefe 删除了不能通过的测试,修改user_activities。所有原路由测试可以通过。 2014-07-21 15:49:23 +08:00
sw 79c76d26c8 创建作品分类表,并插入部分数据 2014-07-19 11:35:43 +08:00
yanxd 3f6a298eb4 test.course.model 2014-07-18 15:58:37 +08:00
yanxd df848ca756 print tag exception, course name valid test. 2014-07-18 11:08:36 +08:00
yanxd 12fb6bf5ca . 2014-07-17 09:52:56 +08:00
yanxd 4eee70a845 course new/created test 2014-07-16 17:46:17 +08:00
yanxd 386aa1adc3 . 2014-07-16 14:35:54 +08:00
yanxd 37d0560b70 test test 2014-07-15 10:27:24 +08:00
yanxd 14f1ad63d2 自动化测试环境 2014-07-14 16:11:38 +08:00
yanxd fd5747f4dc test 3-framework 2014-07-14 10:27:54 +08:00
z9hang b4dd8409eb 添加项目托管平台首页定制功能 2014-07-10 17:38:04 +08:00
nwb 7425178419 Merge branch 'CourseModify' into szzh
Conflicts:
	app/views/layouts/base_courses.html.erb
	app/views/layouts/base_homework.html.erb
	app/views/projects/_course.html.erb
	db/schema.rb
	lib/redmine/activity/fetcher.rb
2014-06-26 08:53:16 +08:00
nwb c5a837c689 修改资源文件测试用例 2014-06-25 16:26:19 +08:00
nwb f33dc6bff6 1.修改测试环境搭建文档
2.添加部分测试用例
2014-06-23 14:51:57 +08:00
z9hang ab486aa811 补充user_score_details Model及数据迁移文件 2014-06-17 15:59:34 +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
nwb de201ae8f6 添加课程管理员表,并从项目管理员表中迁移原有数据 2014-06-05 11:01:46 +08:00
wanglinchun d06488c10d 为竞赛通知添加评论 2014-06-05 10:28:36 +08:00
nwb 4404222437 0604 2014-06-04 14:13:26 +08:00
wanglinchun bf71a38608 竞赛通知相关文件修改 2014-05-30 20:32:37 +08:00
fanqiang daa531268a 添加安全漏洞的关联表
帖子添加一个来源信息
2014-05-22 11:05:15 +08:00
xianbo 4b063a2c69 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
	db/schema.rb
2014-05-21 11:09:22 +08:00
sw b80c51475f 1.增加作业参与人员类homework_users及相关代码
2.homework_attach增加字段:name,description,state
2014-05-19 17:44:36 +08:00