Commit Graph

1163 Commits

Author SHA1 Message Date
cxt 1e320e63c6 底部导航的论坛反馈改为贴吧交流,帮助中心版权信息的换行修复 2015-09-01 10:20:12 +08:00
cxt fdfcefd1ed 鼠标移到个人主页的课程列表时,显示tip:课程名,课程学期 2015-09-01 09:34:03 +08:00
cxt e128a0e033 当鼠标移到新建课程/项目的图标按钮上时,给出相应的tip 2015-09-01 09:22:44 +08:00
cxt 1113a7938c 修复点击空白处返回新建课程/项目的页面 2015-08-31 16:53:41 +08:00
suntao d3869b03cd 资源库版面样式调整 2015-08-31 15:21:09 +08:00
suntao 3e9bb8a596 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/views/layouts/new_base_user.html.erb
2015-08-31 14:55:15 +08:00
suntao b0ff7f0ee2 页面间距调整,头像大小调整 2015-08-31 14:52:56 +08:00
sw 09a994f76a 职称增加副教授等职称 2015-08-29 18:54:34 +08:00
sw ca0c7a4fb0 个人主页职称 2015-08-29 18:51:35 +08:00
sw f81bab6319 课程回复 2015-08-29 17:19:03 +08:00
sw 1e9f5cebd2 首页查询问题 2015-08-29 17:04:44 +08:00
sw 9437188c9b 登录界面enter键监听 2015-08-29 16:55:49 +08:00
sw 6d768100f8 输入为空不提交表单 2015-08-29 16:14:02 +08:00
sw c0daebd75c 上传图片js 2015-08-29 14:46:30 +08:00
sw b65243ba62 添加关注、取消关注js刷新 2015-08-29 14:37:53 +08:00
sw a2ec65a0c9 添加关注与取消关注 2015-08-29 14:34:59 +08:00
sw 498775b0a8 登录界面多了一个<
教授职称
2015-08-29 14:24:54 +08:00
suntao a22727efb2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 14:08:58 +08:00
suntao 5e25b64004 提交按钮对齐 2015-08-29 14:08:38 +08:00
sw 4ade77f3d0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 12:04:57 +08:00
sw e455f93ee1 上传图片;浏览图片按钮 2015-08-29 12:04:35 +08:00
suntao 977f81e031 关注和取消关注,导航圆角 2015-08-29 11:41:12 +08:00
sw f01b5681a5 增加项目、课程的收起 2015-08-29 11:33:58 +08:00
sw e5bf355a17 导航栏搜索支持enter键 2015-08-29 11:28:02 +08:00
suntao 5f3532ac14 头像部分修改 2015-08-29 11:25:49 +08:00
suntao ada04e5e63 个人主页头像模块改动 2015-08-29 10:13:32 +08:00
sw 3f61a908d1 部分界面样式调整 2015-08-28 17:27:51 +08:00
sw 014881bd42 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	public/stylesheets/new_user.css
2015-08-28 17:02:49 +08:00
sw 02f7538200 个人描述为英文时不换行 2015-08-28 16:10:05 +08:00
suntao a19692a0c6 个人主页左侧修改 2015-08-28 14:50:48 +08:00
suntao 02120c778f 样式修改 2015-08-28 12:09:31 +08:00
suntao b6d58b1b58 样式调整 2015-08-28 11:55:34 +08:00
lizanle 0a898342d9 登录按钮可以用enter键 2015-08-27 10:01:13 +08:00
lizanle 41a8f9d6a2 底部去掉marginBottom:10px
登录界面加底部
2015-08-27 09:28:13 +08:00
sw 01c8ee3898 1、个人主页新建课程、新建项目、加入课程功能添加
2、新建课程时导航栏的修改
2015-08-26 17:54:41 +08:00
lizanle 9e9de44397 服务协议 2015-08-26 16:51:03 +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 a53b9f9049 留言模块 2015-08-26 15:49:05 +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 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
lizanle d735eee4a3 关注和取消关注 2015-08-26 11:41:32 +08:00
sw ad524f5a6c 取消课程、项目、贴吧等独自的搜索条,搜索统一使用导航栏搜索条 2015-08-25 19:41:22 +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