cxt e3150716f3 Merge branch 'dev_bigdata' into dev_shixun_project ... Conflicts: app/views/layouts/_footer.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/new_base.html.erb app/views/layouts/new_base_user.html.erb db/schema.rb public/stylesheets/css/structure.css public/stylesheets/font/FontAwesome.otf public/stylesheets/font/fontawesome-webfont.eot public/stylesheets/font/fontawesome-webfont.svg public/stylesheets/font/fontawesome-webfont.ttf public/stylesheets/font/fontawesome-webfont.woff public/stylesheets/font2/FontAwesome.otf public/stylesheets/font2/fontawesome-webfont.eot public/stylesheets/font2/fontawesome-webfont.svg public/stylesheets/font2/fontawesome-webfont.ttf public/stylesheets/font2/fontawesome-webfont.woff public/stylesheets/fonts/FontAwesome.otf public/stylesheets/fonts/fontawesome-webfont.eot public/stylesheets/fonts/fontawesome-webfont.svg public/stylesheets/fonts/fontawesome-webfont.ttf public/stylesheets/fonts/fontawesome-webfont.woff		2017-03-24 16:17:01 +08:00
..
at	加上atall	2016-03-11 18:50:37 +08:00
cache	删除帖子也要更新动态	2015-06-19 14:49:18 +08:00
gitlab	tpm权限控制	2017-03-23 17:41:32 +08:00
grack	报告人员只能克隆，不能提交，其他可以克隆和提交	2015-07-04 22:29:25 +08:00
sms	新版登录和注册	2017-03-24 16:05:52 +08:00
utils	头像上传调整	2017-03-17 17:40:26 +08:00
utils.rb	上传头像会进行压缩	2015-05-08 14:28:17 +08:00