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.

xianbo e52886cf46 Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop ... Conflicts: app/views/softapplications/show.html.erb db/schema.rb		11 years ago
..
_contest_list.html.erb	修正竞赛子站首页和竞赛列表页面中参赛作品的统计数量（由于以前的参赛项目有私有项目导致统计数量有误）	11 years ago
_form_contest.html.erb	all	11 years ago
_history.html.erb	all	11 years ago
_list_projects.html.erb	添加竞赛模块中参赛项目的分页功能	11 years ago
_list_softapplications.html.erb	调整字数限制	11 years ago
_new.html.erb	all	11 years ago
_new_join.html.erb	all	11 years ago
_pre_show.html.erb	all	11 years ago
_project_list.html.erb	all	11 years ago
_set_join.js.erb	all	11 years ago
_softapplication_list.html.erb	调整了参赛应用列表布局显示样式	11 years ago
add.js.erb	all	11 years ago
add_softapplication.js.erb	给应用添加开发人员字段及显示	11 years ago
back.js.erb	all	11 years ago
create.js.erb	all	11 years ago
destroy.js.erb	all	11 years ago
index.html.erb	添加竞赛列表页面中的超链接	11 years ago
more.js.erb	all	11 years ago
new.js.erb	all	11 years ago
new_contest.html.erb	all	11 years ago
new_join.js.erb	all	11 years ago
set_reward_project.js.erb	教师评奖功能初步完成	11 years ago
set_reward_softapplication.js.erb	教师评奖功能初步完成	11 years ago
settings.html.erb	Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop	11 years ago
show_attendingcontest.html.erb	Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop	11 years ago
show_contest.html.erb	1. Three expressions syntax	11 years ago
show_contest_user.html.erb	all	11 years ago
show_participator.html.erb	all	11 years ago
show_project.html.erb	添加竞赛模块中参赛项目的分页功能	11 years ago
show_softapplication.html.erb	修改弹出新页面	11 years ago