杨树明
							
						 | 
						
							
							
							
							
								
							
								dfb65eecd4
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev_aliyun' and 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into topic_bank
							
							
							
							
							
							
							
							# Conflicts:
#	config/routes.rb 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								ac076848ed
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev_aliyun' and 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into topic_bank
							
							
							
							
							
							
							
							# Conflicts:
#	config/routes.rb 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								a35633a4f7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/topic_bank' into topic_bank
							
							
							
							
							
							
							
							# Conflicts:
#	config/routes.rb
#	public/react/src/modules/courses/poll/PollNew.js 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								66297cd551
								
							
								
							
						 | 
						
							
							
								
								合并
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								p31729568
							
						 | 
						
							
							
							
							
								
							
								caf29a7ba9
								
							
								
							
						 | 
						
							
							
								
								admins: import course member xlsx
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								15737792f5
								
							
								
							
						 | 
						
							
							
								
								调整题库的
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								2f25b8a9d4
								
							
								
							
						 | 
						
							
							
								
								合并阿里云到本地
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								648b1ef6c1
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								cxt
							
						 | 
						
							
							
							
							
								
							
								2fe7498241
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								cxt
							
						 | 
						
							
							
							
							
								
							
								05b0f17b0d
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								cxt
							
						 | 
						
							
							
							
							
								
							
								73f3b6577d
								
							
								
							
						 | 
						
							
							
								
								评阅记录的删除
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								58e8d21044
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								7ffbb0e4fc
								
							
								
							
						 | 
						
							
							
								
								样式
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								cxt
							
						 | 
						
							
							
							
							
								
							
								4bade0ad23
								
							
								
							
						 | 
						
							
							
								
								评阅记录的删除
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								4fe2b97224
								
							
								
							
						 | 
						
							
							
								
								b
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								cxt
							
						 | 
						
							
							
							
							
								
							
								4e1cb44b9d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								cxt
							
						 | 
						
							
							
							
							
								
							
								bc06f54ce9
								
							
								
							
						 | 
						
							
							
								
								题库调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								2723116c0a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								c3460f7d77
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								306fcab434
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								cxt
							
						 | 
						
							
							
							
							
								
							
								f56eb99536
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								cxt
							
						 | 
						
							
							
							
							
								
							
								9d832a09c6
								
							
								
							
						 | 
						
							
							
								
								题库
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								81e11909d1
								
							
								
							
						 | 
						
							
							
								
								作业下载
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								b860e61e00
								
							
								
							
						 | 
						
							
							
								
								作业下载
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								e98ccbd0b7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								d89037d07c
								
							
								
							
						 | 
						
							
							
								
								宽度
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								5ec82e8032
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								f0500b4c61
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								9cbbda6744
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								9e00f0350b
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								99f6de53f9
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								20b31eb018
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								97ee8074d0
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								ec11918b6e
								
							
								
							
						 | 
						
							
							
								
								注释
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								46de13bef6
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								35daafd6c8
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								898686a256
								
							
								
							
						 | 
						
							
							
								
								合并
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								9756cd1979
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								7533744fe4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								c424983aec
								
							
								
							
						 | 
						
							
							
								
								add previousPathName
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								cxt
							
						 | 
						
							
							
							
							
								
							
								e5183635bd
								
							
								
							
						 | 
						
							
							
								
								金课的课程名称和数据迁移
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								p31729568
							
						 | 
						
							
							
							
							
								
							
								0a6ce90047
								
							
								
							
						 | 
						
							
							
								
								admins: import user
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								946c4c922c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								3ddd1dc07f
								
							
								
							
						 | 
						
							
							
								
								整组同评   item删除
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								6af98b311f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								a467ef8475
								
							
								
							
						 | 
						
							
							
								
								调整课堂首页面包屑
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								cxt
							
						 | 
						
							
							
							
							
								
							
								3521ba92e7
								
							
								
							
						 | 
						
							
							
								
								题库调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 hjm
							
						 | 
						
							
							
							
							
								
							
								52997eb109
								
							
								
							
						 | 
						
							
							
								
								hide
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								cxt
							
						 | 
						
							
							
							
							
								
							
								6ce7c151f7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into dev_aliyun
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 caicai8
							
						 | 
						
							
							
							
							
								
							
								0650193eb1
								
							
								
							
						 | 
						
							
							
								
								问卷
							
							
							
							
							
						 | 
						
							6 years ago |