yanxd 70abac4c1e Merge branch 'competition' into develop ... Conflicts: app/controllers/application_controller.rb config/locales/en.yml config/locales/zh.yml db/schema.rb		2014-06-13 10:59:43 +08:00
..
_base_college_header.html.erb	修改了删除“我的账号”后的小问题	2013-10-30 21:22:44 +08:00
_base_enterprise_header.html.erb	修改了删除“我的账号”后的小问题	2013-10-30 21:22:44 +08:00
_base_footer.html.erb	Merge branch 'competition' into develop	2014-06-13 10:59:43 +08:00
_base_header.html.erb	fix	2014-04-18 16:35:48 +08:00
_base_home_menu.html.erb	新的课程	2013-09-29 19:46:59 +08:00
_base_homework_attach.html.erb	兼容历史数据	2014-06-11 17:00:23 +08:00
_base_softapplication_index_top_content.html.erb	竞赛子站英文版5	2014-06-06 10:46:56 +08:00
_base_softapplication_top_content.html.erb	竞赛子站英文版5	2014-06-06 10:46:56 +08:00
_bootstrap_base_footer.html.erb	test	2014-05-24 12:12:38 +08:00
_bootstrap_base_header.html.erb	bootstrap test	2014-05-26 11:27:10 +08:00
_no_content.html.erb	1、 网站中的搜索几乎都没有搜索后的提示语，这里应该加提示语，提示重新搜索。	2013-12-19 19:54:39 +08:00
_tag.html.erb	test	2013-08-22 16:42:13 +08:00
_tag_name.html.erb	test	2013-08-22 16:42:13 +08:00
admin.html.erb	prepare fix admin/	2013-11-15 10:55:11 +08:00
base.html.erb	学校选择形式改为弹窗	2014-04-23 09:22:13 +08:00
base.html_old.erb	first commit	2013-08-01 10:33:49 +08:00
base_.html.erb	first commit	2013-08-01 10:33:49 +08:00
base_admin.html.erb	修改了管理员权限	2013-11-16 11:09:10 +08:00
base_bids.html.erb	导航条下方的网站域名显示 forge ===> course	2014-02-25 11:27:36 +08:00
base_contest.html.erb	竞赛子站英文版5	2014-06-06 10:46:56 +08:00
base_courses.html.erb	完成了按钮样式	2014-06-09 11:30:18 +08:00
base_forums.html.erb	暂且提交，增加活动失败。	2014-03-13 22:06:49 +08:00
base_homework.html.erb	修复占位列表界面显示的作业描述样式不正确的问题	2014-06-12 16:43:02 +08:00
base_memos.html.erb	issue:socialForge#381	2014-04-24 10:16:47 +08:00
base_newcontest.html.erb	Merge branch 'competition' into develop	2014-06-13 10:59:43 +08:00
base_old.html.erb	修改了tag的显示	2013-08-12 20:18:10 +08:00
base_opensource_p.html.erb	修改合并之后的一些小问题	2014-05-05 15:33:24 +08:00
base_projects.html.erb	233	2014-05-22 15:33:38 +08:00
base_stores.html.erb	“按用户搜索”和“搜索”的区别，分别可以搜索什么？ 上面搜索删掉	2014-02-25 15:43:03 +08:00
base_tags.html.erb	modify shoew of project	2013-11-07 17:04:37 +08:00
base_users.html.erb	自己的用户界面也不现实邮箱	2014-05-19 12:00:13 +08:00
bootstrap_base.html.erb	bootstrap test	2014-05-26 11:27:10 +08:00
left.html.erb	稍该国际化	2013-08-20 09:39:36 +08:00
mailer.html.erb	left italic in email	2014-04-02 10:47:50 +08:00
mailer.text.erb	first commit	2013-08-01 10:33:49 +08:00
right.html.erb	完善tag的搜索功能。赞的显示优化。	2013-08-10 22:54:16 +08:00