socialforge/app/views/layouts
huang 364c9a3a9e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	db/schema.rb
合并
2015-11-30 14:35:37 +08:00
..
_base_ad.html.erb
_base_college_header.html.erb
_base_enterprise_header.html.erb
_base_feedback.html.erb 增加关闭反馈功能 2015-09-24 11:31:07 +08:00
_base_footer.html.erb
_base_footer_new.html.erb
_base_footer_public.html.erb
_base_header.html.erb
_base_header_new.html.erb 解决图标点两次的问题 2015-08-24 11:11:45 +08:00
_base_home_menu.html.erb
_base_homework_attach.html.erb
_base_softapplication_index_top_content.html.erb
_base_softapplication_top_content.html.erb
_bootstrap_base_footer.html.erb
_bootstrap_base_header.html.erb
_footer.html.erb 贴吧列表和主题列表 按不同的规则排序的时候,如果翻页了,又回到了综合排序的问题 2015-09-19 12:32:11 +08:00
_join_exit_project.html.erb
_logined_header.html.erb tip 2015-11-30 13:22:01 +08:00
_new_feedback.html.erb 答疑群 描述更改 2015-11-03 15:51:11 +08:00
_new_footer.html.erb
_new_header.html.erb
_no_content.html.erb
_org_courses.html.erb 将课程动态加入组织动态中 2015-11-18 16:05:08 +08:00
_org_projects.html.erb 将课程动态加入组织动态中 2015-11-18 16:05:08 +08:00
_point_browser.html.erb
_tag.html.erb
_tag_name.html.erb
_unlogin_header.html.erb tip 2015-11-30 13:22:01 +08:00
_user_brief_introduction.html.erb 更新css,编辑个人简介功能BUG 2015-08-25 10:30:31 +08:00
_user_courses.html.erb 鼠标移到个人主页的课程列表时,显示tip:课程名,课程学期 2015-09-01 09:34:03 +08:00
_user_courses_list.html.erb
_user_fans_list.html.erb
_user_homework_list.html.erb
_user_project_list.html.erb
_user_projects.html.erb 用户课程或项目名称过长时的显示 2015-08-24 17:04:40 +08:00
_user_watch_btn.html.erb 添加关注与取消关注 2015-08-29 14:34:59 +08:00
_user_watch_list.html.erb
admin.html.erb
base.html.erb 火狐MathJax显示公式错误,还是不能不用图形字体 2015-11-18 10:55:55 +08:00
base.html_old.erb
base_.html.erb
base_admin.html.erb 学校列表分页 2015-10-16 14:48:59 +08:00
base_bids.html.erb
base_contest.html.erb
base_courses.html.erb 英雄榜、贡献榜显示真实姓名 2015-11-30 10:20:47 +08:00
base_forums.html.erb 火狐MathJax显示公式错误,还是不能不用图形字体 2015-11-18 10:55:55 +08:00
base_homework.html.erb 火狐MathJax显示公式错误,还是不能不用图形字体 2015-11-18 10:55:55 +08:00
base_memos.html.erb 火狐MathJax显示公式错误,还是不能不用图形字体 2015-11-18 10:55:55 +08:00
base_newcontest.html.erb
base_old.html.erb
base_opensource_p.html.erb
base_org.html.erb 组织中,重复的项目和组织不显示 2015-11-27 16:27:23 +08:00
base_projects.html.erb 火狐MathJax显示公式错误,还是不能不用图形字体 2015-11-18 10:55:55 +08:00
base_stores.html.erb
base_tags.html.erb 火狐MathJax显示公式错误,还是不能不用图形字体 2015-11-18 10:55:55 +08:00
base_users.html.erb 火狐MathJax显示公式错误,还是不能不用图形字体 2015-11-18 10:55:55 +08:00
base_users_new.html.erb 火狐MathJax显示公式错误,还是不能不用图形字体 2015-11-18 10:55:55 +08:00
base_welcome.html.erb
bootstrap_base.html.erb
contest_base.html.erb 火狐MathJax显示公式错误,还是不能不用图形字体 2015-11-18 10:55:55 +08:00
course_base.html.erb 火狐MathJax显示公式错误,还是不能不用图形字体 2015-11-18 10:55:55 +08:00
left.html.erb
login.html.erb 火狐MathJax显示公式错误,还是不能不用图形字体 2015-11-18 10:55:55 +08:00
mailer.html.erb
mailer.text.erb
new_base.html.erb 火狐MathJax显示公式错误,还是不能不用图形字体 2015-11-18 10:55:55 +08:00
new_base_user.html.erb 火狐MathJax显示公式错误,还是不能不用图形字体 2015-11-18 10:55:55 +08:00
right.html.erb
static_base.html.erb 火狐MathJax显示公式错误,还是不能不用图形字体 2015-11-18 10:55:55 +08:00
system_log.html.erb
users_base.html.erb 火狐MathJax显示公式错误,还是不能不用图形字体 2015-11-18 10:55:55 +08:00