Commit Graph

7845 Commits

Author SHA1 Message Date
lizanle ffe12b92c8 课程主题可以搜索 2015-07-22 10:23:14 +08:00
lizanle b8670449c6 Merge remote-tracking branch 'origin/szzh' into szzh 2015-07-22 10:22:59 +08:00
lizanle b148f75dc9 课程主题可以搜索 2015-07-22 10:22:50 +08:00
sw 5c9871d20e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-22 10:18:23 +08:00
sw ec4395c30c 修改作品权限对admin用户公开 2015-07-22 10:18:01 +08:00
sw 5bd1cdc4eb 编程作业结果增加错误信息的存储 2015-07-22 10:06:55 +08:00
huang ae4eed45c3 添加 新项目工具 2015-07-22 10:05:21 +08:00
sw d9f312bbe3 1、当作品描述为空时,打开作品报错
2、作品名称为空时,默认显示作品名为:XX的作品
2015-07-22 09:56:27 +08:00
huang 71b6d3a5c4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-21 16:02:10 +08:00
huang 7269706f8b Merge branch 'dev_hjq' into szzh 2015-07-21 16:01:42 +08:00
huang 650f485f4b Merge branch 'develop' into dev_hjq 2015-07-21 15:59:02 +08:00
huang 3ec790a93f Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-07-21 15:55:37 +08:00
huang c34e2e9978 Merge branch 'szzh' into develop 2015-07-21 15:55:13 +08:00
sw 70b822a641 Merge branch 'develop' into szzh 2015-07-21 15:54:28 +08:00
huang 9eb8c7e712 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-21 15:53:06 +08:00
huang c675db9381 修改云部署路径 2015-07-21 15:52:45 +08:00
sw bb08c7160f 编程作业部分报500 2015-07-21 15:52:40 +08:00
huang 5e79288d49 修改dts样式 2015-07-21 15:47:53 +08:00
sw 273fe8ca70 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-07-21 15:41:53 +08:00
sw 8b9d9df766 Merge branch 'szzh' into develop 2015-07-21 15:41:25 +08:00
sw d0e564a589 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-21 15:40:48 +08:00
sw cfbd50e474 student_work和student_work_test关系:1对多 2015-07-21 15:39:48 +08:00
lizanle ec877c9044 Merge remote-tracking branch 'origin/szzh' into szzh 2015-07-21 15:16:21 +08:00
lizanle 3c27bf0281 移动端版本 管理 可以下载 2015-07-21 15:16:13 +08:00
sw b13e9f918c 取消最后一列得分显示 2015-07-21 15:15:38 +08:00
sw 742cdb2448 编程作业支持C++代码 2015-07-21 15:09:52 +08:00
huang 1c2eb12753 Merge branch 'develop' into dev_hjq 2015-07-21 14:32:37 +08:00
huang aff91e9781 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-07-21 14:08:06 +08:00
huang 900e8c83b3 Merge branch 'szzh' into develop 2015-07-21 14:07:36 +08:00
huang b05478e71d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-21 13:11:13 +08:00
huang 5e7c6e341d Merge branch 'dev_hjq' into szzh 2015-07-21 13:10:42 +08:00
huang 753caea5ab DTS数据存在一张表中
云化部署路径改变
2015-07-21 13:10:02 +08:00
lizanle 6f773b902b 移动端版本 管理 可以下载 2015-07-21 11:59:25 +08:00
lizanle 28ca4d2be2 移动端版本 管理 可以下载 2015-07-21 11:59:09 +08:00
sw 5f21c89060 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-07-21 11:28:12 +08:00
sw fa2cec26cc Merge branch 'szzh' into develop 2015-07-21 11:28:00 +08:00
lizanle b3d2754415 移动端版本 管理 可以下载 2015-07-21 10:52:41 +08:00
huang 069dad053b Merge branch 'szzh' into dev_hjq
Conflicts:
	app/controllers/projects_controller.rb
	app/views/projects/_tools_expand.html.erb
	config/locales/projects/zh.yml
2015-07-21 10:40:02 +08:00
huang 803b2b4fff Merge branch 'szzh' into develop 2015-07-21 10:08:24 +08:00
sw b936b24704 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-21 10:04:14 +08:00
huang c7ef5067ba dts部署间距调整 2015-07-21 10:07:07 +08:00
sw 7d6c2da85b 取消编程作业 2015-07-21 10:04:02 +08:00
huang d9b2f29f73 Merge branch 'develop' into szzh 2015-07-21 10:03:30 +08:00
huang ce6320747a 项目工具改进 2015-07-21 09:59:41 +08:00
huang f9570cf34e Merge branch 'szzh' into develop 2015-07-20 17:52:31 +08:00
huang ef12390930 Merge branch 'develop' into szzh 2015-07-20 17:51:54 +08:00
huang 0609ba6df9 工具:
1. 可信评估工具 Evaluator
2.可信度评估工具 SAS
3.在线验证工具 BACH-Online
4.软件测试工具 SSCC-Web
5.形式验证工具
1.QoS 证据采集工具
2.QoS 评估工具
3.QoS 证据评估统计分析工具
2015-07-20 17:51:32 +08:00
huang 27da12e7f8 Merge branch 'szzh' into develop 2015-07-20 17:45:11 +08:00
huang f1faf010ca Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-20 17:44:27 +08:00
huang 56a5b88182 修改进度条速度 2015-07-20 17:44:12 +08:00