Commit Graph

9279 Commits

Author SHA1 Message Date
huang ed5f14c9eb 添加点击对应方法 2015-09-06 17:42:10 +08:00
cxt 7a28a65807 问卷动态不显示的缺陷修复 2015-09-06 17:40:55 +08:00
sw 955ef3d5fd 取消打印 2015-09-06 17:28:09 +08:00
sw 88397d58d0 1、讨论区新建帖子时增加权限判断
2、删除历史的匿名用户发布帖子的数据
2015-09-06 17:27:20 +08:00
huang b2e25e8afc Merge branch 'szzh' into dev_hjq
Conflicts:
	db/schema.rb
2015-09-06 17:19:33 +08:00
sw 62c657a827 用户留言增加登录判断,并且删除匿名用户留言数据 2015-09-06 17:06:05 +08:00
huang b771cc0fe1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-06 17:03:48 +08:00
sw 3164cab055 Merge branch 'szzh' into develop 2015-09-06 16:52:29 +08:00
sw abf053fc99 Merge branch 'develop' into szzh 2015-09-06 16:51:33 +08:00
sw 970de3374c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-06 16:50:39 +08:00
huang b89218a1b3 消息列表添加未读消息统计和“全部设为已读”功能
个人留言添加登录验证功能
2015-09-06 16:50:03 +08:00
sw 089c4ab490 1、用户只可查看自己的作业界面
2、发布作业增加权限判断和登录判断
2015-09-06 16:49:29 +08:00
sw e0376b5176 tag的导航栏和底部导航栏修改 2015-09-06 16:46:03 +08:00
sw 9ddb4f6683 删除匿名用户在缺陷中的回复 2015-09-06 16:38:24 +08:00
sw 093273968b 删除匿名用户在缺陷中的回复 2015-09-06 16:38:12 +08:00
sw 29379788fe 个人动态里回复缺陷留言增加登录判断 2015-09-06 16:31:15 +08:00
sw 9f8fee8267 个人积分报500 2015-09-06 15:46:28 +08:00
lizanle da43b00ddf Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-06 15:41:50 +08:00
lizanle 08fd7e125f 作业从资源库引入作者为别人的资源不能删除bug 2015-09-06 15:41:43 +08:00
huang c579ee51fe 增加点击时间表 2015-09-06 15:31:48 +08:00
cxt 8ecf70588d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-06 15:31:37 +08:00
cxt 55758c3c2f 筛选掉未发布的问卷动态 2015-09-06 15:31:26 +08:00
lizanle baf3d90836 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-06 15:19:11 +08:00
lizanle 704337fe56 全选所有资源,然后再用关键字过滤,全选checkbox和选择资源的个数应该清空 2015-09-06 15:16:32 +08:00
sw c71bfe73fb Merge branch 'szzh' into develop 2015-09-06 15:02:16 +08:00
sw f3e4812d00 修改计算项目得分方法名 2015-09-06 15:01:59 +08:00
sw fd976b4524 Merge branch 'develop' into szzh 2015-09-06 14:30:10 +08:00
sw 78cfed2b68 缺陷列表过滤修改 2015-09-06 14:29:04 +08:00
sw d3236aaa0c Merge branch 'szzh' into develop 2015-09-06 12:10:24 +08:00
sw 56a96acbf0 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-09-06 12:10:11 +08:00
sw 80f87bb36e Merge branch 'develop' into szzh 2015-09-06 12:09:48 +08:00
sw 6607e72ca4 user_score_helper.rb还原 2015-09-06 12:08:24 +08:00
huang bb15f00637 Merge branch 'develop' into dev_hjq 2015-09-06 11:56:40 +08:00
huang a30ee2cb10 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-09-06 11:55:59 +08:00
huang 87387273d8 解决消息链接点击一次多一条的问题 2015-09-06 11:55:20 +08:00
sw c4320f1bcc Merge branch 'szzh' into develop 2015-09-06 11:25:02 +08:00
sw 96a2beb342 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-06 11:23:54 +08:00
sw a1fba34858 Merge branch 'develop' into szzh
Conflicts:
	app/helpers/user_score_helper.rb
2015-09-06 11:23:38 +08:00
sw fe91ec1a85 1、历史数据导致项目动态中部分数据连接到课程相关页面
2、项目缺陷列表显示为整个系统的缺陷
3、用户得分的还原
4、样式调整
2015-09-06 11:22:27 +08:00
cxt d274b675db 去掉动态中的“缺陷描述”、“通知描述”等文字 2015-09-06 10:07:18 +08:00
sw cc9c84b333 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-06 09:31:33 +08:00
sw 1bda18afff 111 2015-09-06 09:31:09 +08:00
lizanle 9caa7a421a Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-06 09:05:37 +08:00
lizanle f8c85ccb83 个人动态页面 回复框固定高度减少 2015-09-06 09:05:24 +08:00
huang 4ce8282bd2 修改项目500问题 2015-09-03 19:19:46 +08:00
huang 6f64355a4a Merge branch 'szzh' into develop 2015-09-03 17:22:58 +08:00
huang f5b4b02fb6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-03 17:19:04 +08:00
huang dd06aa3a92 添加为空判断 2015-09-03 17:15:38 +08:00
guange 921d2fc422 erge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-03 16:59:24 +08:00
guange 6063f39eac 修改作业的一些链接和跳转问题 2015-09-03 16:58:38 +08:00