Commit Graph

9057 Commits

Author SHA1 Message Date
ouyangxuhua 9e61ceefa9 系统消息修改 2015-09-11 09:48:16 +08:00
ouyangxuhua 06fea1bf1d 系统消息显示 2015-09-10 15:47:51 +08:00
ouyangxuhua fb155c8458 系统消息注释 2015-09-10 11:42:53 +08:00
ouyangxuhua 596c512d0a 系统消息 2015-09-10 11:39:53 +08:00
huang 6b0432c04c 添加job任务 2015-09-10 09:06:00 +08:00
ouyangxuhua 3db692dc39 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-09 17:42:55 +08:00
huang 0aa8c5b5cc 完成系统消息通知功能 2015-09-09 17:43:33 +08:00
ouyangxuhua 1feb7022c7 修改系统消息为kindeditor 2015-09-09 17:42:38 +08:00
huang 13397363db Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-09 17:06:16 +08:00
huang 66251c8d30 添加功能:管理员界面发送系统消息 2015-09-09 17:05:32 +08:00
ouyangxuhua 30efa6c8c7 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-09 11:42:21 +08:00
ouyangxuhua 20bef515da issue周报发送消息给所有管理员 2015-09-09 11:42:06 +08:00
huang 146d877254 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-09 10:15:38 +08:00
huang 1a6f81f302 用户申请,区分已读和未读 2015-09-09 10:15:05 +08:00
ouyangxuhua 71f8fca68b Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-08 17:32:00 +08:00
ouyangxuhua a7f2f0a6d2 项目版本库错误提示信息设置为flash.now[:error] 2015-09-08 17:31:16 +08:00
huang 51d964d371 点击消息链接定位到对应页面的某一点 2015-09-08 17:26:10 +08:00
huang 06753497bb Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-08 16:56:36 +08:00
huang 0746408a9d 增加用户申请加入项目消息提醒功能(管理员收到消息提醒) 2015-09-08 16:55:36 +08:00
ouyangxuhua 966bd8f94c admin配置界面编辑框样式修改 2015-09-08 16:31:19 +08:00
ouyangxuhua bff50aa769 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-08 15:28:15 +08:00
ouyangxuhua d01a529040 项目消息标题判断 2015-09-08 15:27:58 +08:00
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
ouyangxuhua 550b263c2c Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-08 09:11:17 +08:00
ouyangxuhua fb6688265c wiki删除后跳转 2015-09-07 17:16:25 +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