Commit Graph

7910 Commits

Author SHA1 Message Date
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
yutao 6df40be30e 个人主页:如图“取消”改为“取消关注” 2015-07-21 10:38:38 +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
sw bac45c973b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-20 17:39:31 +08:00
sw 0b94de0542 Merge branch 'develop' into szzh 2015-07-20 17:39:17 +08:00
sw 835a7d24c3 作业正在编译队列时报错 2015-07-20 17:39:03 +08:00
huang ff8db8fecc 添加1、软件知识库
2、软件资源库
3、在线开发平台
4、软工服务平台
2015-07-20 17:35:47 +08:00
sw 749a2497b7 Merge branch 'szzh' into develop 2015-07-20 16:38:41 +08:00
sw 00fd943d36 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-20 16:38:20 +08:00
sw 3a59303de9 编程作业不可编辑教辅评分比例 2015-07-20 16:37:40 +08:00
sw 62e2f38c95 增加编程作业结果的打印 2015-07-20 16:34:42 +08:00
huang 654a8078de 添加软件知识库 2015-07-20 16:28:35 +08:00
sw 9f72b25360 编程作业结果显示问题 2015-07-20 16:22:18 +08:00
huang cbd2818202 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-20 16:05:32 +08:00
huang 7971105e22 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-07-20 16:03:50 +08:00
huang 8f1a7f47d1 dts测试添加测试进度效果 2015-07-20 16:03:33 +08:00
lizanle 39f25f05b6 Merge remote-tracking branch 'origin/szzh' into szzh 2015-07-20 15:03:53 +08:00
lizanle 987ff98141 课程按更新时间排序 2015-07-20 15:03:42 +08:00
sw c3da9d58ac Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-07-20 15:03:40 +08:00
sw a9a1fa6bb4 Merge branch 'szzh' into develop 2015-07-20 15:02:53 +08:00
sw b2f8494342 编程作业接口添加 2015-07-20 15:02:32 +08:00
sw c8e169b821 Merge branch 'develop' into szzh 2015-07-20 14:25:33 +08:00
sw 10c0a85846 学生作品列表分班过滤宽度的问题 2015-07-20 12:03:10 +08:00
huang c24ee7b8ea Merge branch 'szzh' into develop 2015-07-20 09:32:02 +08:00
huang e0687c0ab3 云化部署 2015-07-20 09:31:14 +08:00
sw 67132109dc Merge branch 'szzh' into develop 2015-07-20 09:02:20 +08:00
huang 5926b2fe81 dts测试 2015-07-19 20:39:53 +08:00
huang c198a03a90 DTS测试工具 2015-07-19 20:08:57 +08:00
sw a8a1633de8 取消编程作业 2015-07-18 19:37:25 +08:00
huang 415f457dd4 dts接口(未完) 2015-07-18 19:13:33 +08:00
sw e4f988785f Merge branch 'szzh' into develop 2015-07-18 17:51:49 +08:00
sw d89f5e6427 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-18 17:51:16 +08:00
sw 2c0de45330 Merge branch 'develop' into szzh 2015-07-18 17:50:40 +08:00
sw c0fbbe0383 C++ ---> C 2015-07-18 17:50:26 +08:00
lizanle 44fae920cb Merge remote-tracking branch 'origin/szzh' into szzh 2015-07-18 17:31:38 +08:00
lizanle ad8c439e2b 获取作业列表有问题 2015-07-18 17:31:29 +08:00
sw c66e74dc82 Merge branch 'szzh' into develop 2015-07-18 17:10:04 +08:00
yutao 5bae0b674c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-18 17:01:36 +08:00