wanglinchun
							
						 | 
						
							
							
							
							
								
							
								6a8d697582
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into competition
							
							
							
							
							
							
							
							Conflicts:
	config/routes.rb
	lib/redmine.rb 
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 wanglinchun
							
						 | 
						
							
							
							
							
								
							
								a3fb48a4bb
								
							
								
							
						 | 
						
							
							
								
								0603
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 wanglinchun
							
						 | 
						
							
							
							
							
								
							
								81a45fe977
								
							
								
							
						 | 
						
							
							
								
								dfs
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 wanglinchun
							
						 | 
						
							
							
							
							
								
							
								528af32f91
								
							
								
							
						 | 
						
							
							
								
								修改forge,localhost首页不能显示的问题
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 wanglinchun
							
						 | 
						
							
							
							
							
								
							
								09ea833dcb
								
							
								
							
						 | 
						
							
							
								
								竞赛通知修改2
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 wanglinchun
							
						 | 
						
							
							
							
							
								
							
								bf71a38608
								
							
								
							
						 | 
						
							
							
								
								竞赛通知相关文件修改
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								ganyiang
							
						 | 
						
							
							
							
							
								
							
								9f16123bed
								
							
								
							
						 | 
						
							
							
								
								修复osp显示帖子页面,footer漂移的问题
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								ganyiang
							
						 | 
						
							
							
							
							
								
							
								a6f6ea240d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								ganyiang
							
						 | 
						
							
							
							
							
								
							
								b4c299bff8
								
							
								
							
						 | 
						
							
							
								
								修复osp中“热帖”下显示“没有帮助”的问题
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								xianbo
							
						 | 
						
							
							
							
							
								
							
								325bb85cc5
								
							
								
							
						 | 
						
							
							
								
								fix linchun
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								ganyiang
							
						 | 
						
							
							
							
							
								
							
								44d24d038f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								xianbo
							
						 | 
						
							
							
							
							
								
							
								75fb537939
								
							
								
							
						 | 
						
							
							
								
								delete mark file
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								ganyiang
							
						 | 
						
							
							
							
							
								
							
								3c9279d285
								
							
								
							
						 | 
						
							
							
								
								修改标签错误
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								xianbo
							
						 | 
						
							
							
							
							
								
							
								7d1327ad2a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								ganyiang
							
						 | 
						
							
							
							
							
								
							
								e8b33bfd8f
								
							
								
							
						 | 
						
							
							
								
								修复osp主页index界面态势列表显示标题过长的问题
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								ganyiang
							
						 | 
						
							
							
							
							
								
							
								e901e8046d
								
							
								
							
						 | 
						
							
							
								
								修改osp中allbug的显示界面
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								ganyiang
							
						 | 
						
							
							
							
							
								
							
								a4d1e036f4
								
							
								
							
						 | 
						
							
							
								
								去除osp中“聚焦” 标签的链接(演示用)
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 fanqiang
							
						 | 
						
							
							
							
							
								
							
								9e05ecf5b4
								
							
								
							
						 | 
						
							
							
								
								修改主页展示部分
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								ganyiang
							
						 | 
						
							
							
							
							
								
							
								0335e06df0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								ganyiang
							
						 | 
						
							
							
							
							
								
							
								c8ca5277a6
								
							
								
							
						 | 
						
							
							
								
								新增osp项目“聚焦”标签 (演示用)
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 fanqiang
							
						 | 
						
							
							
							
							
								
							
								150bb1ba1e
								
							
								
							
						 | 
						
							
							
								
								修改开源社区主页中的漏洞展示部分
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 wanglinchun
							
						 | 
						
							
							
							
							
								
							
								9f29a6c82a
								
							
								
							
						 | 
						
							
							
								
								将base的格式引入竞赛通知中,使其局部不同,接下来将通知的功能逐步引入
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								ganyiang
							
						 | 
						
							
							
							
							
								
							
								0b430cb11d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								ganyiang
							
						 | 
						
							
							
							
							
								
							
								6ca1d7f7ab
								
							
								
							
						 | 
						
							
							
								
								修改osp的css文件,解决标题过长的显示问题
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 wanglinchun
							
						 | 
						
							
							
							
							
								
							
								43449e66b5
								
							
								
							
						 | 
						
							
							
								
								增加了竞赛通知按钮
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 fanqiang
							
						 | 
						
							
							
							
							
								
							
								b47cec9c3a
								
							
								
							
						 | 
						
							
							
								
								修改bug展示界面问题
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 fanqiang
							
						 | 
						
							
							
							
							
								
							
								d17ce35596
								
							
								
							
						 | 
						
							
							
								
								修改项目展示界面中bug的链接问题,将会重新打开页面
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 fanqiang
							
						 | 
						
							
							
							
							
								
							
								91d61502a2
								
							
								
							
						 | 
						
							
							
								
								将软件漏洞改为软件态势
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								ganyiang
							
						 | 
						
							
							
							
							
								
							
								4b1212f279
								
							
								
							
						 | 
						
							
							
								
								修正OSP在rubymine下报红的小问题
							
							
							
							
							
							
							
							删掉一些无用代码 
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								yanxd
							
						 | 
						
							
							
							
							
								
							
								22d4835d08
								
							
								
							
						 | 
						
							
							
								
								asset pipeline. gemfile
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								xianbo
							
						 | 
						
							
							
							
							
								
							
								a70593ad76
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								yanxd
							
						 | 
						
							
							
							
							
								
							
								200c052bb4
								
							
								
							
						 | 
						
							
							
								
								watchers
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 fanqiang
							
						 | 
						
							
							
							
							
								
							
								06a775e3f9
								
							
								
							
						 | 
						
							
							
								
								修改帖子显示数字错误
							
							
							
							
							
							
							
							修改来源显示错误问题 
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								xianbo
							
						 | 
						
							
							
							
							
								
							
								0f56d9e885
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 fanqiang
							
						 | 
						
							
							
							
							
								
							
								4c3e2376f0
								
							
								
							
						 | 
						
							
							
								
								修改帖子页面
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 fanqiang
							
						 | 
						
							
							
							
							
								
							
								fdf8b5640a
								
							
								
							
						 | 
						
							
							
								
								添加显示bug的页面
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								yanxd
							
						 | 
						
							
							
							
							
								
							
								a9b88b8e66
								
							
								
							
						 | 
						
							
							
								
								issues#show words typo
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								yanxd
							
						 | 
						
							
							
							
							
								
							
								98444ef01e
								
							
								
							
						 | 
						
							
							
								
								remove fuzzy routes|add school missing row
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 fanqiang
							
						 | 
						
							
							
							
							
								
							
								6dba5aaae6
								
							
								
							
						 | 
						
							
							
								
								修改帖子中  回复,关注,浏览的链接错误
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 wanglinchun
							
						 | 
						
							
							
							
							
								
							
								d20114cc42
								
							
								
							
						 | 
						
							
							
								
								竞赛子站国际化完成
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 wanglinchun
							
						 | 
						
							
							
							
							
								
							
								4afc41a171
								
							
								
							
						 | 
						
							
							
								
								修改了编辑参赛作品不能更新托管项目的问题
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 wanglinchun
							
						 | 
						
							
							
							
							
								
							
								a1083fe900
								
							
								
							
						 | 
						
							
							
								
								修改了原有参赛作品显示报500;
							
							
							
							
							
							
							
							修改了作品删除功能报错 
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 wanglinchun
							
						 | 
						
							
							
							
							
								
							
								8d77c62359
								
							
								
							
						 | 
						
							
							
								
								sdfd
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								yanxd
							
						 | 
						
							
							
							
							
								
							
								4b1d7e049d
								
							
								
							
						 | 
						
							
							
								
								233
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 yanxd
							
						 | 
						
							
							
							
							
								
							
								654cb404e2
								
							
								
							
						 | 
						
							
							
								
								bootstrap test
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 fanqiang
							
						 | 
						
							
							
							
							
								
							
								401f097079
								
							
								
							
						 | 
						
							
							
								
								项目展示页面添加帖子的发布者信息
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 fanqiang
							
						 | 
						
							
							
							
							
								
							
								f392fc244f
								
							
								
							
						 | 
						
							
							
								
								修改连接,进入帖子后应该进入新的界面
							
							
							
							
							
							
							
							去掉项目展示部分的发布帖子连接 
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 wanglinchun
							
						 | 
						
							
							
							
							
								
							
								b416d69639
								
							
								
							
						 | 
						
							
							
								
								vxc
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 yanxd
							
						 | 
						
							
							
							
							
								
							
								12b1553a33
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into szzh
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 yanxd
							
						 | 
						
							
							
							
							
								
							
								2273a6fd0b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into develop
							
							
							
							
							
						 | 
						
							12 years ago |