 sw
|
650d0c8cb5
|
匿评分配数量默认为3
|
2015-08-26 17:42:52 +08:00 |
|
sw
|
5b9c9312f5
|
留言界面样式修改
|
2015-08-26 17:42:02 +08:00 |
|
sw
|
afeaecc478
|
作业列表增加标题
|
2015-08-26 17:37:53 +08:00 |
|
sw
|
b7cbb9b0c2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/new_user.css
|
2015-08-26 17:31:37 +08:00 |
|
sw
|
049e27f15f
|
发布作业功能
|
2015-08-26 17:29:47 +08:00 |
 cxt
|
7c3544dfec
|
个人主页动态
|
2015-08-26 17:21:58 +08:00 |
|
cxt
|
706415dc6e
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-26 17:03:15 +08:00 |
|
cxt
|
2124b3c392
|
个人主页动态缺陷修复
|
2015-08-26 17:02:54 +08:00 |
 lizanle
|
9e9de44397
|
服务协议
|
2015-08-26 16:51:03 +08:00 |
|
lizanle
|
ba9a64360e
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
2015-08-26 16:50:36 +08:00 |
|
lizanle
|
65b5b467d4
|
服务协议
|
2015-08-26 16:50:26 +08:00 |
 huang
|
ef74d129c5
|
消息通知回复链接样式
|
2015-08-26 16:35:53 +08:00 |
|
huang
|
a54de0c8fb
|
Merge branch 'dev_hjq' into sw_new_course
|
2015-08-26 16:33:21 +08:00 |
|
lizanle
|
ccfd69602c
|
服务协议
|
2015-08-26 16:31:28 +08:00 |
|
huang
|
b824c3fa46
|
1、去掉多余的代码
2、消息样式列表过宽显示跨行问题
|
2015-08-26 16:31:28 +08:00 |
|
huang
|
6a986b98d9
|
Merge branch 'sw_new_course' into dev_hjq
Conflicts:
app/controllers/users_controller.rb
|
2015-08-26 16:14:50 +08:00 |
|
lizanle
|
5ec24913bb
|
留言背景色 留言头
|
2015-08-26 16:06:15 +08:00 |
|
lizanle
|
f43e312fbb
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
2015-08-26 15:49:11 +08:00 |
|
lizanle
|
a53b9f9049
|
留言模块
|
2015-08-26 15:49:05 +08:00 |
|
sw
|
af2434809b
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-26 15:47:05 +08:00 |
|
huang
|
7340a664f2
|
链接颜色
|
2015-08-26 15:42:12 +08:00 |
|
cxt
|
eed1939d2f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-26 15:25:15 +08:00 |
|
cxt
|
048319ef8e
|
个人主页
|
2015-08-26 15:24:57 +08:00 |
|
sw
|
4fe3ba2442
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-26 15:23:41 +08:00 |
|
sw
|
a08d32d0f3
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-26 15:18:05 +08:00 |
|
sw
|
e2869faa08
|
日历选择器的样式调整
|
2015-08-26 15:17:56 +08:00 |
|
huang
|
334e6dbd55
|
消息未读样式
|
2015-08-26 15:14:25 +08:00 |
|
lizanle
|
24892c9645
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
2015-08-26 15:08:08 +08:00 |
|
lizanle
|
7f19295b88
|
服务协议
|
2015-08-26 15:07:59 +08:00 |
|
huang
|
bc563119d6
|
Merge branch 'sw_new_course' into dev_hjq
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/new_user.css
|
2015-08-26 15:04:44 +08:00 |
|
sw
|
47b20a7633
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-26 14:50:33 +08:00 |
|
sw
|
8247a29b85
|
只有admin用户可以修改个人简介
|
2015-08-26 14:50:01 +08:00 |
|
huang
|
1dce1a2a4c
|
老师更新作品评阅消息通知
区分第一次评阅和后面的评阅
|
2015-08-26 14:47:53 +08:00 |
|
lizanle
|
d500ea0790
|
关注人数变化
|
2015-08-26 14:39:33 +08:00 |
|
lizanle
|
da47f5bb00
|
登录报错后就无法登录bug
|
2015-08-26 14:23:25 +08:00 |
|
sw
|
7081fc9975
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-26 14:11:47 +08:00 |
|
lizanle
|
cb61816d9a
|
登录字样写错了
|
2015-08-26 14:12:18 +08:00 |
|
sw
|
686af68026
|
关注、粉丝、编辑资料页面样式问题
|
2015-08-26 14:11:28 +08:00 |
|
sw
|
f0a4d364b0
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-26 13:56:53 +08:00 |
|
sw
|
ccfa93be66
|
老师布置作业界面
|
2015-08-26 13:56:37 +08:00 |
|
lizanle
|
d735eee4a3
|
关注和取消关注
|
2015-08-26 11:41:32 +08:00 |
|
sw
|
757da1ec0a
|
调整编辑资料样式
|
2015-08-26 09:36:05 +08:00 |
|
sw
|
aa28b5ba6a
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-26 09:14:44 +08:00 |
|
lizanle
|
4ee571e586
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
2015-08-26 09:11:10 +08:00 |
|
lizanle
|
cf12ee877e
|
编辑资料的时候个人说明隐藏
|
2015-08-26 09:11:03 +08:00 |
|
huang
|
0007b720b3
|
修改描述
|
2015-08-26 09:01:02 +08:00 |
|
cxt
|
cccc0577c7
|
个人动态
|
2015-08-26 08:51:39 +08:00 |
|
cxt
|
fce523606c
|
个人主页
|
2015-08-25 20:08:52 +08:00 |
|
sw
|
ab7fd7bc8f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-25 20:06:37 +08:00 |
|
sw
|
18029fcb22
|
111
|
2015-08-25 20:06:25 +08:00 |