hjm
							
						 | 
						
							
							
							
							
								
							
								a874798e07
								
							
								
							
						 | 
						
							
							
								
								评论
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								c04b6201b8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								a17191b896
								
							
								
							
						 | 
						
							
							
								
								showNotification
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								fc23ea5b9b
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								e6eaac632d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								5a793cea06
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								a76898c402
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								208a5071eb
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								3c2d784ccc
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								2dc44d92fc
								
							
								
							
						 | 
						
							
							
								
								title
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								8446181ddc
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								3be31d7f70
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								ea891f47b1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								6ab02ed247
								
							
								
							
						 | 
						
							
							
								
								homework_name
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								66589908d0
								
							
								
							
						 | 
						
							
							
								
								isAdmin
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								0a259e05b4
								
							
								
							
						 | 
						
							
							
								
								border
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								7a2acb6676
								
							
								
							
						 | 
						
							
							
								
								b
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								682e50df2e
								
							
								
							
						 | 
						
							
							
								
								allow
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								fd43a9674a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								cc3b171f45
								
							
								
							
						 | 
						
							
							
								
								未发布:
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								e152119cb5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								2d8b2ef96f
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								6e9d4b19fa
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								f6a922004c
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								9784cb5433
								
							
								
							
						 | 
						
							
							
								
								color
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								d982e1d6d3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								6e91761cce
								
							
								
							
						 | 
						
							
							
								
								css
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								d364d58a59
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								3571c9771f
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 caishi
							
						 | 
						
							
							
							
							
								
							
								bf12c79e3a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 caishi
							
						 | 
						
							
							
							
							
								
							
								b040e6efb6
								
							
								
							
						 | 
						
							
							
								
								小样式问题
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								cbeafc1c5c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								d896ead64c
								
							
								
							
						 | 
						
							
							
								
								mdInForm
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								b86bc51f44
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								bbfead51e0
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								59bbb18b37
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								2ad530e129
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								7be953025f
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								69b4eccccc
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								712ba99281
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								026dc5e4d5
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								b9f6336e9a
								
							
								
							
						 | 
						
							
							
								
								spin
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								166dbb3f03
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								5684b99c8a
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 caishi
							
						 | 
						
							
							
							
							
								
							
								1c3c85b480
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 caishi
							
						 | 
						
							
							
							
							
								
							
								71bb545507
								
							
								
							
						 | 
						
							
							
								
								新课堂指引第一页
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								40aee552f7
								
							
								
							
						 | 
						
							
							
								
								样式
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								6b27cca854
								
							
								
							
						 | 
						
							
							
								
								width: '110px',
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								554ab74304
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								9eb28db680
								
							
								
							
						 | 
						
							
							
								
								添加目录
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								097a0e495c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								321e902baf
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								66ea00a7de
								
							
								
							
						 | 
						
							
							
								
								test
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								29f9fec5ac
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								3ddcabf116
								
							
								
							
						 | 
						
							
							
								
								24px
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								d6496418b2
								
							
								
							
						 | 
						
							
							
								
								radius
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								e2d8bbea66
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								b23f4abade
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								c6f7e9dd99
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								c584a3385b
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								24fe9413f8
								
							
								
							
						 | 
						
							
							
								
								test
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								d7b39e2887
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								7645300243
								
							
								
							
						 | 
						
							
							
								
								立即认证
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								0ad94943af
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								8782c4b15d
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								2b35669267
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
							
							
							# Conflicts:
