socialforge/app/views/softapplications
xianbo e52886cf46 Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
	app/views/softapplications/show.html.erb
	db/schema.rb
2014-05-23 09:49:36 +08:00
..
_form.html.erb 调整参赛作品编辑页面中托管项目列表的显示宽度 2014-05-20 16:13:59 +08:00
_message_history.erb 给应用添加开发人员字段及显示 2014-04-14 09:50:36 +08:00
_new_message.erb Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop 2014-05-23 09:49:36 +08:00
_pre_show.html.erb 给应用添加开发人员字段及显示 2014-04-14 09:50:36 +08:00
back.js.erb 给应用添加开发人员字段及显示 2014-04-14 09:50:36 +08:00
create.js.erb 添加了新建参赛作品后弹出新建成功的提示框 2014-05-10 10:15:51 +08:00
create_message.js.erb 给应用添加开发人员字段及显示 2014-04-14 09:50:36 +08:00
edit.html.erb 修改参赛作品编辑页面说明文字:应用--》作品 2014-05-20 10:48:11 +08:00
index.html.erb 将参赛作品列表中所属竞赛的链接调整为跳转到我要参赛 2014-05-10 09:33:56 +08:00
more.js.erb 给应用添加开发人员字段及显示 2014-04-14 09:50:36 +08:00
new.html.erb 替换竞赛模块首页中竞赛和应用的图标并调整相应的格式 2014-04-22 19:27:31 +08:00
new.html.erb.BASE.erb 给应用添加开发人员字段及显示 2014-04-14 09:50:36 +08:00
new.html.erb.LOCAL.erb 给应用添加开发人员字段及显示 2014-04-14 09:50:36 +08:00
new.html.erb.REMOTE.erb 给应用添加开发人员字段及显示 2014-04-14 09:50:36 +08:00
new_message.js.erb 给应用添加开发人员字段及显示 2014-04-14 09:50:36 +08:00
show.html.erb Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop 2014-05-23 09:49:36 +08:00
show.html.erb.orig Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop 2014-05-23 09:49:36 +08:00