Commit Graph

8122 Commits

Author SHA1 Message Date
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
sw 8dbaff537a 编程作业取消上线 2015-08-01 18:03:59 +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 9aeb604720 Merge branch 'ouyangxuhua' into szzh 2015-08-01 17:49:00 +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 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
sw 11afcaf17c 没有昵称的用户显示为:匿名用户
个人主页留言换行
2015-08-01 15:14:45 +08:00
huang 5e857d3472 ... 2015-08-01 15:14:36 +08:00
cxt 14673e79d8 个人主页标签相关问题的修复 2015-08-01 15:09:14 +08:00
sw c200634c27 个人主页--课程列表:加入课程失败后,加入课程按钮却能变为提交作业按钮 2015-08-01 15:08:11 +08:00
sw bed46c050f 创建课程、加入课程、创建作业数的显示 2015-08-01 15:04:39 +08:00
sw 793f477f1c 创建课程数、加入课程数、创建项目数、加入项目数统计问题 2015-08-01 14:58:41 +08:00
sw 1cd50693b5 登录失败错误信息提示 2015-08-01 14:31:22 +08:00
sw f5cfd7258d 修改编程作业时,对已通过测试、未通过测试显示的初始化,以及修改时的结果的存储 2015-08-01 14:27:32 +08:00
cxt 76ea93c89c 修改标签与上面块之间的间距 2015-08-01 13:47:58 +08:00
huang 41345c329d Merge branch 'dev_hjq' into szzh 2015-08-01 11:37:48 +08:00
huang 9d6ac57052 Merge branch 'szzh' into dev_hjq 2015-08-01 11:37:00 +08:00
huang 2d6909b4ee Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-01 11:36:47 +08:00
huang a915a35819 优化版本代码加提示 2015-08-01 11:35:48 +08:00
huang c376c0e38f 新建版本 --新页面设计 2015-08-01 11:25:33 +08:00
huang 3980e84817 修改wiki上传附件 附件名丢失的问题 2015-08-01 10:52:06 +08:00
sw cbbc93acbd 当标准代码内容改变时,自动还原所有的测试信息 2015-08-01 10:45:32 +08:00
huang ef8a7a7419 添加资源后,项目左侧统计数字自动刷新 2015-08-01 10:30:13 +08:00
cxt 8de8fe69cc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-01 10:02:23 +08:00
huang e70748fd81 去掉项目辅助工具(dts、yun) 2015-08-01 09:57:44 +08:00
sw 504d5a6b32 Merge branch 'develop' into szzh 2015-07-31 17:27:57 +08:00
sw 346f4d6018 作品列表界面,学生不显示输入输出 2015-07-31 17:27:43 +08:00
huang cecbf8b43f Merge branch 'szzh' into dev_hjq 2015-07-31 17:20:51 +08:00