Commit Graph

12915 Commits

Author SHA1 Message Date
ouyangxuhua a69997f6c7 Merge branch 'develop' into ouyangxuhua 2016-03-29 10:21:29 +08:00
cxt 0b0f484a5b 更新吴文植的分数 2016-03-29 09:50:37 +08:00
ouyangxuhua 598f69abb0 组织显示模式暂时隐藏 2016-03-29 09:35:07 +08:00
cxt b9f1ff3cd2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-29 09:24:24 +08:00
cxt ed0eb4aff3 学生作品详情无法打开 2016-03-29 09:24:11 +08:00
yuanke 0217dc0054 Merge branch 'yuanke' into develop 2016-03-29 09:14:31 +08:00
yuanke 213cf48c09 编程的输出和结果每行尾部的空格才用别的符号代替,中间的空格不管 2016-03-29 09:02:54 +08:00
ouyangxuhua 1a1d5b4c49 解决:发送功能在中文输入的情况下,会出现输入框内容增多的问题 2016-03-28 19:20:09 +08:00
cxt 8e7d25a483 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-28 17:20:52 +08:00
cxt f46985c8bc 作品点赞报500 2016-03-28 17:20:46 +08:00
huang 64f13a04cc 动态500问题 2016-03-28 17:09:42 +08:00
cxt 33c9331c7b 课程设置为私有/公开 课程头部未刷新 2016-03-28 15:35:24 +08:00
huang 9fc227d619 资源库问题 2016-03-28 14:50:26 +08:00
ouyangxuhua 67ff9fb6e2 组织显示模式功能 2016-03-28 13:03:13 +08:00
ouyangxuhua f4b4bf40de 增加显示组织显示模式字段,并且在新建组织和配置组织中能够选择 2016-03-28 11:24:31 +08:00
yuanke 5ee36148a4 Merge branch 'develop' into yuanke 2016-03-26 16:00:15 +08:00
yuanke 668de3ce4c Merge branch 'yuanke' into develop 2016-03-26 15:44:54 +08:00
yuanke f217c9097a 全部正确需要提示是否提交 2016-03-26 15:44:28 +08:00
yuanke 879a34a1a5 Merge branch 'develop' into yuanke 2016-03-26 15:43:52 +08:00
yuanke 1b4f525ad0 Merge branch 'yuanke' into develop 2016-03-26 15:00:30 +08:00
yuanke 88ba2bf556 编译错误处理 2016-03-26 14:59:51 +08:00
yuanke 5f783b3eb7 Merge branch 'develop' into yuanke 2016-03-26 14:51:26 +08:00
yuanke 77ad99e838 Merge branch 'yuanke' into develop 2016-03-26 14:51:11 +08:00
yuanke 0011b87d5d Merge branch 'develop' into yuanke 2016-03-26 14:49:33 +08:00
yuanke 5116d75eb7 编程作业空格用□表示 2016-03-26 14:48:57 +08:00
yuanke 879a941b01 Merge branch 'develop' into yuanke 2016-03-26 13:44:54 +08:00
yuanke e62ee2eade 修改评测问题 2016-03-26 13:44:13 +08:00
yuanke 2ceef7d3e0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 21:12:22 +08:00
yuanke f6a22d74da Merge branch 'yuanke' into develop 2016-03-25 21:11:45 +08:00
yuanke ef49715b08 编程测试加个results为空判断 2016-03-25 21:11:13 +08:00
yuanke a58ba8080c 编程作业加个日志 2016-03-25 21:06:25 +08:00
huang c7c96e0c6a 公共资源附件名编辑问题 2016-03-25 20:37:32 +08:00
huang fc006d64bb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 20:11:45 +08:00
huang 1bf494f661 课程推荐资源统计数 2016-03-25 20:11:26 +08:00
cxt 0d5bad1ddd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 20:11:00 +08:00
cxt 35faa12d4d 组织编辑文章无法提交 2016-03-25 20:10:53 +08:00
ouyangxuhua f0d6bb7fae Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 20:08:20 +08:00
ouyangxuhua 26b81fb8b3 组织文章列表回复问题解决 2016-03-25 20:07:55 +08:00
huang 777e585d4d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 19:21:07 +08:00
huang ba25f41bcb 添加教师统计数、学生统计数 2016-03-25 19:20:36 +08:00
ouyangxuhua 00d2542964 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 19:09:48 +08:00
ouyangxuhua 0f4d2e40fb 添加成员查询的语句,每个条件都要加上escape'/';组织栏目新建文章margin调整 2016-03-25 19:09:25 +08:00
yuanke 7be7bfb3f7 Merge branch 'develop' into yuanke 2016-03-25 18:31:06 +08:00
alan e764075bd6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 17:36:53 +08:00
alan 16831e19d9 merge 晓婷的课程留言 2016-03-25 17:34:32 +08:00
ouyangxuhua 2261081dc2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 17:17:15 +08:00
alan 6862480632 修改当用户没有项目时,报错 2016-03-25 17:16:45 +08:00
ouyangxuhua cca2527401 组织栏目新建文章样式调整 2016-03-25 17:16:36 +08:00
alan 4587e728d8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 17:07:42 +08:00
alan 05d66f41f9 fix bug when user don't have courses or projects 2016-03-25 17:07:30 +08:00