caicai8
							
						 | 
						
							
							
							
							
								
							
								8be2faf38f
								
							
								
							
						 | 
						
							
							
								
								issue
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 caicai8
							
						 | 
						
							
							
							
							
								
							
								e59ed11fb9
								
							
								
							
						 | 
						
							
							
								
								issue
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								8411ad0808
								
							
								
							
						 | 
						
							
							
								
								版本库改版优化
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								b05c23df75
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_harry
							
							
							
							
							
							
							
							# Conflicts:
#	public/react/package.json
#	public/react/src/modules/courses/boards/TopicDetail.js
#	public/react/src/modules/courses/common/button/CheckAllGroup.js
#	public/react/src/modules/courses/coursesHome/CoursesHome.js
#	public/react/src/modules/page/main/ChooseRepositoryView.js
#	public/react/src/modules/paths/ShixunPathSearch.js
#	public/react/src/modules/paths/statics/DisplayTableData.js
#	public/react/src/modules/paths/statics/index.js
#	public/react/src/modules/tpm/TPMIndexHOC.js
#	public/react/src/modules/tpm/TPMsettings/Shixuninformation.js
合并 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								harry
							
						 | 
						
							
							
							
							
								
							
								1fa2b11310
								
							
								
							
						 | 
						
							
							
								
								webpack 升级 适当优化
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								564a18ed4b
								
							
								
							
						 | 
						
							
							
								
								调整滚动条影响
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								c16d251cde
								
							
								
							
						 | 
						
							
							
								
								md渲染兼容,发布功能全选体验修复
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								792aa0246c
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								5ed217d5b5
								
							
								
							
						 | 
						
							
							
								
								调试
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								4823030923
								
							
								
							
						 | 
						
							
							
								
								实现视频地址
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								7e3062001e
								
							
								
							
						 | 
						
							
							
								
								选择实训弹窗状态调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								75560a90c6
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								b9e7356178
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								d76bd34340
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 daiao
							
						 | 
						
							
							
							
							
								
							
								0d6ed2fbd3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_aliyun' into dev_item_bank
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								f49b8240c2
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev_aliyun' and 'new_shixuns_repository' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								6cccd84ef6
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								b43dc57d6b
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev_item_bank', 'develop' and 'new_shixuns_repository' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_item_bank
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								5b4194b553
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								bb2e1eb2bf
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								7d9ce0f706
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'new_shixuns_repository' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_item_bank
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								85b73a5313
								
							
								
							
						 | 
						
							
							
								
								调整课堂搜索
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								7fd8a10bf3
								
							
								
							
						 | 
						
							
							
								
								调整课堂搜索
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								7ad2ea121a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_item_bank
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								bead5d1a1a
								
							
								
							
						 | 
						
							
							
								
								一键评阅
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								3178bd0f63
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev_aliyun' and 'dev_item_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_item_bank
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								85056d3df5
								
							
								
							
						 | 
						
							
							
								
								调整md加密影响接口+封装
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								c76facf3f3
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								91289e8d08
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								939383c457
								
							
								
							
						 | 
						
							
							
								
								调整jupter 和课堂shixun相关
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								cf657d44ee
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								4d5f902f1c
								
							
								
							
						 | 
						
							
							
								
								调整实训弹窗筛选规则
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								71651c71e9
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								826ad20355
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								0929b5f38f
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								e2b252637a
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev_aliyun' and 'dev_jupyter' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_jupyter
							
							
							
							
							
							
							
							 Conflicts:
	app/controllers/myshixuns_controller.rb
	public/react/src/modules/courses/coursesPublic/Newshixunmodel.css 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								0aa695d7f1
								
							
								
							
						 | 
						
							
							
								
								实训弹框 塞选改版
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								5fa16f3124
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								c367cd8d01
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								570e3849eb
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								51ea99be10
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								8bee1c9bc3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'jupyter' of https://bdgit.educoder.net/Hjqreturn/educoder into jupyter
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树林
							
						 | 
						
							
							
							
							
								
							
								83e28112b2
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								6578478715
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								feabdaf954
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								03b02aec7e
								
							
								
							
						 | 
						
							
							
								
								调整资源上传
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								cxt
							
						 | 
						
							
							
							
							
								
							
								0eb0868b7e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_aliyun' into dev_cxt
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								92670dd1e4
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 杨树明
							
						 | 
						
							
							
							
							
								
							
								3fb77abb5b
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								
								 caishi
							
						 | 
						
							
							
							
							
								
							
								b09075af21
								
							
								
							
						 | 
						
							
							
								
								无数据公用组件,默认宽度100%
							
							
							
							
							
						 | 
						
							6 years ago |