 cxt
|
ebd056a4b9
|
Merge branch 'develop' into szzh
|
2015-08-17 10:41:28 +08:00 |
 sw
|
5c1661a65a
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-08-15 19:48:13 +08:00 |
 guange
|
d36da76685
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-08-15 19:47:53 +08:00 |
|
sw
|
c97ec1a370
|
111
|
2015-08-15 19:47:50 +08:00 |
|
sw
|
0ba9cfe5dd
|
提升迁移文件效率
|
2015-08-15 19:47:24 +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 |
|
sw
|
92752add5f
|
Merge branch 'szzh' into develop
|
2015-08-15 17:08:15 +08:00 |
 lizanle
|
421f86cdaf
|
资源库
|
2015-08-15 17:07:50 +08:00 |
|
cxt
|
da20f6bc89
|
超级管理员新增功能：留言列表、帖子、通知、最近登录用户列表、作业
|
2015-08-15 17:06:50 +08:00 |
|
lizanle
|
89b9a5c09d
|
资源库
|
2015-08-15 17:06:41 +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 |
|
sw
|
50fa03d00c
|
发布问卷时，该问卷才显示在动态，取消发布后取消显示该动态
|
2015-08-14 14:44:31 +08:00 |
|
sw
|
35d6c76a8e
|
部分课程资源创建时间不正确
|
2015-08-14 13:55:46 +08:00 |
|
huang
|
a5c941f48c
|
课程发布通知消息提示
|
2015-08-14 10:19:59 +08:00 |
|
sw
|
5cf6b7e76a
|
课程发布时间--->创建时间
|
2015-08-14 09:38:24 +08:00 |
|
huang
|
6334df531e
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-08-14 08:56:08 +08:00 |
|
huang
|
b958340ab6
|
Merge branch 'szzh' into dev_hjq
|
2015-08-14 08:55:41 +08:00 |
|
huang
|
0917030395
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-14 08:55:18 +08:00 |
|
huang
|
2c865069d3
|
所有消息显示功能
|
2015-08-13 22:33:08 +08:00 |
|
huang
|
510613f9a4
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-08-13 18:34:29 +08:00 |
|
huang
|
deb3383ad9
|
Merge branch 'szzh' into dev_hjq
|
2015-08-13 18:34:04 +08:00 |
|
huang
|
c903325352
|
缺陷状态更新消息提醒
留言消息提醒
|
2015-08-13 16:55:25 +08:00 |
|
sw
|
3e9f3f4e70
|
课程动态，无对应数据时报错
|
2015-08-13 15:00:13 +08:00 |
|
sw
|
4b5022bfc6
|
课程动态报错
|
2015-08-13 14:56:01 +08:00 |
|
huang
|
69050b4271
|
指派给自己的缺陷不发送消息提示
|
2015-08-13 13:59:15 +08:00 |
|
sw
|
23f8bd8312
|
搜索课程结果列表课程动态
|
2015-08-13 11:47:08 +08:00 |
|
sw
|
29092db557
|
我的课程/我的项目按照课程/项目最新动态的时间排序
|
2015-08-13 11:10:09 +08:00 |
|
sw
|
b036d5b63d
|
网站首页、个人主页、项目、课程等页面header项目/课程下拉框按照最新的动态更新时间排序
|
2015-08-13 11:08:02 +08:00 |
|
huang
|
fbf21fc51b
|
清除旧版本消息提示
|
2015-08-13 10:12:19 +08:00 |
|
huang
|
5dd2befe88
|
添加消息看过后即不显示功能
|
2015-08-13 10:10:01 +08:00 |
 ouyangxuhua
|
11ad8d6d42
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-12 17:48:42 +08:00 |