 cxt
|
787b9af429
|
编辑作业时选不了资源库资源
|
2015-10-24 10:47:04 +08:00 |
 ouyangxuhua
|
16f0868df3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-23 16:28:40 +08:00 |
|
ouyangxuhua
|
bc3fbc270f
|
将学生改成同学
|
2015-10-23 16:28:22 +08:00 |
 Tim
|
4bedc81524
|
作品列表提交按钮位置调整
|
2015-10-23 16:26:58 +08:00 |
|
cxt
|
1ddb21d0a9
|
动态中的描述展开时去掉line-height，收起时添加line-height
|
2015-10-23 14:53:53 +08:00 |
|
cxt
|
adfe9ce7df
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-23 14:46:12 +08:00 |
|
cxt
|
fde4ce74ba
|
作业配置菜单增加评分设置
|
2015-10-23 14:45:56 +08:00 |
|
ouyangxuhua
|
4a188dc81d
|
对所有作业消息，统一在内容前加圆点，并且调整颜色
|
2015-10-23 14:28:24 +08:00 |
|
ouyangxuhua
|
9375227250
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-23 09:33:29 +08:00 |
|
ouyangxuhua
|
7845a0e712
|
修改作业消息的内容及样式
|
2015-10-23 09:33:16 +08:00 |
|
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 |
|
ouyangxuhua
|
f7545e623b
|
解决作业提交截止日期快到时，多发送一条消息的bug
|
2015-10-22 15:41:52 +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
|
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
|
290e61599f
|
对课程资源公开私有单独处理
|
2015-10-20 10:47:51 +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 |
|
ouyangxuhua
|
a5c220eac9
|
Merge branch 'dev_hjq' into szzh
|
2015-10-20 10:29:42 +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 |
|
ouyangxuhua
|
d0c4230e69
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-10-20 09:49:26 +08:00 |
|
ouyangxuhua
|
50abd3785a
|
修改作业提示信息，在前面统一加上“某某您好！”
|
2015-10-20 09:42:26 +08:00 |
|
huang
|
ce4da2e4af
|
去掉日志打印
|
2015-10-19 18:38:27 +08:00 |
|
huang
|
dc1e72a64b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-19 18:30:41 +08:00 |
|
huang
|
588bc2ed98
|
页面显示公开/私有
|
2015-10-19 18:30:28 +08:00 |
|
ouyangxuhua
|
ec1eddbf07
|
1.学生的“发布了作业”消息，链接到提交作业界面，而非作业提交列表；
2.开课学期具体到某年，如“秋季学期”，改为“2015年秋季学期”
|
2015-10-19 18:19:27 +08:00 |
|
lizanle
|
3386c53d76
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-19 17:10:25 +08:00 |
|
lizanle
|
4f1f34ac58
|
暂时屏蔽掉加入课程的分类情况
|
2015-10-19 17:10:10 +08:00 |
|
huang
|
dc5721497e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-19 17:04:18 +08:00 |