nwb
							
						 | 
						
							
							
							
							
								
							
								13a3725b06
								
							
								
							
						 | 
						
							
							
								
								BUG修改
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 z9hang
							
						 | 
						
							
							
							
							
								
							
								53ff6ea335
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
							
							
							Conflicts:
	db/schema.rb 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 z9hang
							
						 | 
						
							
							
							
							
								
							
								6a45a0287d
								
							
								
							
						 | 
						
							
							
								
								添加删除图片功能,修复用户修改资料界面form.quene undefine的js错误(导致加载中不消失的原因)
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 yanxd
							
						 | 
						
							
							
							
							
								
							
								37d0560b70
								
							
								
							
						 | 
						
							
							
								
								test test
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								ba3d1755d4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								e6b80de3b5
								
							
								
							
						 | 
						
							
							
								
								rmagick调整为仅test需要安装
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 yanxd
							
						 | 
						
							
							
							
							
								
							
								ec2384f110
								
							
								
							
						 | 
						
							
							
								
								自动化测试框架
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 z9hang
							
						 | 
						
							
							
							
							
								
							
								cf339edb6c
								
							
								
							
						 | 
						
							
							
								
								添加首页定制的非空验证,长度验证
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 yanxd
							
						 | 
						
							
							
							
							
								
							
								14f1ad63d2
								
							
								
							
						 | 
						
							
							
								
								自动化测试环境
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								1da147684a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
							
							
							Conflicts:
	db/schema.rb 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								2a1a051362
								
							
								
							
						 | 
						
							
							
								
								课程资源文件密级BUG修正
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								31245f6fb2
								
							
								
							
						 | 
						
							
							
								
								修复软件创客列表中某些用户的用户名显示不为超链接(未激活账户)
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								b704a44dfb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/szzh' into szzh
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								7a9b5156c9
								
							
								
							
						 | 
						
							
							
								
								修复软件创客列表当用户姓名比较长时,用户姓名会被个人得分覆盖掉的BUG
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								0950ac2329
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
							
							
							Conflicts:
	db/schema.rb 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								0031f90c64
								
							
								
							
						 | 
						
							
							
								
								1.课程动态中的私有的资源、文档进行权限判断
							
							
							
							
							
							
							
							2.项目动态中的私有的资源、文档进行权限判断 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 z9hang
							
						 | 
						
							
							
							
							
								
							
								3aab1b172c
								
							
								
							
						 | 
						
							
							
								
								修正执行数据迁移时的‘page_type=’ undefine错误
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								87b623bc51
								
							
								
							
						 | 
						
							
							
								
								1.文档添加密级设置
							
							
							
							
							
							
							
							2.新建文档、修改文档视图修改 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 yanxd
							
						 | 
						
							
							
							
							
								
							
								fd5747f4dc
								
							
								
							
						 | 
						
							
							
								
								test 3-framework
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 z9hang
							
						 | 
						
							
							
							
							
								
							
								98ddd6940d
								
							
								
							
						 | 
						
							
							
								
								修正错误
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 z9hang
							
						 | 
						
							
							
							
							
								
							
								f44c715cfb
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 z9hang
							
						 | 
						
							
							
							
							
								
							
								6b6fd2906f
								
							
								
							
						 | 
						
							
							
								
								竞赛列表。贴吧列表的非空判断
							
							
							
							
							
							
							
							数据迁移报错问题修改 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								59a5541e45
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								9da70f9a20
								
							
								
							
						 | 
						
							
							
								
								调整项目列表样式
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								9472a7eb5c
								
							
								
							
						 | 
						
							
							
								
								未登录时取消显示我的学校按钮
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 z9hang
							
						 | 
						
							
							
							
							
								
							
								e1c7aaa220
								
							
								
							
						 | 
						
							
							
								
								冲突编辑
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 z9hang
							
						 | 
						
							
							
							
							
								
							
								fcdfeae326
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
							
							
							Conflicts:
	db/schema.rb 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 z9hang
							
						 | 
						
							
							
							
							
								
							
								3dfcc90574
								
							
								
							
						 | 
						
							
							
								
								课程、竞赛首页定制
							
							
							
							
							
							
							
							超级管理员账户中首页定制界面优化 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								48e2d8ecee
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								6d698cb5d8
								
							
								
							
						 | 
						
							
							
								
								下载添加权限判断
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 yanxd
							
						 | 
						
							
							
							
							
								
							
								2be5041d0d
								
							
								
							
						 | 
						
							
							
								
								文件界面的样式修改
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								4f2298fd22
								
							
								
							
						 | 
						
							
							
								
								修复个人动态首页中留言等动态显示有误的问题
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								9b3ffc90ba
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
							
							
							Conflicts:
	app/controllers/repositories_controller.rb
	db/schema.rb 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								6688ba61dd
								
							
								
							
						 | 
						
							
							
								
								1.用户申请加入项目向管理员发送邮件
							
							
							
							
							
							
							
							2.资源文件添加文件密级设置 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								bed662c2e5
								
							
								
							
						 | 
						
							
							
								
								修复项目缺陷列表描述显示不正常的BUG
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 z9hang
							
						 | 
						
							
							
							
							
								
							
								b4dd8409eb
								
							
								
							
						 | 
						
							
							
								
								添加项目托管平台首页定制功能
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								86adfaecce
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/szzh' into szzh
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								51ef3fa5a1
								
							
								
							
						 | 
						
							
							
								
								修复主页课程介绍显示有误的BUG
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								7bcb1cbe2e
								
							
								
							
						 | 
						
							
							
								
								修复个人主页中作业、项目介绍不正确的BUG
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								47ad20421e
								
							
								
							
						 | 
						
							
							
								
								修复当课程描述中有特殊标签是,课程列表描述显示有误的BUG
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 yanxd
							
						 | 
						
							
							
							
							
								
							
								056f86caad
								
							
								
							
						 | 
						
							
							
								
								can't download, html. after exception return;
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								39434766e3
								
							
								
							
						 | 
						
							
							
								
								1.修复超级管理员无法访问课程作业列表的BUG
							
							
							
							
							
							
							
							2.修改作业描述样式 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 yanxd
							
						 | 
						
							
							
							
							
								
							
								803e9cbdb5
								
							
								
							
						 | 
						
							
							
								
								globel issue#858, 中国高校--输入无效条件点击搜索,建议给出提示信息
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 yanxd
							
						 | 
						
							
							
							
							
								
							
								e573438e43
								
							
								
							
						 | 
						
							
							
								
								eager_load
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 yanxd
							
						 | 
						
							
							
							
							
								
							
								249ea19c0c
								
							
								
							
						 | 
						
							
							
								
								神坑,users和user_statuses表中,关注信息不同步,按照影响力排序还会有问题。以及users表中在us表没有对应条目,排序中是不会显示的
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								a5518363c3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								65c137e617
								
							
								
							
						 | 
						
							
							
								
								修复进入课程作业报错的问题
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 z9hang
							
						 | 
						
							
							
							
							
								
							
								720c75478a
								
							
								
							
						 | 
						
							
							
								
								修正上传图片可传非图片文件bug
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 yanxd
							
						 | 
						
							
							
							
							
								
							
								2ff24841fd
								
							
								
							
						 | 
						
							
							
								
								optimization image check.
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 yanxd
							
						 | 
						
							
							
							
							
								
							
								2b57e170ef
								
							
								
							
						 | 
						
							
							
								
								want that image popup in html when user click on thumbnail.
							
							
							
							
							
						 | 
						
							11 years ago |