yanxd d47facc9e8 Merge branch 'szzh' into develop ... Conflicts: app/views/contests/show_attendingcontest.html.erb db/schema.rb		2014-05-20 14:33:50 +08:00
..
_contest_list.html.erb	修正竞赛子站首页和竞赛列表页面中参赛作品的统计数量（由于以前的参赛项目有私有项目导致统计数量有误）	2014-05-09 18:28:16 +08:00
_form_contest.html.erb	all	2014-04-03 22:38:18 +08:00
_history.html.erb	all	2014-04-03 22:38:18 +08:00
_list_projects.html.erb	添加竞赛模块中参赛项目的分页功能	2014-04-15 10:34:28 +08:00
_list_softapplications.html.erb	调整字数限制	2014-04-29 08:37:57 +08:00
_new.html.erb	all	2014-04-03 22:38:18 +08:00
_new_join.html.erb	all	2014-04-03 22:38:18 +08:00
_pre_show.html.erb	all	2014-04-03 22:38:18 +08:00
_project_list.html.erb	all	2014-04-03 22:38:18 +08:00
_set_join.js.erb	all	2014-04-03 22:38:18 +08:00
_softapplication_list.html.erb	调整了参赛应用列表布局显示样式	2014-04-16 08:46:04 +08:00
add.js.erb	all	2014-04-03 22:38:18 +08:00
add_softapplication.js.erb	给应用添加开发人员字段及显示	2014-04-14 09:50:36 +08:00
back.js.erb	all	2014-04-03 22:38:18 +08:00
create.js.erb	all	2014-04-03 22:38:18 +08:00
destroy.js.erb	all	2014-04-03 22:38:18 +08:00
index.html.erb	添加竞赛列表页面中的超链接	2014-04-19 14:19:21 +08:00
more.js.erb	all	2014-04-03 22:38:18 +08:00
new.js.erb	all	2014-04-03 22:38:18 +08:00
new_contest.html.erb	all	2014-04-03 22:38:18 +08:00
new_join.js.erb	all	2014-04-03 22:38:18 +08:00
set_reward_project.js.erb	教师评奖功能初步完成	2014-05-14 16:19:12 +08:00
set_reward_softapplication.js.erb	教师评奖功能初步完成	2014-05-14 16:19:12 +08:00
settings.html.erb	Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop	2014-04-25 11:22:33 +08:00
show_attendingcontest.html.erb	Merge branch 'szzh' into develop	2014-05-20 14:33:50 +08:00
show_contest.html.erb	1. Three expressions syntax	2014-05-08 15:27:16 +08:00
show_contest_user.html.erb	all	2014-04-03 22:38:18 +08:00
show_participator.html.erb	all	2014-04-03 22:38:18 +08:00
show_project.html.erb	添加竞赛模块中参赛项目的分页功能	2014-04-15 10:34:28 +08:00
show_softapplication.html.erb	修改弹出新页面	2014-04-18 17:04:29 +08:00