Commit Graph

7271 Commits

Author SHA1 Message Date
sw 419dedfa1a 课程作品列表搜索忽略大小写 2015-06-02 17:42:54 +08:00
sw faeee5bc0d 课程搜索报错 2015-06-02 17:17:34 +08:00
sw ad296e43b2 未启用匿评的作业,学生在提交作品之前无法看到其他学生的作品 2015-06-02 16:56:15 +08:00
sw 9f03e39e86 作业描述大于20行才显示更多按钮 2015-06-02 16:45:44 +08:00
sw e6af34e9f8 学生列表显示 2015-06-02 16:22:15 +08:00
guange be3680d4f3 支持doc docx pdf 2015-06-02 15:43:03 +08:00
sw b935f50b36 课程内作业列表、新建作业等路由关闭,相关页面、方法删除 2015-06-02 15:20:44 +08:00
sw 9f552365c2 课程动态数计算报错 2015-06-02 15:07:22 +08:00
sw 3dce6ec763 课程动态:暂时不现实老师创建作业 2015-06-02 14:59:58 +08:00
sw cc5171bc1d 解决冲突 2015-06-02 14:48:48 +08:00
sw 3d7d82747c Merge branch 'guange_dev' into szzh 2015-06-02 14:37:24 +08:00
sw bd6a057008 老师布置作业加入个人动态 2015-06-02 14:35:17 +08:00
sw c8128cffea 删除无效动态 2015-06-02 13:59:33 +08:00
sw 79f4e286cf 老师删除作业保报错 2015-06-02 11:59:59 +08:00
sw 66c02f0667 1、新编辑器增加HomeworkCommon的Type
2、老师创建作业加入老师个人动态
2015-06-02 11:58:21 +08:00
sw 8d23815169 数据迁移不完整 2015-06-02 11:42:12 +08:00
huang 64e56eca8e 邮件提醒,修改项目论坛提醒不全 2015-06-02 11:14:13 +08:00
huang 6cddb59a4a 修改邮件提醒:项目缺陷动态不能收到 2015-06-02 11:02:12 +08:00
sw bdbcc52320 评分计算的数据迁移 2015-06-02 11:01:49 +08:00
sw 9c336a01c8 超级管理员评分定义为教师评分 2015-06-02 10:47:10 +08:00
sw c1d753f634 数据迁移文件增加个人动态中的迁移 2015-06-02 10:09:05 +08:00
sw e4046851cf 1、作品列表 学号、姓名过长会换行
2、作品作业相关数据迁移
3、student_work缺少字段project_id
2015-06-02 09:33:34 +08:00
guange b3abf610d9 add rest_client 2015-06-01 23:10:25 +08:00
guange b6d22cfb31 添加文件预览接口 2015-06-01 23:02:55 +08:00
guange e786873061 还是缓存问题 2015-06-01 13:58:37 +08:00
guange adb21cc617 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-06-01 13:50:23 +08:00
guange 7bbd85f8c2 去除首页贴吧回复缓存 2015-06-01 13:50:06 +08:00
lizanle 5347d83f8f 用户搜索bug 2015-06-01 12:39:58 +08:00
sw 742ac5e7db Merge branch 'szzh' into develop 2015-06-01 11:13:01 +08:00
alan ac637d8bf0 Merge branch 'develop' into szzh 2015-06-01 10:43:43 +08:00
alan 70330f0f4b Merge branch 'develop' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
Conflicts:
	app/views/layouts/_user_project_list.html.erb

Signed-off-by: alan <547533434@qq.com>
2015-06-01 10:42:18 +08:00
alan 3967b632b5 去除导航的缓存
Signed-off-by: alan <547533434@qq.com>
2015-06-01 10:41:23 +08:00
alan 4332cfd416 Merge branch 'develop' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache 2015-06-01 10:38:53 +08:00
guange ee35de5447 忽略redis配置文件 2015-05-29 20:05:49 +08:00
sw 86e63b6081 Merge branch 'guange_dev' into develop 2015-05-29 19:36:00 +08:00
guange 97fe43c8a1 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-05-29 19:34:11 +08:00
guange f4c1cc839c 资源库标签显示错误 2015-05-29 19:33:33 +08:00
sw 0891af9e59 Merge branch 'szzh' into develop 2015-05-29 18:42:44 +08:00
guange 0eace6e598 cached导致的个人项目列表问题 2015-05-29 18:42:22 +08:00
sw 3ed76859a9 Merge branch 'guange_dev' into szzh 2015-05-29 18:41:54 +08:00
sw ff41bd35c7 Merge branch 'develop' into szzh 2015-05-29 18:39:16 +08:00
sw b5dc424714 bid超过20行才显示更多按钮 2015-05-29 18:35:19 +08:00
guange 21a143651a Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-05-29 18:27:32 +08:00
sw 8dd6bb4afa 课程首页公开资料数显示错误 2015-05-29 18:11:31 +08:00
sw a924ab5fac Merge branch 'szzh' into develop 2015-05-29 17:15:11 +08:00
sw 27314f8b54 Merge branch 'memcached_alan' into szzh 2015-05-29 17:14:20 +08:00
guange 2981d354ad Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-05-29 16:34:33 +08:00
sw 8423c01882 Merge branch 'szzh' into develop 2015-05-29 16:13:21 +08:00
sw a562cc7409 Merge branch 'dev_hjq' into szzh 2015-05-29 16:12:50 +08:00
huang d25c6cedd1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-29 16:09:46 +08:00