Celeter
							
						 | 
						
							
							
							
							
								
							
								2e1a876806
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://github.com/gedoor/legado
							
							
							
							
							
							
							
							 Conflicts:
	app/src/main/java/io/legado/app/constant/AppPattern.kt 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								Celeter
							
						 | 
						
							
							
							
							
								
							
								9d69345023
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								Celeter
							
						 | 
						
							
							
							
							
								
							
								545a312e55
								
							
								
							
						 | 
						
							
							
								
								epub支持外部模板
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								kunfei
							
						 | 
						
							
							
							
								
								
							
							
								
							
								96e924945f
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1064 from bushixuanqi/patch-42
							
							
							
							
							
							
							
							Update AppPattern.kt 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								bushixuanqi
							
						 | 
						
							
							
							
								
								
							
							
								
							
								8bff54309d
								
									
								
							
								
							
						 | 
						
							
							
								
								Update AppPattern.kt
							
							
							
							
							
							
							
							去掉正则中一个无用的前视断言,加快执行速度 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								kunfei
							
						 | 
						
							
							
							
								
								
							
							
								
							
								994ce4babc
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1063 from bushixuanqi/patch-41
							
							
							
							
							
							
							
							Update AppPattern.kt 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								kunfei
							
						 | 
						
							
							
							
								
								
							
							
								
							
								e3396d2fc7
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1062 from david082321/patch-1
							
							
							
							
							
							
							
							Update zh-TW translation 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								kunfei
							
						 | 
						
							
							
							
								
								
							
							
								
							
								fb32ec788e
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1061 from bushixuanqi/patch-40
							
							
							
							
							
							
							
							Update LocalBook.kt 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								Celeter
							
						 | 
						
							
							
							
								
								
							
							
								
							
								8e8c0d6a1e
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1 from gedoor/master
							
							
							
							
							
							
							
							修复htmlFormatter错误 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								bushixuanqi
							
						 | 
						
							
							
							
								
								
							
							
								
							
								4a74b96c22
								
									
								
							
								
							
						 | 
						
							
							
								
								Update AppPattern.kt
							
							
							
							
							
							
							
							修复上次修改时,忘记在src前加[^>]*,导致没有数据属性的图片标签没被匹配到的问题。 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								7da9ff6912
								
							
								
							
						 | 
						
							
							
								
								修复htmlFormatter错误
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								952581db05
								
							
								
							
						 | 
						
							
							
								
								修复htmlFormatter错误
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								david082321
							
						 | 
						
							
							
							
								
								
							
							
								
							
								4170301b4b
								
									
								
							
								
							
						 | 
						
							
							
								
								Update strings.xml
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								3ca9015de9
								
							
								
							
						 | 
						
							
							
								
								edit updateLog.md
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								0e79e92c84
								
							
								
							
						 | 
						
							
							
								
								按键设置添加重置按钮
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								bushixuanqi
							
						 | 
						
							
							
							
								
								
							
							
								
							
								dd08dd2e14
								
									
								
							
								
							
						 | 
						
							
							
								
								Update LocalBook.kt
							
							
							
							
							
							
							
							简化 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								47106522bc
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								7203a948a5
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								0b0ca0c6cf
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								kunfei
							
						 | 
						
							
							
							
								
								
							
							
								
							
								132e704a1d
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1060 from bushixuanqi/patch-39
							
							
							
							
							
							
							
							Update HtmlFormatter.kt 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								bushixuanqi
							
						 | 
						
							
							
							
								
								
							
							
								
							
								92597a82d3
								
									
								
							
								
							
						 | 
						
							
							
								
								Update HtmlFormatter.kt
							
							
							
							
							
							
							
							精简图片格式化程序,提供执行效率,改重复匹配为依次查找 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								8282386f62
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								gedoor
							
						 | 
						
							
							
							
							
								
							
								13bf96c475
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								kunfei
							
						 | 
						
							
							
							
								
								
							
							
								
							
								fcdc167d3f
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1058 from bushixuanqi/patch-37
							
							
							
							
							
							
							
							Update HtmlFormatter.kt 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								kunfei
							
						 | 
						
							
							
							
								
								
							
							
								
							
								93f08248ad
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1057 from bushixuanqi/patch-36
							
							
							
							
							
							
							
							Update AppPattern.kt 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								kunfei
							
						 | 
						
							
							
							
								
								
							
							
								
							
								297981fd95
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1052 from bushixuanqi/patch-28
							
							
							
							
							
							
							
							Update AppConst.kt 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								kunfei
							
						 | 
						
							
							
							
								
								
							
							
								
							
								bf9519d886
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1051 from bushixuanqi/patch-27
							
							
							
							
							
							
							
							Update PreferKey.kt 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								kunfei
							
						 | 
						
							
							
							
								
								
							
							
								
							
								9923dd10ce
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1050 from bushixuanqi/patch-26
							
							
							
							
							
							
							
							Update AppConfig.kt 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								kunfei
							
						 | 
						
							
							
							
								
								
							
							
								
							
								eac47e998a
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1049 from bushixuanqi/patch-25
							
							
							
							
							
							
							
							Update LocalBook.kt 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								kunfei
							
						 | 
						
							
							
							
								
								
							
							
								
							
								440912c82f
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1048 from bushixuanqi/patch-24
							
							
							
							
							
							
							
							Update ImportBookActivity.kt 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								kunfei
							
						 | 
						
							
							
							
								
								
							
							
								
							
								2af9ed159b
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1047 from bushixuanqi/patch-20
							
							
							
							
							
							
							
							Update import_book.xml 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								kunfei
							
						 | 
						
							
							
							
								
								
							
							
								
							
								44a7a9883d
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1046 from bushixuanqi/patch-19
							
							
							
							
							
							
							
							Update strings.xml 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								kunfei
							
						 | 
						
							
							
							
								
								
							
							
								
							
								742c273323
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1045 from bushixuanqi/patch-18
							
							
							
							
							
							
							
							Update strings.xml 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								kunfei
							
						 | 
						
							
							
							
								
								
							
							
								
							
								1557b551b1
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1044 from bushixuanqi/patch-17
							
							
							
							
							
							
							
							Update strings.xml 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								kunfei
							
						 | 
						
							
							
							
								
								
							
							
								
							
								abc7f0b7cc
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1043 from bushixuanqi/patch-16
							
							
							
							
							
							
							
							Update strings.xml 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								kunfei
							
						 | 
						
							
							
							
								
								
							
							
								
							
								3f76eeac5e
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1042 from bushixuanqi/patch-15
							
							
							
							
							
							
							
							Update strings.xml 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								kunfei
							
						 | 
						
							
							
							
								
								
							
							
								
							
								884fc61657
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1041 from bushixuanqi/patch-14
							
							
							
							
							
							
							
							Update strings.xml 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								bushixuanqi
							
						 | 
						
							
							
							
								
								
							
							
								
							
								c24eb1b807
								
									
								
							
								
							
						 | 
						
							
							
								
								Update HtmlFormatter.kt
							
							
							
							
							
							
							
							简化网页格式化程序,并修复格式化图片只格式了第一张的问题。 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								bushixuanqi
							
						 | 
						
							
							
							
								
								
							
							
								
							
								6ecea51b04
								
									
								
							
								
							
						 | 
						
							
							
								
								Update AppPattern.kt
							
							
							
							
							
							
							
							优化图片正则、书名正则、作者名正则
