huang
							
						 | 
						
							
							
							
							
								
							
								fed989753a
								
							
								
							
						 | 
						
							
							
								
								修复林处账号不能查看消息的问题
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								9710731a2c
								
							
								
							
						 | 
						
							
							
								
								课程配置添加登录名
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								fbba933a46
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'hjq_new_course' of http://git.trustie.net/jacknudt/trustieforge into hjq_new_course
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								be940ee3aa
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into hjq_new_course
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								433059e1bc
								
							
								
							
						 | 
						
							
							
								
								schema
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								ac9f13c842
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
							
							
							
							
							
							
							
							Conflicts:
	app/views/repositories/show.html.erb
	db/schema.rb
处理冲突 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 houxiang
							
						 | 
						
							
							
							
							
								
							
								56cb83ffba
								
							
								
							
						 | 
						
							
							
								
								版本库首页没有统计commit_count,具体的详情页在开始统计
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								42f5b86d95
								
							
								
							
						 | 
						
							
							
								
								添加字段删除课程
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								068c305c06
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course
							
							
							
							
							
							
							
							Conflicts:
	app/views/courses/member.html.erb
	app/views/courses/settings.html.erb
	app/views/repositories/show.html.erb
	db/schema.rb
处理冲突 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								bd3d0547f5
								
							
								
							
						 | 
						
							
							
								
								组织样式修改
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								4c00312f45
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' into dev_zanle
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								0a5a33c2de
								
							
								
							
						 | 
						
							
							
								
								schema
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								c1747ab217
								
							
								
							
						 | 
						
							
							
								
								fork重名,提交
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								8f024bdf4d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
							
							
							
							
							
							
							
							Conflicts:
	db/schema.rb 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								89b8f7783d
								
							
								
							
						 | 
						
							
							
								
								添加forked_form的id
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								fd51b02e16
								
							
								
							
						 | 
						
							
							
								
								添加修订附件
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								77e96af78f
								
							
								
							
						 | 
						
							
							
								
								还原分组作业
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								fee438cc0b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								ebeaac5798
								
							
								
							
						 | 
						
							
							
								
								作业匿评的结束状态未更新
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								364c9a3a9e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
							
							
							Conflicts:
	db/schema.rb
合并 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								39b87aaaac
								
							
								
							
						 | 
						
							
							
								
								为student_work表添加索引
							
							
							
							
							
							
							
							为homework_comments添加索引
大幅提高查询速度 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								d266237590
								
							
								
							
						 | 
						
							
							
								
								kaminari分页添加上一页下一页
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								96290ad975
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' into dev_zanle
							
							
							
							
							
							
							
							Conflicts:
	app/models/attachment.rb
	db/schema.rb 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								582cd6f5d4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' into dev_zanle
							
							
							
							
							
							
							
							Conflicts:
	app/models/attachment.rb
	db/schema.rb 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								487c6bad09
								
							
								
							
						 | 
						
							
							
								
								schema.rb
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								f91918145d
								
							
								
							
						 | 
						
							
							
								
								0
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								634e11d0ec
								
							
								
							
						 | 
						
							
							
								
								0
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								b130b52a23
								
							
								
							
						 | 
						
							
							
								
								修改迁移
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 Tim
							
						 | 
						
							
							
							
							
								
							
								580cc6b8d8
								
							
								
							
						 | 
						
							
							
								
								系统自动生成文件
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								501a8f905b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into szzh
							
							
							
							
							
							
							
							Conflicts:
	db/schema.rb
	public/stylesheets/courses.css 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								36b1649fbd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' into gitlab_guange
							
							
							
							
							
							
							
							Conflicts:
	db/schema.rb 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								042b197767
								
							
								
							
						 | 
						
							
							
								
								课程英雄榜界面调整
							
							
							
							
							
							
							
							动作触发的时候更新总分
更换迁移顺序 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 houxiang
							
						 | 
						
							
							
							
							
								
							
								c6b5abba4e
								
							
								
							
						 | 
						
							
							
								
								hide the the count of project'repo
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								8c83bbfff3
								
							
								
							
						 | 
						
							
							
								
								课程英雄榜数据
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								aca7684414
								
							
								
							
						 | 
						
							
							
								
								课程英雄榜
							
							
							
							
							
							
							
							各模块动作 触发加分 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								4efb660214
								
							
								
							
						 | 
						
							
							
								
								全站搜索
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								c8b1cae947
								
							
								
							
						 | 
						
							
							
								
								建立贡献榜表及相关关联
							
							
							
							
							
							
							
							部分页面
按总分排序(英雄榜)
部分页面(未完成) 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 Tim
							
						 | 
						
							
							
							
							
								
							
								d1f16a0851
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
							
							
							
							
							
							
							
							Conflicts:
	db/schema.rb 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 Tim
							
						 | 
						
							
							
							
							
								
							
								ec42cd2d7f
								
							
								
							
						 | 
						
							
							
								
								系统自动生成文件
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								f262a7cc13
								
							
								
							
						 | 
						
							
							
								
								cffd
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								1df8c94b98
								
							
								
							
						 | 
						
							
							
								
								解决字符过长不能保存成功的问题
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								dd148fb7c5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' into sw_new_course
							
							
							
							
							
							
							
							Conflicts:
	db/schema.rb 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 Tim
							
						 | 
						
							
							
							
							
								
							
								e3d78bf4f0
								
							
								
							
						 | 
						
							
							
								
								组织样式更改
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								99945d5bb5
								
							
								
							
						 | 
						
							
							
								
								学生答题界面的修改
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								3deebf2006
								
							
								
							
						 | 
						
							
							
								
								show
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								7dc16775dc
								
							
								
							
						 | 
						
							
							
								
								添加字段迁移
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								56e96a035b
								
							
								
							
						 | 
						
							
							
								
								schema.rb
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 houxiang
							
						 | 
						
							
							
							
							
								
							
								4a9da97f9b
								
							
								
							
						 | 
						
							
							
								
								modify by hx add commit_count_detail_show
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								249b15751d
								
							
								
							
						 | 
						
							
							
								
								新建多选题
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								282c7f5bd2
								
							
								
							
						 | 
						
							
							
								
								修改添加题目相关
							
							
							
							
							
						 | 
						
							10 years ago |