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 |
sw
|
4ca3d8be03
|
搜索栏样式
|
2015-08-25 16:35: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
|
44419eff04
|
rake db
|
2015-08-25 15:39:50 +08:00 |
huang
|
c6b460f520
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-08-25 15:37:29 +08:00 |
huang
|
9096fca298
|
留言消息发送策略
|
2015-08-25 15:37:08 +08:00 |
sw
|
b1195139f8
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-25 15:36:17 +08:00 |
sw
|
e2af9e26f8
|
个人主页报错
|
2015-08-25 15:35:45 +08:00 |
ouyangxuhua
|
67c31d59d0
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-08-25 15:20:44 +08:00 |
ouyangxuhua
|
03ac1ca37c
|
消息人物头像链接
|
2015-08-25 15:20:24 +08:00 |
lizanle
|
23d6b9c23a
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
2015-08-25 15:16:32 +08:00 |
lizanle
|
256ccedfe8
|
schema
|
2015-08-25 15:16:24 +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 |
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 |
sw
|
87ee2e744f
|
公共贴吧、课程、项目相关界面导航栏和底部导航栏修改
|
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 |
huang
|
716ffcfdc9
|
修改留言多余内容
|
2015-08-25 14:35:26 +08:00 |
huang
|
22e95d6d07
|
Merge branch 'develop' into dev_hjq
|
2015-08-25 14:34:49 +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 |
huang
|
d8ee82fc4e
|
Merge branch 'szzh' into develop
|
2015-08-25 14:00:36 +08:00 |
huang
|
323251c785
|
Merge branch 'dev_hjq' into szzh
|
2015-08-25 13:59:03 +08:00 |