alan
							
						 | 
						
							
							
							
							
								
							
								620675b718
								
							
								
							
						 | 
						
							
							
								
								修改bug《创新竞赛--参赛作品列表,个别作品“所属类别”描述字体重叠》,《测试版:course/contest主页--贴吧动态:每条动态未清晰地分隔开来》
							
							
							
							
							
							
							
							Signed-off-by: alan <547533434@qq.com> 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 alan
							
						 | 
						
							
							
							
							
								
							
								ed292c8216
								
							
								
							
						 | 
						
							
							
								
								修改参数作品打分。把百分比变成人数
							
							
							
							
							
							
							
							Signed-off-by: alan <547533434@qq.com> 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 alan
							
						 | 
						
							
							
							
							
								
							
								e044f5b615
								
							
								
							
						 | 
						
							
							
								
								修改contest中出现的逻辑错误
							
							
							
							
							
							
							
							Signed-off-by: alan <547533434@qq.com> 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 alan
							
						 | 
						
							
							
							
							
								
							
								859a1122b7
								
							
								
							
						 | 
						
							
							
								
								修改contest中contestnotification列表和通知公告的界面
							
							
							
							
							
							
							
							Signed-off-by: alan <547533434@qq.com> 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								e765445279
								
							
								
							
						 | 
						
							
							
								
								#1298修复竞赛作品简介超出边框的BUG
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 alan
							
						 | 
						
							
							
							
							
								
							
								96268d7007
								
							
								
							
						 | 
						
							
							
								
								修复bug:点击contest主页最新参赛作品“更多”按钮返回异常
							
							
							
							
							
							
							
							Signed-off-by: alan <547533434@qq.com> 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 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> 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								 
								linhk
							
						 | 
						
							
							
							
							
								
							
								08d59b9820
								
							
								
							
						 | 
						
							
							
								
								修改google中“参加竞赛”页面部分字重叠Bug
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								b49e76bf79
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'xiaoguang-contest' into szzh
							
							
							
							
							
							
							
							Conflicts:
	app/views/softapplications/show.html.erb
	app/views/welcome/contest.html.erb 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 chenmin
							
						 | 
						
							
							
							
							
								
							
								e303a3789a
								
							
								
							
						 | 
						
							
							
								
								修复创新竞赛资源搜索页面系统支持过长遮住其他标签的bug
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 chenmin
							
						 | 
						
							
							
							
							
								
							
								532cb23141
								
							
								
							
						 | 
						
							
							
								
								修复标签和内容之间空白太多的问题;
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 chenmin
							
						 | 
						
							
							
							
							
								
							
								3a2754eb27
								
							
								
							
						 | 
						
							
							
								
								修复查看单个竞赛页面的竞赛详细信息被遮住的bug;
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 chenmin
							
						 | 
						
							
							
							
							
								
							
								a328a934c8
								
							
								
							
						 | 
						
							
							
								
								修复查看单个竞赛页面的删除、编辑竞赛标签的显示bug;
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								 
								hhuai
							
						 | 
						
							
							
							
							
								
							
								b34e74bd1c
								
							
								
							
						 | 
						
							
							
								
								issue 1012, table中td撑坏的问题
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								08821b9391
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' into develop
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								8b3b1bdcfa
								
							
								
							
						 | 
						
							
							
								
								取消编辑参赛作品时注意提示
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								d66dc65cca
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' into develop
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								31e8ad98ae
								
							
								
							
						 | 
						
							
							
								
								1.修复竞赛作品每次修改之后,都会吧图片清空的BUG
							
							
							
							
							
							
							
							2.修改删除竞赛作品图片功能 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								1f4943483e
								
							
								
							
						 | 
						
							
							
								
								1.现在竞赛作品名称、开发人员、开发环境的长度
							
							
							
							
							
							
							
							2.修复竞赛作品一上传的图片,编辑时资源列表不显示的问题 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								28606f030d
								
							
								
							
						 | 
						
							
							
								
								修复搜索参赛作品结果翻页跳转不正确的BUG
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								b05e112a3f
								
							
								
							
						 | 
						
							
							
								
								1.修改邮件服务器配置
							
							
							
							
							
							
							
							2.查询竞赛作品在js中提交,增加搜索条件是不是为空的判断
