Commit Graph

7101 Commits

Author SHA1 Message Date
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 7197c33be4 注释掉暂时未完成的功能 2015-05-29 16:07:57 +08:00
sw 007aa00174 学生匿评打分之后,作品列表显示不正确 2015-05-29 16:05:41 +08:00
huang 697f891546 私有项目邮件邀请权限认证 2015-05-29 16:04:21 +08:00
sw eef59d9f5d 评分列表可以查看助教和老师的真实信息 2015-05-29 15:50:26 +08:00
sw fc5be22a03 评分列表学生看不到匿评用户的用户信息 2015-05-29 15:47:03 +08:00
sw a9235bef2f 1、匿评作品列表,得分显示为我的评分
2、匿评作品列表,不是我的作品用户名显示为匿名,学号不显示
2015-05-29 15:37:23 +08:00
huang d6aeb5b0e7 Merge branch 'szzh' into dev_hjq 2015-05-29 14:52:24 +08:00
huang ee7c1eff32 修改已注册用户邮件邀请异常 2015-05-29 14:50:27 +08:00
sw 8522140182 增加当前作品为匿评列表的判断 2015-05-29 14:37:38 +08:00
huang d9ae9c8061 修改邮件通知提醒(邀请:未激活
点击链接:激活并加入项目)
2015-05-29 14:36:44 +08:00
yutao 51a717c3dc ... 2015-05-29 14:36:14 +08:00
yutao b9337c8121 ... 2015-05-29 14:31:37 +08:00
lizanle 13b504cf17 Merge remote-tracking branch 'origin/szzh' into szzh 2015-05-29 14:22:54 +08:00
lizanle 849af9b04b 课程评论添加上拉分页 2015-05-29 14:22:43 +08:00
sw d4b3afb54e 1、学生匿评列表、我的作品列表取消排序
2、打分的权限设定
2015-05-29 14:06:16 +08:00
alan a76b345495 课程首页优化
Signed-off-by: alan <547533434@qq.com>
2015-05-29 11:40:12 +08:00
sw 91b17ea91f float类型得分计算最终得分时精度损失 2015-05-29 11:26:39 +08:00
sw 23a457af9e 评论回复不能为空 2015-05-29 11:00:35 +08:00
sw c8a4970f73 展开多个作品时点赞功能异常 2015-05-29 10:54:03 +08:00