Commit Graph

3 Commits

Author SHA1 Message Date
alan 8c19ec8aa0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/helpers/projects_helper.rb
	app/views/contest_notification/show.html.erb

Signed-off-by: alan <547533434@qq.com>
2014-09-15 10:58:14 +08:00
z9hang bd636115d5 #1177 正式版:项目--文档,点击下载上传文件的图标按钮,弹出窗口中有两个“新增”评审任务按钮,解决:屏蔽掉页面右下角那个 2014-09-04 15:41:59 +08:00
z9hang dee09aad75 修复导航bug 2014-07-22 15:59:35 +08:00