 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 |
 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 |
|
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 |
|
sw
|
30147c29ee
|
帮助中心页面跳转
|
2015-08-25 17:30:55 +08:00 |
|
sw
|
a32d6697ce
|
点击确实图标，跳转到登录界面
|
2015-08-25 17:27:28 +08:00 |
|
lizanle
|
c360bdaf7d
|
logout
|
2015-08-25 16:39:22 +08:00 |
|
lizanle
|
79bd438c87
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
2015-08-25 16:08:57 +08:00 |
|
lizanle
|
f2e406a416
|
登陆注册按钮改为页面跳转
|
2015-08-25 16:08:52 +08:00 |
|
sw
|
0d9a397453
|
登录、未登录搜索条件选择js
用户主页 show方法改造
|
2015-08-25 16:01:31 +08:00 |
|
sw
|
e2af9e26f8
|
个人主页报错
|
2015-08-25 15:35:45 +08:00 |
|
sw
|
c8b1bb5d64
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-25 15:09:21 +08:00 |
|
sw
|
87ee2e744f
|
公共贴吧、课程、项目相关界面导航栏和底部导航栏修改
|
2015-08-25 15:09:02 +08:00 |
|
cxt
|
097d52c07a
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-25 15:09:02 +08:00 |
|
cxt
|
4915f7977e
|
个人动态
|
2015-08-25 15:08:35 +08:00 |
|
lizanle
|
725143b894
|
登陆界面 错误信息提示
|
2015-08-25 14:51:07 +08:00 |
|
lizanle
|
8917a67c7c
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
2015-08-25 14:24:29 +08:00 |
|
lizanle
|
d25971f546
|
登陆界面
|
2015-08-25 14:24:20 +08:00 |
|
sw
|
bcd12e7e48
|
课程、项目相关页面 顶部导航栏和底部导航栏修改
|
2015-08-25 14:09:37 +08:00 |
|
sw
|
c93bc5be40
|
作业列表效果显示
|
2015-08-25 13:50:42 +08:00 |
|
sw
|
5b99effbc8
|
更新css，编辑个人简介功能BUG
|
2015-08-25 10:30:31 +08:00 |
|
sw
|
67c4561b28
|
我的课程、我的项目图标
|
2015-08-25 10:04:27 +08:00 |
|
cxt
|
9320cd18d3
|
个人动态的项目讨论动态
|
2015-08-25 09:50:36 +08:00 |
|
sw
|
d132c08a11
|
增加footer
|
2015-08-25 09:29:19 +08:00 |
|
sw
|
4bf92d0737
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-24 18:17:45 +08:00 |
|
sw
|
45d90639c9
|
静态页面的间距
|
2015-08-24 18:17:33 +08:00 |