bushixuanqi
							
						 | 
						
							
							
							
							
								
							
								4a4208c031
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into master
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								68ccd24681
								
							
								
							
						 | 
						
							
							
								
								添加程序结束判断,所有activity和service都结束
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								15d70507c3
								
							
								
							
						 | 
						
							
							
								
								添加程序结束判断,所有activity和service都结束
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								c5f9c85a70
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								bushixuanqi
							
						 | 
						
							
							
							
							
								
							
								174d139988
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into master
							
							
							
							
							
							
							
							# Conflicts:
#	app/src/main/java/io/legado/app/model/analyzeRule/RuleAnalyzer.kt 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								f176f97641
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								3b30b6b496
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								ec102a5cd2
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								6fb98f1afc
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								3434dcf748
								
							
								
							
						 | 
						
							
							
								
								导入书源时重命名分组和保留名称不冲突
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								7a8c0a545b
								
							
								
							
						 | 
						
							
							
								
								导入书源时重命名分组和保留名称不冲突
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								d172062c00
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								4adff555b9
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								5283cfa6c0
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								kunfei
							
						 | 
						
							
							
							
								
								
							
							
								
							
								46eb7e7886
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1112 from bushixuanqi/master
							
							
							
							
							
							
							
							修复上次简化意外造成的逻辑错误,以及再次简化 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								bushixuanqi
							
						 | 
						
							
							
							
								
								
							
							
								
							
								ec51c4af15
								
									
								
							
								
							
						 | 
						
							
							
								
								Update RuleAnalyzer.kt
							
							
							
							
							
							
							
							优化注释描述 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								bushixuanqi
							
						 | 
						
							
							
							
								
								
							
							
								
							
								249a51531a
								
									
								
							
								
							
						 | 
						
							
							
								
								Update RuleAnalyzer.kt
							
							
							
							
							
							
							
							格式化代码 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								bushixuanqi
							
						 | 
						
							
							
							
								
								
							
							
								
							
								30cc06e038
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'gedoor:master' into master
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								bushixuanqi
							
						 | 
						
							
							
							
								
								
							
							
								
							
								25e70c816a
								
									
								
							
								
							
						 | 
						
							
							
								
								Update RuleAnalyzer.kt
							
							
							
							
							
							
							
							修复上次简化过度,意外造成的逻辑错误,测试后没问题了 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								bushixuanqi
							
						 | 
						
							
							
							
							
								
							
								31ea795e38
								
							
								
							
						 | 
						
							
							
								
								修复上次简化过度,意外造成的逻辑错误,测试后没问题了
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								bushixuanqi
							
						 | 
						
							
							
							
							
								
							
								3712feff2e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into master
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								457b864b63
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								4b3750519d
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								8b8f362248
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								f75738f685
								
							
								
							
						 | 
						
							
							
								
								格式化代码
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								ca57577711
								
							
								
							
						 | 
						
							
							
								
								格式化代码
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								kunfei
							
						 | 
						
							
							
							
								
								
							
							
								
							
								306fc67901
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1111 from bushixuanqi/master
							
							
							
							
							
							
							
							优化与简化 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								bushixuanqi
							
						 | 
						
							
							
							
								
								
							
							
								
							
								6dcc556bd1
								
									
								
							
								
							
						 | 
						
							
							
								
								Update RuleAnalyzer.kt
							
							
							
							
							
							
							
							简化 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								bushixuanqi
							
						 | 
						
							
							
							
								
								
							
							
								
							
								b7e002e1fe
								
									
								
							
								
							
						 | 
						
							
							
								
								Update RuleAnalyzer.kt
							
							
							
							
							
							
							
							修正与简化 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								bushixuanqi
							
						 | 
						
							
							
							
								
								
							
							
								
							
								07143c172d
								
									
								
							
								
							
						 | 
						
							
							
								
								Update RuleAnalyzer.kt
							
							
							
							
							
							
							
							优化 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								bushixuanqi
							
						 | 
						
							
							
							
								
								
							
							
								
							
								9dd2b3935d
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'gedoor:master' into master
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								bushixuanqi
							
						 | 
						
							
							
							
								
								
							
							
								
							
								3813a7bf10
								
									
								
							
								
							
						 | 
						
							
							
								
								Update RuleAnalyzer.kt
							
							
							
							
							
							
							
							优化 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								bushixuanqi
							
						 | 
						
							
							
							
								
								
							
							
								
							
								d567e217bc
								
									
								
							
								
							
						 | 
						
							
							
								
								Update RuleAnalyzer.kt
							
							
							
							
							
							
							
							优化 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								9cc1e15864
								
							
								
							
						 | 
						
							
							
								
								发现界面添加自定义样式
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								4230cca24b
								
							
								
							
						 | 
						
							
							
								
								发现界面添加自定义样式
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								1f2684d5a1
								
							
								
							
						 | 
						
							
							
								
								发现界面添加自定义样式
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								d4ee79029d
								
							
								
							
						 | 
						
							
							
								
								发现界面添加自定义样式
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								9deda74008
								
							
								
							
						 | 
						
							
							
								
								发现界面添加自定义样式
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								c6c07234f8
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								f805081a51
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								kunfei
							
						 | 
						
							
							
							
								
								
							
							
								
							
								89cc0a5bed
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1110 from bushixuanqi/patch-1
							
							
							
							
							
							
							
							Update RuleAnalyzer.kt 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								bushixuanqi
							
						 | 
						
							
							
							
								
								
							
							
								
							
								b2aefb0b8c
								
									
								
							
								
							
						 | 
						
							
							
								
								Update RuleAnalyzer.kt
							
							
							
							
							
							
							
							平衡组区分内嵌{JSONPATH}和非内嵌JSONPATH
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								c49e6bae53
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								9180a4c40d
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								3da4e43656
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								cf2f0dbf38
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								2bb315d4bd
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								279355cf24
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								8a04100945
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								0aba2edcee
								
							
								
							
						 | 
						
							
							
								
								增加webdav订阅
							
							
							
							
							
						 | 
						
							4 years ago |