arkon
							
						 
					 | 
					
						
						
							
						
						39e36f957d
					 | 
					
						
						
							
							More extreme method for enforcing WebView availability
						
						
						
						
						
						
						
						(cherry picked from commit 6cd34614f6)
# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/App.kt 
						
						
					 | 
					
						2020-05-04 01:34:02 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						e84c39bf7b
					 | 
					
						
						
							
							Hitomi tag fixes(should now work for most tags)
						
						
						
						
						
						
					 | 
					
						2020-05-04 01:18:40 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						5641b33bdd
					 | 
					
						
						
							
							Add EH and similar specific tag formatting for global and local search
						
						
						
						
						
						
					 | 
					
						2020-05-04 00:53:38 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						72681bef83
					 | 
					
						
						
							
							Fix showing hidden sources like the merged source
						
						
						
						
						
						
					 | 
					
						2020-05-04 00:16:33 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						6de16125f7
					 | 
					
						
						
							
							Fix cutoff for new buttons if your screen is small
						
						
						
						
						
						
					 | 
					
						2020-05-04 00:15:56 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						46478546a8
					 | 
					
						
						
							
							Implement long click global search for tags
						
						
						
						
						
						
					 | 
					
						2020-05-04 00:06:20 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						d4659ffaae
					 | 
					
						
						
							
							Fix merge with another crash
						
						
						
						
						
						
					 | 
					
						2020-05-04 00:05:44 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						e192806950
					 | 
					
						
						
							
							Fix migration and merge buttons now showing up
						
						
						
						
						
						
					 | 
					
						2020-05-03 23:09:02 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						1170334fde
					 | 
					
						
						
							
							Fix adding a manga to library crash
						
						
						
						
						
						
					 | 
					
						2020-05-03 23:05:42 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						d368064549
					 | 
					
						
						
							
							Possibly fix backup restores
						
						
						
						
						
						
					 | 
					
						2020-05-03 22:36:30 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						ada0703d17
					 | 
					
						
						
							
							Remove unneeded variable
						
						
						
						
						
						
					 | 
					
						2020-05-03 21:46:43 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						06d3a753ac
					 | 
					
						
						
							
							Add manga migration and merge buttons
						
						
						
						
						
						
					 | 
					
						2020-05-03 21:24:00 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						567c6ea8e7
					 | 
					
						
						
							
							Merging bugfix
						
						
						
						
						
						
					 | 
					
						2020-05-03 21:23:33 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						bfc0868721
					 | 
					
						
						
							
							add built-in source icons
						
						
						
						
						
						
						
						(cherry picked from commit f4533d9c7e0f989095bf40198dda59e58e1a6e01) 
						
						
					 | 
					
						2020-05-03 19:35:53 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						f5b7a8db1a
					 | 
					
						
						
							
							Setup for install
						
						
						
						
						
						
					 | 
					
						2020-05-03 19:33:28 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						bef0a44447
					 | 
					
						
						
							
							It Builds!
						
						
						
						
						
						
					 | 
					
						2020-05-03 18:34:46 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						e9ff202851
					 | 
					
						
						
							
							Basic fixes
						
						
						
						
						
						
					 | 
					
						2020-05-03 15:03:07 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						4a3323f7d0
					 | 
					
						
						
							
							Revert to old sorting library (fixes #3034)
						
						
						
						
						
						
						
						(cherry picked from commit e29e94a5a1) 
						
						
					 | 
					
						2020-05-03 14:41:17 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						0014a0ca6c
					 | 
					
						
						
							
							Migrate to flow
						
						
						
						
						
						
					 | 
					
						2020-05-03 14:37:31 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						7e99a9f789
					 | 
					
						
						
							
							Linting Fixes AZ
						
						
						
						
						
						
					 | 
					
						2020-05-03 14:36:19 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						03e5c5ca10
					 | 
					
						
						
							
							Linting fixes
						
						
						
						
						
						
						
						(cherry picked from commit 3f63b320c4) 
						
						
					 | 
					
						2020-05-03 14:35:49 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						e4ff988f4d
					 | 
					
						
						
							
							Revert some seekbar event listener changes
						
						
						
						
						
						
						
						(cherry picked from commit 134dbd2f1d) 
						
						
					 | 
					
						2020-05-03 14:34:40 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						dde2320afc
					 | 
					
						
						
							
							Replace some listeners with flowbindings
						
						
						
						
						
						
						
						(cherry picked from commit dad010a891) 
						
						
					 | 
					
						2020-05-03 14:34:40 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						988d508025
					 | 
					
						
						
							
							Remove option to turn off app update checks, check every 3 days
						
						
						
						
						
						
						
						(cherry picked from commit 8c1ec43500) 
						
						
					 | 
					
						2020-05-03 14:34:11 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						24850450cb
					 | 
					
						
						
							
							Migrate more preferences
						
						
						
						
						
						
						
						(cherry picked from commit 53a3be0703) 
						
						
					 | 
					
						2020-05-03 14:33:03 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						e97d1ac257
					 | 
					
						
						
							
							Replace deprecated adapterPosition with bindingAdapterPosition
						
						
						
						
						
						
						
						(cherry picked from commit c967308859) 
						
						
					 | 
					
						2020-05-03 14:31:00 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rani Sargees
							
						 
					 | 
					
						
						
							
						
						bc44eee5b7
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/az4521/Tachiyomi
						
						
						
						
						
						
						
						necessary, 
						
						
					 | 
					
						2020-05-03 14:29:54 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						7a010e3446
					 | 
					
						
						
							
							Material Dialogs Eh Part 3
						
						
						
						
						
						
					 | 
					
						2020-05-03 14:29:11 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						cb4fbb19ed
					 | 
					
						
						
							
							Material Dialogs Eh Part 2
						
						
						
						
						
						
					 | 
					
						2020-05-03 14:29:10 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						ddf0357c5c
					 | 
					
						
						
							
							Material Dialogs Eh Part 1
						
						
						
						
						
						
					 | 
					
						2020-05-03 14:28:40 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						800c01ea42
					 | 
					
						
						
							
							Lint fixes and update build.gradle
						
						
						
						
						
						
					 | 
					
						2020-05-03 14:27:34 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						68bfba486e
					 | 
					
						
						
							
							Added number of pages to preload configuration
						
						
						
						
						
						
					 | 
					
						2020-05-03 14:26:05 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						c09f6cb20c
					 | 
					
						
						
							
							Lint fixes
						
						
						
						
						
						
					 | 
					
						2020-05-03 14:25:41 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						959bad0247
					 | 
					
						
						
							
							Lint fixes, likely nothing broke
						
						
						
						
						
						
					 | 
					
						2020-05-03 14:25:24 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						efb8555d76
					 | 
					
						
						
							
							Update to SDK 29 (Android 10) (#2468)
						
						
						
						
						
						
						
						(cherry picked from commit 83d5e458ca) 
						
						
					 | 
					
						2020-05-03 14:24:52 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						a393772083
					 | 
					
						
						
							
							Move things back into the EH package, no need for them to be in the regular app
						
						
						
						
						
						
					 | 
					
						2020-05-03 14:24:22 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						b4ade8c15d
					 | 
					
						
						
							
							Lint fixes, likely no visible changes
						
						
						
						
						
						
					 | 
					
						2020-05-03 14:22:13 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rani Sargees
							
						 
					 | 
					
						
						
							
						
						03502f6533
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/az4521/Tachiyomi
						
						
						
						
						
						
					 | 
					
						2020-05-03 14:21:26 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rani Sargees
							
						 
					 | 
					
						
						
							
						
						42c7669bca
					 | 
					
						
						
							
							database changes for mergedsources
						
						
						
						
						
						
					 | 
					
						2020-05-03 14:21:26 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						1916751f4f
					 | 
					
						
						
							
							Complete RxBindings to FlowBinding migration
						
						
						
						
						
						
						
						(cherry picked from commit 3d10dad780) 
						
						
					 | 
					
						2020-05-03 14:19:54 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						e46dd808e7
					 | 
					
						
						
							
							Remove unused widget styles and animations
						
						
						
						
						
						
						
						(cherry picked from commit 01dd46c5ed) 
						
						
					 | 
					
						2020-05-03 14:16:06 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						5e92664761
					 | 
					
						
						
							
							Replace some old color attribute usages
						
						
						
						
						
						
						
						(cherry picked from commit 11e10f6eff) 
						
						
					 | 
					
						2020-05-03 14:15:36 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						aa5fd22db0
					 | 
					
						
						
							
							Add confirm exist setting (closes #2615)
						
						
						
						
						
						
						
						(cherry picked from commit 321a4b24b9) 
						
						
					 | 
					
						2020-05-03 14:14:45 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						56b1c07f58
					 | 
					
						
						
							
							Refactor databinding fields to parent abstract classes
						
						
						
						
						
						
						
						(cherry picked from commit 6a532b836d) 
						
						
					 | 
					
						2020-05-03 14:12:46 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						2ecac08bcc
					 | 
					
						
						
							
							Round manga info cover
						
						
						
						
						
						
						
						(cherry picked from commit e388f0d563) 
						
						
					 | 
					
						2020-05-03 14:11:12 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						95002a6e87
					 | 
					
						
						
							
							More FlowPreferences migrations
						
						
						
						
						
						
						
						(cherry picked from commit b8152dd7f9) 
						
						
					 | 
					
						2020-05-03 14:03:50 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						cea2b42b41
					 | 
					
						
						
							
							More FlowPreferences migrations
						
						
						
						
						
						
						
						(cherry picked from commit 401210da44) 
						
						
					 | 
					
						2020-05-03 14:02:47 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						8bc5a7d746
					 | 
					
						
						
							
							Migrate some RxSharedPreferences to FlowSharedPreferences
						
						
						
						
						
						
						
						(cherry picked from commit beb81b657e) 
						
						
					 | 
					
						2020-05-03 14:00:35 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						85723b975b
					 | 
					
						
						
							
							Lint fix
						
						
						
						
						
						
					 | 
					
						2020-05-03 13:58:54 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jobobby04
							
						 
					 | 
					
						
						
							
						
						a2e05cf80b
					 | 
					
						
						
							
							Move bitmap images to nodpi
						
						
						
						
						
						
						
						(cherry picked from commit 7118817df7) 
						
						
					 | 
					
						2020-05-03 13:58:29 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |