Commit Graph

8444 Commits

Author SHA1 Message Date
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
sw 59fe95bf33 去掉部分重复的CSS 2015-08-25 17:26:40 +08:00
sw 994a4188ce 未登录情况下,导航栏样式问题 2015-08-25 17:13:09 +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
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
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
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 38f8aa5ba4 更新css文件 2015-08-24 18:25:33 +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
sw 3ea198dc3d 标题栏作业界面静态页面的添加 2015-08-24 18:15:46 +08:00
cxt 2e5916cf5e Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
	app/controllers/admin_controller.rb
2015-08-24 18:01:51 +08:00
cxt 51c2f595d1 个人主页动态 2015-08-24 17:45:09 +08:00
sw 26c5592d29 用户课程或项目名称过长时的显示 2015-08-24 17:04:40 +08:00
lizanle 5bf7aeb430 资源库css小改动 2015-08-24 16:35:10 +08:00
lizanle 39b022f696 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 16:25:09 +08:00
lizanle 86d2f5342c 登陆界面 2015-08-24 16:22:22 +08:00
lizanle 614743d8d4 登陆界面 2015-08-24 16:22:06 +08:00
sw a9c7c252e5 搜索功能js以及类型的选择 2015-08-24 16:16:07 +08:00
sw e746a7764f 处理被还原的css 2015-08-24 15:36:32 +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
sw fe91442c96 课程列表已关闭课程标识出来 2015-08-24 15:18:07 +08:00
sw 7f2f2c5d40 个人主页,项目更多功能 2015-08-24 14:53:35 +08:00
lizanle 12b89e2c81 可拖动的框暂时做不了。 2015-08-24 14:53:30 +08:00
sw 2d75fea96b 课程点击更多按钮显示 2015-08-24 14:44:22 +08:00
lizanle 9a2e9a4ad2 Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course 2015-08-24 13:54:22 +08:00