 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 |
|
huang
|
caf8885dfd
|
Merge branch 'dev_hjq' into szzh
|
2015-08-26 09:17:46 +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 |
|
sw
|
ad524f5a6c
|
取消课程、项目、贴吧等独自的搜索条，搜索统一使用导航栏搜索条
|
2015-08-25 19:41:22 +08:00 |
|
huang
|
627ca059ca
|
解决issue的更新
和新建问题
|
2015-08-25 19:30:22 +08:00 |
|
cxt
|
e4c9f05c7b
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-25 19:24:37 +08:00 |
|
cxt
|
bd00870eba
|
个人主页
|
2015-08-25 19:24:23 +08:00 |
|
sw
|
56a1283033
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-25 19:19:41 +08:00 |
|
sw
|
d8b87ccc37
|
作业列表滚动到底部显示下面10条作业
|
2015-08-25 19:18:56 +08:00 |
|
lizanle
|
5c43c902c4
|
编辑资料css
|
2015-08-25 19:07:59 +08:00 |
|
lizanle
|
70e9d75cc6
|
登陆后的搜索
|
2015-08-25 18:59:45 +08:00 |
|
sw
|
bedc364275
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/views/layouts/_unlogin_header.html.erb
|
2015-08-25 18:26:25 +08:00 |
|
lizanle
|
d2135f7204
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
2015-08-25 18:27:00 +08:00 |
|
lizanle
|
0be3ef0a65
|
搜索
|
2015-08-25 18:26:54 +08:00 |
|
sw
|
767fc67686
|
已过期课程显示为darkgrey
|
2015-08-25 18:22:46 +08:00 |
|
sw
|
6ea185f250
|
修改资料页面跳转以及搜索弹出框样式
|
2015-08-25 18:17:31 +08:00 |
|
sw
|
ffe40b399d
|
个人动态表重构
|
2015-08-25 17:54:29 +08:00 |
 ouyangxuhua
|
10e39a6967
|
发帖的消息内容显示的是帖子的主题
|
2015-08-25 17:42:39 +08:00 |
|
ouyangxuhua
|
24f26749c0
|
修改memo对应的memo_messages的viewed字段
|
2015-08-25 17:41:59 +08:00 |
|
sw
|
30147c29ee
|
帮助中心页面跳转
|
2015-08-25 17:30:55 +08:00 |
|
sw
|
a32d6697ce
|
点击确实图标，跳转到登录界面
|
2015-08-25 17:27:28 +08:00 |
|
sw
|
59fe95bf33
|
去掉部分重复的CSS
|
2015-08-25 17:26:40 +08:00 |
|
sw
|
994a4188ce
|
未登录情况下，导航栏样式问题
|
2015-08-25 17:13:09 +08:00 |
|
ouyangxuhua
|
0056fa9db3
|
修改了课程问卷的link_to以及对应的course_messages的viewed字段
|
2015-08-25 17:06:38 +08:00 |
|
ouyangxuhua
|
f56d9ed265
|
设置作业对应的forge_messages表的viewed字段
|
2015-08-25 16:42:29 +08:00 |
|
sw
|
5ce89aa8bc
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-25 16:35:51 +08:00 |
|
lizanle
|
c360bdaf7d
|
logout
|
2015-08-25 16:39:22 +08:00 |
|
sw
|
79f3a069cb
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-25 16:35:36 +08:00 |