You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

fanqiang 2c8580a4e8 Merge branch 'crawl' into develop ... Conflicts: app/controllers/tags_controller.rb app/views/tags/_tag.html.erb app/views/tags/_tag_search_results.html.erb app/views/tags/index.html.erb config/locales/zh.yml config/routes.rb db/schema.rb		11 years ago
..
_base_college_header.html.erb	…
_base_enterprise_header.html.erb	…
_base_footer.html.erb	d	11 years ago
_base_header.html.erb	fix	11 years ago
_base_home_menu.html.erb	…
_base_softapplication_index_top_content.html.erb	调整应用列表页面中的bug	11 years ago
_base_softapplication_top_content.html.erb	给参与竞赛的应用页面增加导航条	11 years ago
_no_content.html.erb	…
_tag.html.erb	…
_tag_name.html.erb	…
admin.html.erb	…
base.html.erb	学校选择形式改为弹窗	11 years ago
base.html_old.erb	…
base_.html.erb	…
base_admin.html.erb	…
base_bids.html.erb	…
base_contest.html.erb	给参与竞赛的应用页面增加导航条	11 years ago
base_courses.html.erb	revert the mistaken move:base_courses and base_project footer	11 years ago
base_forums.html.erb	暂且提交，增加活动失败。	12 years ago
base_homework.html.erb	作业layout显示提交作业的类型	11 years ago
base_memos.html.erb	issue:socialForge#381	11 years ago
base_newcontest.html.erb	s	11 years ago
base_old.html.erb	…
base_opensource_p.html.erb	Merge branch 'crawl' into develop	11 years ago
base_projects.html.erb	issue:socialForge#381	11 years ago
base_stores.html.erb	…
base_tags.html.erb	…
base_users.html.erb	临时措施：即使用户没有填写单位，页面也可以正常打开，而不是报错	11 years ago
left.html.erb	…
mailer.html.erb	left italic in email	11 years ago
mailer.text.erb	…
right.html.erb	…