xianbo bb4d141b0e erge branch 'competition' into develop ... Conflicts: app/views/layouts/base_newcontest.html.erb		2014-04-21 08:46:08 +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	footer logo modify	2014-04-19 11:04:44 +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
_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	fix main page navigation	2014-03-29 11:03:04 +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	暂且提交，增加活动失败。	2014-03-13 22:06:49 +08:00
base_courses.html.erb	revert the mistaken move:base_courses and base_project footer	2014-04-17 09:03:39 +08:00
base_forums.html.erb	暂且提交，增加活动失败。	2014-03-13 22:06:49 +08:00
base_homework.html.erb	作业layout显示提交作业的类型	2014-04-10 09:34:09 +08:00
base_memos.html.erb	暂且提交，增加活动失败。	2014-03-13 22:06:49 +08:00
base_newcontest.html.erb	修改首页显示部分数据	2014-04-19 10:56:18 +08:00
base_old.html.erb	修改了tag的显示	2013-08-12 20:18:10 +08:00
base_projects.html.erb	回复了项目页面中的头像	2014-04-18 09:28:44 +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-04-18 14:46:32 +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