ganyiang
							
						 | 
						
							
							
							
							
								
							
								c8ca5277a6
								
							
								
							
						 | 
						
							
							
								
								新增osp项目“聚焦”标签 (演示用)
							
							
							
							
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								
								 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 | 
						
					
				
					
						
							
							
								 
								yanxd
							
						 | 
						
							
							
							
							
								
							
								4b1d7e049d
								
							
								
							
						 | 
						
							
							
								
								233
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 yanxd
							
						 | 
						
							
							
							
							
								
							
								654cb404e2
								
							
								
							
						 | 
						
							
							
								
								bootstrap test
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 fanqiang
							
						 | 
						
							
							
							
							
								
							
								401f097079
								
							
								
							
						 | 
						
							
							
								
								项目展示页面添加帖子的发布者信息
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 fanqiang
							
						 | 
						
							
							
							
							
								
							
								f392fc244f
								
							
								
							
						 | 
						
							
							
								
								修改连接,进入帖子后应该进入新的界面
							
							
							
							
							
							
							
							去掉项目展示部分的发布帖子连接 
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								
								 yanxd
							
						 | 
						
							
							
							
							
								
							
								d77d7e14c7
								
							
								
							
						 | 
						
							
							
								
								home page memo css no wrap
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 yanxd
							
						 | 
						
							
							
							
							
								
							
								7a4e5afba0
								
							
								
							
						 | 
						
							
							
								
								test
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 z9hang
							
						 | 
						
							
							
							
							
								
							
								0e6d9a804a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 z9hang
							
						 | 
						
							
							
							
							
								
							
								ee3a5f5719
								
							
								
							
						 | 
						
							
							
								
								代码修改
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								t430
							
						 | 
						
							
							
							
							
								
							
								fd0a504d84
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 yanxd
							
						 | 
						
							
							
							
							
								
							
								5364687160
								
							
								
							
						 | 
						
							
							
								
								bootstrap & tag bug
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								xianbo
							
						 | 
						
							
							
							
							
								
							
								be1a0e0fea
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								xianbo
							
						 | 
						
							
							
							
							
								
							
								734caef3dc
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								xianbo
							
						 | 
						
							
							
							
							
								
							
								a3a95556a3
								
							
								
							
						 | 
						
							
							
								
								fix 王林春提交了冲突文件
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 z9hang
							
						 | 
						
							
							
							
							
								
							
								ad5ac329f2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 z9hang
							
						 | 
						
							
							
							
							
								
							
								6583ccb001
								
							
								
							
						 | 
						
							
							
								
								admin账户个人主页显示修改
							
							
							
							
							
							
							
							admin账户用户管理功能分离到/admin/users,软件创客功能与普通账户一致 
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								t430
							
						 | 
						
							
							
							
							
								
							
								edfd7372bb
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 yanxd
							
						 | 
						
							
							
							
							
								
							
								4eebd48f92
								
							
								
							
						 | 
						
							
							
								
								realname
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 yanxd
							
						 | 
						
							
							
							
							
								
							
								3ae7729539
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' into develop
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 yanxd
							
						 | 
						
							
							
							
							
								
							
								213939b474
								
							
								
							
						 | 
						
							
							
								
								realname
							
							
							
							
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								 
								xianbo
							
						 | 
						
							
							
							
							
								
							
								cda9942723
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 yanxd
							
						 | 
						
							
							
							
							
								
							
								6b5fda1c78
								
							
								
							
						 | 
						
							
							
								
								read txt attachment
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								0ec7d6b4e7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/szzh' into szzh
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								71bbc50542
								
							
								
							
						 | 
						
							
							
								
								增加作业留言的分页显示
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 yanxd
							
						 | 
						
							
							
							
							
								
							
								598429695f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into szzh
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 yanxd
							
						 | 
						
							
							
							
							
								
							
								62f9ed052b
								
							
								
							
						 | 
						
							
							
								
								issues#655
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								eb5138e103
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								9c75b701f4
								
							
								
							
						 | 
						
							
							
								
								修改BUG
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 fanqiang
							
						 | 
						
							
							
							
							
								
							
								d3ead651fe
								
							
								
							
						 | 
						
							
							
								
								动态显示安全问题
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								5d4226ce79
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/szzh' into szzh
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								65c3bb5eb1
								
							
								
							
						 | 
						
							
							
								
								1.作业列表评分结果显示保留2位有效数字
							
							
							
							
							
							
							
							2.互评界面显示最终评分数值
3.增加互评按钮,修改查看学号、按学号排序等功能的条件
4.修改互评界面作业下载信息显示,取消描述 
							
						 | 
						
							12 years ago |