Commit Graph

8253 Commits

Author SHA1 Message Date
huang e9c7125822 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-19 11:22:06 +08:00
huang 2d282f73cb 项目讨论区 2015-08-19 11:21:48 +08:00
ouyangxuhua dd401aca1a Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-19 11:13:18 +08:00
ouyangxuhua ff3edf4d5e 消息显示 2015-08-19 11:12:47 +08:00
huang d657e9f3cc 新增 公共贴吧 消息通知 2015-08-19 11:06:39 +08:00
huang 90661066d3 区分课程/项目讨论区
课程项目/新闻 的消息显示方式
2015-08-18 16:53:26 +08:00
huang 5f29655406 issue状态更新显示 2015-08-18 16:35:19 +08:00
huang f9fc63402b Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-18 15:27:37 +08:00
huang 6b55474623 作品被评阅
作品被回复
消息通知
2015-08-18 15:27:16 +08:00
ouyangxuhua 9c4e89177f 留言 2015-08-18 14:44:46 +08:00
ouyangxuhua 3e4f726855 增加留言、指派给我 2015-08-18 14:43:15 +08:00
huang 4bc0e0eb69 项目模块消息添加
讨论区结构优化
2015-08-18 10:31:40 +08:00
huang 71f6927145 issue控制层消息 2015-08-17 16:37:05 +08:00
huang dd1dd143f6 添加项目缺陷消息显示 2015-08-17 16:15:40 +08:00
huang 9c8679eda8 铃铛样式 2015-08-17 16:07:45 +08:00
huang 4b07001d2a Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-17 16:04:36 +08:00
huang 472254019e 优化 2015-08-17 16:04:04 +08:00
ouyangxuhua 8f23a81261 消息显示样式更新 2015-08-17 15:56:16 +08:00
huang a677119ba0 修改界面样式 2015-08-17 15:20:46 +08:00
ouyangxuhua 7ae44af0ab Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-17 15:07:56 +08:00
ouyangxuhua e72eeb37c8 通知显示 2015-08-17 15:05:26 +08:00
huang fe077a27fb 消息查询代码优化 2015-08-17 15:04:09 +08:00
ouyangxuhua fda8c802fb 消息显示 2015-08-17 12:47:15 +08:00
ouyangxuhua 276653d9a2 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-17 11:37:14 +08:00
ouyangxuhua e6cf2f400c 添加样式 2015-08-17 11:35:47 +08:00
huang 239cba54d9 区分未读消息和已读消息 2015-08-17 11:34:29 +08:00
huang 505c112f96 Merge branch 'szzh' into dev_hjq 2015-08-17 10:44:00 +08:00
huang a71ff944c0 消息排序 2015-08-17 10:42:38 +08:00
huang 8d30bec8a4 Merge branch 'dev_hjq' into szzh 2015-08-15 17:10:44 +08:00
huang a38e91b3d3 Merge branch 'szzh' into dev_hjq 2015-08-15 17:10:02 +08:00
huang 07605d2d6d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-15 17:09:48 +08:00
cxt 58613e843b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	db/schema.rb
2015-08-15 17:09:10 +08:00
cxt da20f6bc89 超级管理员新增功能:留言列表、帖子、通知、最近登录用户列表、作业 2015-08-15 17:06:50 +08:00
huang fc244982bc 处理冲突
修改浏览器兼容问题
2015-08-15 17:06:19 +08:00
sw 5d000ea431 增加系统评分 2015-08-15 17:02:54 +08:00
huang 9a695b2d09 Merge branch 'szzh' into dev_hjq
Conflicts:
	app/models/poll.rb
2015-08-15 16:54:51 +08:00
huang f731af0134 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-15 16:51:28 +08:00
huang 4ffdd05a19 消息为空给出提示
连接鼠标经过颜色
2015-08-15 16:50:21 +08:00
huang 64e1d88285 去掉项目消息提示
未登录情况下访问跳转至403
2015-08-15 16:11:40 +08:00
huang 9b98bdcf5c 1、消息看过则不提示(方法实现)
2、添加消息新按钮
2015-08-15 15:44:44 +08:00
sw ac4d529ebc 编程作业取消,并设定匿评为内置功能 2015-08-15 10:45:56 +08:00
huang ed8c4ac906 不同类型消息发送 2015-08-15 02:11:18 +08:00
huang 2cb5292dc1 完成课程讨论区消息回复方法 2015-08-15 00:08:05 +08:00
huang 4013ff486a 消息界面调整 2015-08-14 17:35:10 +08:00
sw 9b424a5b17 课程问卷调查----点击问卷列表中如图空白处也返回相关问卷详情页面 2015-08-14 17:25:53 +08:00
huang 17fad1f291 课程(所有消息)--发布作业、新闻、问卷界面 2015-08-14 17:05:27 +08:00
sw 6051d0797d 课程搜索结果不正确 2015-08-14 16:24:43 +08:00
huang 7ea0fac774 1。发布作业消息提醒
2、新建问卷消息提醒
3、消息界面(未完成)
2015-08-14 15:48:23 +08:00
sw 16aea5ef42 迟交扣分0-50分 2015-08-14 15:44:54 +08:00
sw a8283a2861 点击问卷动态,跳转到答题界面 2015-08-14 14:46:14 +08:00