huang 6ec7769c0e Merge branch 'dev_bigdata' into dev_shixun_project ... Conflicts: app/controllers/account_controller.rb app/views/layouts/_footer.html.erb app/views/layouts/_logined_header.html.erb app/views/layouts/base_contest_community.html.erb app/views/layouts/base_contests.html.erb app/views/layouts/base_course_community.html.erb app/views/layouts/base_courses.html.erb app/views/layouts/base_project_community.html.erb app/views/layouts/base_syllabus.html.erb app/views/layouts/new_base.html.erb app/views/layouts/new_base_user.html.erb app/views/layouts/new_base_user_show.html.erb public/stylesheets/css/structure.css		2017-03-14 09:30:02 +08:00
..
_change_user_email.html.erb	注册成功提示页与账号未激活提示页，增加‘更换邮箱的功能’	2017-02-23 09:32:13 +08:00
about_us.html.erb	css文件替换	2016-06-24 09:30:46 +08:00
agreement.html.erb	css文件替换	2016-06-24 09:30:46 +08:00
email_activation.html.erb	注册激活页面的更换邮箱，更换一次之后，第二次弹框显示的原邮箱不正确	2017-03-01 15:51:12 +08:00
email_valid.html.erb	注册激活页面的更换邮箱，更换一次之后，第二次弹框显示的原邮箱不正确	2017-03-01 15:51:12 +08:00
login.html.erb	新版一些改动	2017-01-23 18:34:33 +08:00
logout.html.erb	first commit	2013-08-01 10:33:49 +08:00
lost_password.html.erb	css文件替换	2016-06-24 09:30:46 +08:00
password_recovery.html.erb	密码重置	2015-08-27 15:15:06 +08:00
user_join.html.erb	新版一些改动	2017-01-23 18:34:33 +08:00