 cxt
|
e2990fb55c
|
控制动态描述的高度为20行，可展开和收起。
|
2015-10-22 17:42:02 +08:00 |
|
cxt
|
5e7b774111
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-22 16:57:50 +08:00 |
|
cxt
|
4b6f8efc5a
|
作品列表添加作业信息
|
2015-10-22 16:57:36 +08:00 |
 lizanle
|
35719f9c28
|
消息处理路由
|
2015-10-22 15:41:20 +08:00 |
 ouyangxuhua
|
4b8c65d12e
|
消息处理
|
2015-10-22 14:31:14 +08:00 |
|
cxt
|
32ad320cef
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-22 09:20:31 +08:00 |
|
cxt
|
7e21c00aed
|
添加作业的回复功能
|
2015-10-22 09:20:19 +08:00 |
|
ouyangxuhua
|
1c6f17936f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_user_message_course.html.erb
|
2015-10-22 09:12:08 +08:00 |
|
ouyangxuhua
|
7f1524ebe1
|
修复当学生被剔除课程成员时，消息页面报错的bug.
|
2015-10-22 09:05:51 +08:00 |
|
lizanle
|
75ee45b2d1
|
消息已阅！
|
2015-10-21 15:03:46 +08:00 |
|
lizanle
|
e44d95cca5
|
添加申请课程的加入身份
|
2015-10-21 14:52:00 +08:00 |
|
ouyangxuhua
|
0b8053c5d5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-20 17:32:19 +08:00 |
|
ouyangxuhua
|
ab97ba4aa0
|
增加请求加入课程消息
|
2015-10-20 17:31:58 +08:00 |
|
lizanle
|
0fffed55a6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-20 17:27:14 +08:00 |
|
lizanle
|
a817c3b81e
|
添加身份
|
2015-10-20 17:27:06 +08:00 |
 huang
|
511fda0b40
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-20 16:26:29 +08:00 |
|
huang
|
9e7adaf5bc
|
Merge branch 'dev_hjq' into szzh
|
2015-10-20 16:26:08 +08:00 |
|
ouyangxuhua
|
87b4c83247
|
修改不能参与匿评消息的关联删除；
看完消息后，更新相应的字段。
|
2015-10-20 16:19:32 +08:00 |
|
cxt
|
edf3cc9cc8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-20 16:04:42 +08:00 |
|
cxt
|
cc59b4c877
|
课程讨论区编辑帖子报错
|
2015-10-20 15:15:18 +08:00 |
|
lizanle
|
5da45ac806
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-20 14:39:13 +08:00 |
|
lizanle
|
a8b4bde77c
|
学校列表div 下拉分页 最大页 计算方法错误
|
2015-10-20 14:38:24 +08:00 |
|
huang
|
5a5cf430d3
|
0
|
2015-10-20 14:24:18 +08:00 |
|
huang
|
af4523815c
|
课程从公开改成私有
则该课程中所有的资源都变成私有
|
2015-10-20 11:03:47 +08:00 |
|
huang
|
c9eb7b4b90
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-20 10:48:05 +08:00 |
|
huang
|
290e61599f
|
对课程资源公开私有单独处理
|
2015-10-20 10:47:51 +08:00 |
 Tim
|
c4907531dc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-20 10:33:11 +08:00 |
|
cxt
|
0ee2d557cf
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-20 10:31:25 +08:00 |
|
Tim
|
17afc1a9fe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-20 10:31:18 +08:00 |
|
cxt
|
1808cf34f2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-20 10:31:01 +08:00 |
|
Tim
|
e11d5fccd4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-20 10:30:40 +08:00 |
|
huang
|
b172fa7512
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-20 10:30:22 +08:00 |
|
huang
|
515dad66e2
|
课程资源库附件单独JS实现
|
2015-10-20 10:30:09 +08:00 |
|
Tim
|
1dd0954a94
|
意见反馈宽度调整
|
2015-10-20 10:29:51 +08:00 |
|
ouyangxuhua
|
a5c220eac9
|
Merge branch 'dev_hjq' into szzh
|
2015-10-20 10:29:42 +08:00 |
|
cxt
|
03af199960
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-20 10:28:26 +08:00 |
|
cxt
|
d049a00655
|
删除课程动态中未发布问卷的动态
|
2015-10-20 10:28:16 +08:00 |
|
Tim
|
ad77104485
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-20 10:23:03 +08:00 |
|
Tim
|
f59593cc1c
|
学校信息修改样式更改
|
2015-10-20 10:22:47 +08:00 |
|
huang
|
ffc42e22f2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-20 10:11:58 +08:00 |
|
huang
|
b3cd3c48d2
|
修改私有样式
|
2015-10-20 10:11:43 +08:00 |
|
lizanle
|
4c4188835a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-20 10:11:22 +08:00 |
|
lizanle
|
9330418668
|
学校列表div 下拉分页
|
2015-10-20 10:11:07 +08:00 |
|
cxt
|
9f51b4e345
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-20 09:56:01 +08:00 |
|
cxt
|
90ee4bbe60
|
删除空的课程动态
|
2015-10-20 09:55:51 +08:00 |
|
ouyangxuhua
|
d0c4230e69
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-10-20 09:49:26 +08:00 |
|
huang
|
357c04922a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-20 09:44:13 +08:00 |
|
huang
|
7157d09d03
|
Merge branch 'develop' into szzh
|
2015-10-20 09:43:57 +08:00 |
|
huang
|
1cfa8326aa
|
解决课程作业500问题
|
2015-10-20 09:43:22 +08:00 |
|
ouyangxuhua
|
50abd3785a
|
修改作业提示信息，在前面统一加上“某某您好！”
|
2015-10-20 09:42:26 +08:00 |