图片有data-开头的数据属性时优先用数据属性作为src,没有数据属性时才匹配原生src属性 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								bushixuanqi
							
						 | 
						
							
							
							
								
								
							
							
								
							
								5eeeb2ae8b
								
									
								
							
								
							
						 | 
						
							
							
								
								Update AppConst.kt
							
							
							
							
							
							
							
							添加动态链接指令快捷输入 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								bushixuanqi
							
						 | 
						
							
							
							
								
								
							
							
								
							
								6590bafaa2
								
									
								
							
								
							
						 | 
						
							
							
								
								Update PreferKey.kt
							
							
							
							
							
							
							
							新增自定义“导入文件名”选项 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								bushixuanqi
							
						 | 
						
							
							
							
								
								
							
							
								
							
								30d5435b02
								
									
								
							
								
							
						 | 
						
							
							
								
								Update AppConfig.kt
							
							
							
							
							
							
							
							新增自定义“导入文件名”选项 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								bushixuanqi
							
						 | 
						
							
							
							
								
								
							
							
								
							
								c0d9f0cb3b
								
									
								
							
								
							
						 | 
						
							
							
								
								Update LocalBook.kt
							
							
							
							
							
							
							
							优化本地文件名解析,新增自定义“导入文件名”选项 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								bushixuanqi
							
						 | 
						
							
							
							
								
								
							
							
								
							
								1a3c550d3b
								
									
								
							
								
							
						 | 
						
							
							
								
								Update strings.xml
							
							
							
							
							
							
							
							新增自定义“导入文件名”选项 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								bushixuanqi
							
						 | 
						
							
							
							
								
								
							
							
								
							
								3a3d0c36be
								
									
								
							
								
							
						 | 
						
							
							
								
								Update ImportBookActivity.kt
							
							
							
							
							
							
							
							新增自定义“导入文件名”选项 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								bushixuanqi
							
						 | 
						
							
							
							
								
								
							
							
								
							
								b14575de90
								
									
								
							
								
							
						 | 
						
							
							
								
								Update import_book.xml
							
							
							
							
							
							
							
							新增自定义“导入文件名”选项 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								bushixuanqi
							
						 | 
						
							
							
							
								
								
							
							
								
							
								28549cdc0a
								
									
								
							
								
							
						 | 
						
							
							
								
								Update strings.xml
							
							
							
							
							
							
							
							新增自定义“导入文件名”选项 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								bushixuanqi
							
						 | 
						
							
							
							
								
								
							
							
								
							
								5440f95776
								
									
								
							
								
							
						 | 
						
							
							
								
								Update strings.xml
							
							
							
							
							
							
							
							新增自定义“导入文件名”选项 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								bushixuanqi
							
						 | 
						
							
							
							
								
								
							
							
								
							
								b3bd158aac
								
									
								
							
								
							
						 | 
						
							
							
								
								Update strings.xml
							
							
							
							
							
							
							
							新增自定义“导入文件名”选项 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								bushixuanqi
							
						 | 
						
							
							
							
								
								
							
							
								
							
								7b4c87a0f1
								
									
								
							
								
							
						 | 
						
							
							
								
								Update strings.xml
							
							
							
							
							
							
							
							新增自定义“导入文件名”选项 
							
						 | 
						
							4 years ago |