#	public/react/src/modules/login/Trialapplication.js 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								618efb6df1
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								ed5c3c8a1a
								
							
								
							
						 | 
						
							
							
								
								vnc
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								9f7f7483a8
								
							
								
							
						 | 
						
							
							
								
								score
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								30b735dc83
								
							
								
							
						 | 
						
							
							
								
								未登录空指针
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								8957461ba9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								2a320fa7db
								
							
								
							
						 | 
						
							
							
								
								user
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								19f678e597
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 caishi
							
						 | 
						
							
							
							
							
								
							
								7cd8b09b14
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
							
							
							Conflicts:
	public/react/src/AppConfig.js
	public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 caishi
							
						 | 
						
							
							
							
							
								
							
								f287dd53ed
								
							
								
							
						 | 
						
							
							
								
								issues
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								b5fbbffce8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								8cdaf91dd5
								
							
								
							
						 | 
						
							
							
								
								set
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								7e8291d31f
								
							
								
							
						 | 
						
							
							
								
								b
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								fbb0c0117f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								74ed2ec427
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								d6fb28b970
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								9e6b31dddd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								aac1900a5e
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								d698d0785b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								16e1a517c6
								
							
								
							
						 | 
						
							
							
								
								.state
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								5444373331
								
							
								
							
						 | 
						
							
							
								
								ConnectProject
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								830fe31e95
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								e8b00031aa
								
							
								
							
						 | 
						
							
							
								
								实训权限调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								786cdff86c
								
							
								
							
						 | 
						
							
							
								
								memberNumMax
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								170990f953
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								3993378c4d
								
							
								
							
						 | 
						
							
							
								
								文字
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								deb6660237
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								8d637c79e8
								
							
								
							
						 | 
						
							
							
								
								修改实训权限调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								7145037a53
								
							
								
							
						 | 
						
							
							
								
								文字修改
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								7dc3b79b9d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								6813431b5f
								
							
								
							
						 | 
						
							
							
								
								立即发布
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								c1a52bf013
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								7db2a25c77
								
							
								
							
						 | 
						
							
							
								
								实训权限调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								f59390802c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								49453d3b2a
								
							
								
							
						 | 
						
							
							
								
								new
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								fc4baada04
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								4a392e4ba3
								
							
								
							
						 | 
						
							
							
								
								iden
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								6ad93f8cfb
								
							
								
							
						 | 
						
							
							
								
								appeal_all_count
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								57cde904bf
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								aa498d7db5
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								bc74c4ee9c
								
							
								
							
						 | 
						
							
							
								
								iden
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								453c462565
								
							
								
							
						 | 
						
							
							
								
								共有1条匿评申诉,0条待处理
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								6103f76bc0
								
							
								
							
						 | 
						
							
							
								
								font-14
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								1f64fa6cff
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								bc58fcd79d
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								7c3e91fb88
								
							
								
							
						 | 
						
							
							
								
								isNiPing
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								654f9cbc97
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								cb970e2223
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								3866ec9bbb
								
							
								
							
						 | 
						
							
							
								
								宽度
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								550692b031
								
							
								
							
						 | 
						
							
							
								
								cancel_appeal
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								556ce2635e
								
							
								
							
						 | 
						
							
							
								
								haveProjects
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								7c2cc6aaef
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								c152a950be
								
							
								
							
						 | 
						
							
							
								
								niPingAndIsStudent
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								9d954ea61e
								
							
								
							
						 | 
						
							
							
								
								connect
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								97e83ab154
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								1d47a8f680
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								800089a4c3
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								e77bc70aea
								
							
								
							
						 | 
						
							
							
								
								const isAdmin = this.props.isAdmin()
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								07b9197e15
								
							
								
							
						 | 
						
							
							
								
								拒绝
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								4e8bd3fb74
								
							
								
							
						 | 
						
							
							
								
								getCourseGroups
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								88cebdbb0c
								
							
								
							
						 | 
						
							
							
								
								hasGraduationModule
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								ffbcbc0349
								
							
								
							
						 | 
						
							
							
								
								check
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								68a5c601a6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								d8fbe0678c
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								bac2d56ff1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								02faf37431
								
							
								
							
						 | 
						
							
							
								
								check admin
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								6f4566e03b
								
							
								
							
						 | 
						
							
							
								
								修复
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								fb6c09f7df
								
							
								
							
						 | 
						
							
							
								
								修复
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								5f44ab72af
								
							
								
							
						 | 
						
							
							
								
								修复
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								2d307bdc6d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								ddf72a5550
								
							
								
							
						 | 
						
							
							
								
								调整开启实训
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								a4675215de
								
							
								
							
						 | 
						
							
							
								
								修复
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 ysl
							
						 | 
						
							
							
							
							
								
							
								97189e671f
								
							
								
							
						 | 
						
							
							
								
								修复
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 ysl
							
						 | 
						
							
							
							
							
								
							
								66e4a5522b
								
							
								
							
						 | 
						
							
							
								
								修复
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 ysl
							
						 | 
						
							
							
							
							
								
							
								1a9984fb4b
								
							
								
							
						 | 
						
							
							
								
								修复
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								7e7f2b034b
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								ce57c052a0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
							
							
							# Conflicts:
#	public/react/src/modules/courses/coursesPublic/Startshixuntask.js
#	public/react/src/modules/tpm/TPMBanner.js 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								c71bb0a58a
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 ysl
							
						 | 
						
							
							
							
							
								
							
								a2f6217014
								
							
								
							
						 | 
						
							
							
								
								修复
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 ysl
							
						 | 
						
							
							
							
							
								
							
								83efdf9abe
								
							
								
							
						 | 
						
							
							
								
								修复
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 ysl
							
						 | 
						
							
							
							
							
								
							
								3ec184008b
								
							
								
							
						 | 
						
							
							
								
								修复
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 ysl
							
						 | 
						
							
							
							
							
								
							
								2f1eac3216
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 ysl
							
						 | 
						
							
							
							
							
								
							
								f5150efa7a
								
							
								
							
						 | 
						
							
							
								
								修复
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								09d5e802e8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
							
							
							# Conflicts:
#	public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								90c935f68c
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago |