 huang
|
ae2aa2fedd
|
完成消息所有逻辑功能
|
2015-09-08 14:14:49 +08:00 |
|
huang
|
4c73e00eaf
|
作品消息状态更新
|
2015-09-08 09:43:41 +08:00 |
|
huang
|
8d72a9a539
|
去掉项目base冗余代码
|
2015-09-08 09:22:15 +08:00 |
|
huang
|
0a45e08488
|
1、消息为0的时候不显示 消息数和“全部设置已读”。
2、消息不为空，未读消息为空的时候不显示“全部设为已读”
|
2015-09-07 16:14:34 +08:00 |
|
huang
|
402c0b5173
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-07 16:08:51 +08:00 |
|
huang
|
103d61056d
|
完成功能：
1、添加“新的消息”分类
2、新注册用户默认点击时间
|
2015-09-07 16:08:04 +08:00 |
 ouyangxuhua
|
8c66adec1b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-07 15:24:10 +08:00 |
|
ouyangxuhua
|
ef011ad473
|
项目--邀请--发送邮件邀请用户,对输入的邮箱名进行判断，同时，修改提示样式
|
2015-09-07 15:23:34 +08:00 |
|
huang
|
ecd0056f0a
|
1、完成消息点击记后图标不显示红点的功能。
2、首次登陆以“最后登录时间”为准，后面以点击时间为准
|
2015-09-07 11:13:15 +08:00 |
|
huang
|
ed5f14c9eb
|
添加点击对应方法
|
2015-09-06 17:42:10 +08:00 |
|
huang
|
b2e25e8afc
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
2015-09-06 17:19:33 +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
|
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 |