Commit Graph

8344 Commits

Author SHA1 Message Date
sw bb8edad410 Merge branch 'develop' into szzh 2015-08-04 17:53:16 +08:00
sw 2e4babc2ae 修改demo代码,增加C++的示例代码 2015-08-04 17:52:57 +08:00
huang 69adc98fe4 个人主页左侧显示不正常 2015-08-04 17:26:03 +08:00
huang f16d269101 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-04 17:06:41 +08:00
huang ba84e19048 修正底部问题 2015-08-04 17:06:19 +08:00
sw f3e9d6248d Merge branch 'szzh' into develop 2015-08-04 16:43:08 +08:00
sw f482d64a72 编译错误才存储错误信息 2015-08-04 16:42:17 +08:00
sw 96420f59a8 修改标准代码 2015-08-04 16:35:02 +08:00
sw a7716ed4cb 编译错误才存储错误信息 2015-08-04 16:16:42 +08:00
sw 0099c99829 增加错误信息的存储 2015-08-04 16:14:47 +08:00
sw 6c10959cca 老师布置作业界面,标准代码宽度调整 2015-08-04 16:03:17 +08:00
sw 9b5a1a5203 增加标准代码显示 2015-08-04 16:02:17 +08:00
cxt 6b298993d8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-04 16:00:02 +08:00
sw aaf546686e 输出错误 ---> 输入和输出不匹配 2015-08-04 15:40:05 +08:00
sw 3f51368bb2 老师布置作业界面增加错误信息的提示 2015-08-04 15:25:05 +08:00
huang 27c5bdd46d Merge branch 'dev_hjq' into szzh 2015-08-04 14:43:49 +08:00
huang 672e16b877 Merge branch 'szzh' into dev_hjq 2015-08-04 14:43:05 +08:00
sw c176122c00 迟交扣分、缺评扣分2分 2015-08-04 14:40:17 +08:00
sw 670274f749 Merge branch 'develop' into szzh 2015-08-04 14:38:08 +08:00
sw 23165e10c0 提交作品增加demo代码 2015-08-04 14:29:49 +08:00
huang f1bbc0fc32 邮件通知:发布作业链接域名错误问题 2015-08-04 09:51:15 +08:00
cxt 22985fdbce 修复个人主页的课程/项目动态中可点击的私有课程/项目显示为灰色的bug 2015-08-03 10:31:05 +08:00
huang 15b3d527dc footer 2015-08-01 18:15:04 +08:00
sw 8dbaff537a 编程作业取消上线 2015-08-01 18:03:59 +08:00
ouyangxuhua 9aeb604720 Merge branch 'ouyangxuhua' into szzh 2015-08-01 17:49:00 +08:00
sw c78c0eb535 Merge branch 'szzh' into develop 2015-08-01 17:47:41 +08:00
sw 28e5a836af Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-01 17:47:27 +08:00
ouyangxuhua d1418f1bbe 主题--id 2015-08-01 17:45:40 +08:00
cxt 86ddbb43c3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-01 17:45:17 +08:00
ouyangxuhua 188c056e95 问题跟踪的问题,改为问题的id 2015-08-01 17:42:58 +08:00
cxt 36456f8b2d 私有项目/课程的项目动态超链接无法点击,修改样式并给出相应提示信息。 2015-08-01 17:38:48 +08:00
sw 41ff4e33ff 编辑编程作业通过测试显示的是成功而不是正确 2015-08-01 17:24:07 +08:00
huang 77e23c319e Merge branch 'szzh' into dev_hjq 2015-08-01 17:10:49 +08:00
huang 12f2cf8cc8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-01 16:58:30 +08:00
huang d3e0282115 去掉版本 -- 不共享功能 2015-08-01 16:58:06 +08:00
sw 9a7a1def66 编程作业有多个输入输出测试集一样时只有第一个会进行编译结果的赋值 2015-08-01 16:38:58 +08:00
sw d1569c18ba 编程作品不现实缺评扣分 2015-08-01 16:20:46 +08:00
sw 709f6f5aee Merge branch 'szzh' into develop 2015-08-01 16:04:43 +08:00
sw cb536057c7 Merge branch 'develop' into szzh 2015-08-01 15:59:06 +08:00
ouyangxuhua bc779a3d8f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-01 15:52:02 +08:00
ouyangxuhua e8576c4e27 Merge branch 'ouyangxuhua' into szzh 2015-08-01 15:51:25 +08:00
ouyangxuhua 893e7ae99d Merge branch 'szzh' into ouyangxuhua 2015-08-01 15:49:39 +08:00
cxt e558251d37 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-01 15:46:49 +08:00
sw b9f2c53a79 作品列表500 2015-08-01 15:43:39 +08:00
sw 824208077e 老板的hearder界面,点击留言跳转到留言界面 2015-08-01 15:31:58 +08:00
sw cf1b78b42b Merge branch 'szzh' into develop 2015-08-01 15:19:08 +08:00
huang 31f71c474c Merge branch 'szzh' into develop 2015-08-01 15:17:18 +08:00
sw fe2d621dc3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/helpers/users_helper.rb
2015-08-01 15:17:01 +08:00
huang 7ac3eec94b Merge branch 'dev_hjq' into szzh 2015-08-01 15:16:12 +08:00
huang 6c6d46a4c6 Merge branch 'szzh' into dev_hjq 2015-08-01 15:15:31 +08:00