Commit Graph

27 Commits

Author SHA1 Message Date
sw 4ade77f3d0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 12:04:57 +08:00
suntao 977f81e031 关注和取消关注,导航圆角 2015-08-29 11:41:12 +08:00
sw e5bf355a17 导航栏搜索支持enter键 2015-08-29 11:28:02 +08:00
suntao 02120c778f 样式修改 2015-08-28 12:09:31 +08:00
suntao b6d58b1b58 样式调整 2015-08-28 11:55:34 +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
lizanle 70e9d75cc6 登陆后的搜索 2015-08-25 18:59:45 +08:00
sw 6ea185f250 修改资料页面跳转以及搜索弹出框样式 2015-08-25 18:17:31 +08:00
sw 30147c29ee 帮助中心页面跳转 2015-08-25 17:30:55 +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 bcd12e7e48 课程、项目相关页面 顶部导航栏和底部导航栏修改 2015-08-25 14:09:37 +08:00
sw 3ea198dc3d 标题栏作业界面静态页面的添加 2015-08-24 18:15:46 +08:00
sw a9c7c252e5 搜索功能js以及类型的选择 2015-08-24 16:16:07 +08:00
huang f26ccac3b9 Merge branch 'sw_new_course' into dev_hjq 2015-08-24 15:46:29 +08:00
sw 5fcb97b990 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
	public/stylesheets/new_public.css
2015-08-24 15:32:51 +08:00
sw dabef542fe 更新css文件,并实现未登陆用户时静态页面显示 2015-08-24 15:30:11 +08:00
huang 3919f15806 调整消息提示样式及连接 2015-08-24 14:52:23 +08:00
lizanle 9a2e9a4ad2 Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course 2015-08-24 13:54:22 +08:00
lizanle 5628a43578 资源库和新版个人中心整合 2015-08-24 13:54:15 +08:00
huang 374c596a50 添加新图标,新base 2015-08-24 11:37:50 +08:00
sw f48e77901a 用户上传头像功能 2015-08-19 17:14:19 +08:00
sw d8da74a0d4 更新css,增加个人主页公共部分的动态效果 2015-08-19 14:43:12 +08:00
sw 752fe93d72 已登录用户header完成 2015-08-18 11:47:22 +08:00