3.查询结果取消按照时间/活跃度排序功能 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								3119d9a9aa
								
							
								
							
						 | 
						
							
							
								
								增加竞赛作品的搜索功能
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								79eac39dc2
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/szzh' into develop
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								bfda30ee80
								
							
								
							
						 | 
						
							
							
								
								1.增加修改竞赛作品页面作品类型、关联项目的默认选择
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								b1251db30c
								
							
								
							
						 | 
						
							
							
								
								1.修改竞赛作品时增加作品类别下拉框选择
							
							
							
							
							
							
							
							2.修改竞赛作品时增加获取选择其他时作品类别 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 yanxd
							
						 | 
						
							
							
							
							
								
							
								579f1d4d31
								
							
								
							
						 | 
						
							
							
								
								start align-center
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 wanglinchun
							
						 | 
						
							
							
							
							
								
							
								d20114cc42
								
							
								
							
						 | 
						
							
							
								
								竞赛子站国际化完成
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 wanglinchun
							
						 | 
						
							
							
							
							
								
							
								a1083fe900
								
							
								
							
						 | 
						
							
							
								
								修改了原有参赛作品显示报500;
							
							
							
							
							
							
							
							修改了作品删除功能报错 
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 wanglinchun
							
						 | 
						
							
							
							
							
								
							
								b13638bb95
								
							
								
							
						 | 
						
							
							
								
								竞赛子站国际化
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								xianbo
							
						 | 
						
							
							
							
							
								
							
								be1a0e0fea
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								xianbo
							
						 | 
						
							
							
							
							
								
							
								a3a95556a3
								
							
								
							
						 | 
						
							
							
								
								fix 王林春提交了冲突文件
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 wanglinchun
							
						 | 
						
							
							
							
							
								
							
								4081ef93a3
								
							
								
							
						 | 
						
							
							
								
								参赛作品发布人不能打分和评论;
							
							
							
							
							
							
							
							匿名用户隐藏打分功能 
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								xianbo
							
						 | 
						
							
							
							
							
								
							
								e52886cf46
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
							
							
							
							
							
							
							
							Conflicts:
	app/views/softapplications/show.html.erb
	db/schema.rb 
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 wanglinchun
							
						 | 
						
							
							
							
							
								
							
								88b7fd24b1
								
							
								
							
						 | 
						
							
							
								
								给新建参赛作品中托管项目添加默认选项,使用户自行选择是否需要将参赛作品托管到制定的项目中
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 wanglinchun
							
						 | 
						
							
							
							
							
								
							
								56b66c8f5f
								
							
								
							
						 | 
						
							
							
								
								给参赛作品页面中托管项目添加超链接
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 wanglinchun
							
						 | 
						
							
							
							
							
								
							
								12f3da8416
								
							
								
							
						 | 
						
							
							
								
								sdf
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 yanxd
							
						 | 
						
							
							
							
							
								
							
								0ab17f1e90
								
							
								
							
						 | 
						
							
							
								
								contest image show
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 wanglinchun
							
						 | 
						
							
							
							
							
								
							
								a5cb14274c
								
							
								
							
						 | 
						
							
							
								
								修改参赛作品页面中未登录状态下的提示
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 wanglinchun
							
						 | 
						
							
							
							
							
								
							
								bcb3bf0c19
								
							
								
							
						 | 
						
							
							
								
								调整参赛作品编辑页面中托管项目列表的显示宽度
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 wanglinchun
							
						 | 
						
							
							
							
							
								
							
								77b7da81fd
								
							
								
							
						 | 
						
							
							
								
								参赛作品页面编辑功能中添加修改托管项目列表完成
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 yanxd
							
						 | 
						
							
							
							
							
								
							
								d47facc9e8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' into develop
							
							
							
							
							
							
							
							Conflicts:
	app/views/contests/show_attendingcontest.html.erb
	db/schema.rb 
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 wanglinchun
							
						 | 
						
							
							
							
							
								
							
								10b34341c7
								
							
								
							
						 | 
						
							
							
								
								修改参赛作品编辑页面说明文字:应用--》作品
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 wanglinchun
							
						 | 
						
							
							
							
							
								
							
								9fb9d2dbdf
								
							
								
							
						 | 
						
							
							
								
								初步增加了新建参赛作品中参赛作品所属的托管项目列表
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								b27b3e0a5a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/szzh' into szzh
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								029eb1a195
								
							
								
							
						 | 
						
							
							
								
								作业回复
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 wanglinchun
							
						 | 
						
							
							
							
							
								
							
								bb3536a7d5
								
							
								
							
						 | 
						
							
							
								
								调整了参赛作品页面中最终得分和打分总人数和下面文字的剧中对其
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 wanglinchun
							
						 | 
						
							
							
							
							
								
							
								65f1e2a8d1
								
							
								
							
						 | 
						
							
							
								
								参赛作品页面添加托管项目网址+超链接+判断网址是否为空
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 wanglinchun
							
						 | 
						
							
							
							
							
								
							
								f88322f2a1
								
							
								
							
						 | 
						
							
							
								
								参赛作品页面添加托管项目网址+超链接
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 wanglinchun
							
						 | 
						
							
							
							
							
								
							
								a8b58016fa
								
							
								
							
						 | 
						
							
							
								
								df
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 wanglinchun
							
						 | 
						
							
							
							
							
								
							
								bbd293272d
								
							
								
							
						 | 
						
							
							
								
								添加参赛作品所属项目的网址;
							
							
							
							
							
							
							
							参赛应用页面添加所属项目网址; 
							
						 | 
						
							12 years ago |