NerdNumber9 
							
						 
					 
					
						
						
							
						
						c48bebe0b2 
					 
					
						
						
							
							Add option to disable auto lock and add manual locking  
						
						 
						
						
						
						
					 
					
						2018-03-14 18:39:01 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NerdNumber9 
							
						 
					 
					
						
						
							
						
						0dd9e9e015 
					 
					
						
						
							
							Repackage captcha solve activity to UI package  
						
						 
						
						
						
						
					 
					
						2018-03-14 13:17:55 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NerdNumber9 
							
						 
					 
					
						
						
							
						
						d2a2e17e91 
					 
					
						
						
							
							Re-theme lock view to actually match current theme  
						
						 
						
						
						
						
					 
					
						2018-03-14 13:13:57 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NerdNumber9 
							
						 
					 
					
						
						
							
						
						07ce90ab8c 
					 
					
						
						
							
							Add Tsumino captcha display and merge branch 'master' of upstream  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	.github/readme-images/app-icon.png
#	.github/readme-images/screens.png
#	.travis.yml
#	README.md
#	app/build.gradle
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/online/YamlHttpSource.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/online/YamlHttpSourceMappings.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/DynamicConcurrentMergeOperator.java 
						
						
					 
					
						2018-02-25 15:34:19 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NerdNumber9 
							
						 
					 
					
						
						
							
						
						5447bd098b 
					 
					
						
						
							
							Release v6.8.1  
						
						 
						
						
						
						
					 
					
						2018-02-14 17:21:29 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NerdNumber9 
							
						 
					 
					
						
						
							
						
						f18b32626a 
					 
					
						
						
							
							Rewrite link intercept activity  
						
						 
						
						... 
						
						
						
						Fix compatibility issues between lewd sources and manga info screen 
						
						
					 
					
						2018-01-29 15:39:34 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NerdNumber9 
							
						 
					 
					
						
						
							
						
						1a811d0917 
					 
					
						
						
							
							Code cleanup  
						
						 
						
						... 
						
						
						
						Release v6.6.0
Cleanup changelog 
						
						
					 
					
						2017-12-08 18:21:26 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NerdNumber9 
							
						 
					 
					
						
						
							
						
						dec4471871 
					 
					
						
						
							
							Second attempt to update changelog  
						
						 
						
						... 
						
						
						
						Fix wording in metadata fetch dialog 
						
						
					 
					
						2017-11-30 21:07:26 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NerdNumber9 
							
						 
					 
					
						
						
							
						
						5cb219d83e 
					 
					
						
						
							
							Various changes  
						
						 
						
						
						
						
					 
					
						2017-11-29 21:44:35 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NerdNumber9 
							
						 
					 
					
						
						
							
						
						84121ff901 
					 
					
						
						
							
							Release v6.1.3  
						
						 
						
						... 
						
						
						
						Make search engine synchronous
Offload some search engine tasks to background threads
Minor search engine speedups 
						
						
					 
					
						2017-08-26 03:40:59 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NerdNumber9 
							
						 
					 
					
						
						
							
						
						bcc2ec1668 
					 
					
						
						
							
							Fix migration dialog showing on startup even with no manga  
						
						 
						
						
						
						
					 
					
						2017-08-25 22:26:57 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NerdNumber9 
							
						 
					 
					
						
						
							
						
						cd291f0a27 
					 
					
						
						
							
							Migrate to realm for metadata  
						
						 
						
						
						
						
					 
					
						2017-08-25 17:31:38 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NerdNumber9 
							
						 
					 
					
						
						
							
						
						dcb6ae44dd 
					 
					
						
						
							
							Fix intercept activity  
						
						 
						
						
						
						
					 
					
						2017-08-24 17:33:03 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NerdNumber9 
							
						 
					 
					
						
						
							
						
						b20b3d6f5c 
					 
					
						
						
							
							Add fingerprint to lock UI  
						
						 
						
						... 
						
						
						
						Migrate login UI to conductor
Fix batch add controller not saving EditText content onResume
Prevent double-locking of lock UI
Remove back button from lock UI
Fix login preference not updating 
						
						
					 
					
						2017-08-24 17:11:43 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NerdNumber9 
							
						 
					 
					
						
						
							
						
						32d02f9329 
					 
					
						
						
							
							Migrate to Tachiyomi 6.1  
						
						 
						
						... 
						
						
						
						Rewrite batch add UI
Rewrite lock UI 
						
						
					 
					
						2017-08-24 12:28:54 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NerdNumber9 
							
						 
					 
					
						
						
							
						
						3da7c47bf5 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/inorichi/tachiyomi  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	app/build.gradle
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/ActivityMixin.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/adapter/FlexibleViewHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/adapter/SmartFragmentStatePagerAdapter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/fragment/BaseFragment.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/fragment/BaseRxFragment.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/fragment/FragmentMixin.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/latest_updates/LatestUpdatesFragment.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/ChangelogDialogFragment.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaEvent.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersFragment.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/ChapterCountEvent.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaFavoriteEvent.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoFragment.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackFragment.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/recently_read/RecentlyReadFragment.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAboutFragment.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedFragment.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadsFragment.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsFragment.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralFragment.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsTrackingFragment.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/AndroidComponentUtil.java
#	app/src/main/java/eu/kanade/tachiyomi/widget/preference/LibraryColumnsDialog.kt
#	app/src/main/java/eu/kanade/tachiyomi/widget/preference/SimpleDialogPreference.kt
#	app/src/main/res/layout/activity_download_manager.xml
#	app/src/main/res/layout/activity_edit_categories.xml
#	app/src/main/res/layout/activity_manga.xml
#	app/src/main/res/layout/activity_preferences.xml
#	app/src/main/res/layout/fragment_backup.xml
#	app/src/main/res/layout/fragment_download_queue.xml
#	app/src/main/res/layout/fragment_library.xml
#	app/src/main/res/layout/fragment_library_category.xml
#	app/src/main/res/layout/item_chapter.xml
#	app/src/main/res/layout/item_recent_chapters.xml
#	app/src/main/res/layout/toolbar.xml
#	app/src/main/res/raw/changelog_release.xml
#	app/src/main/res/values/arrays.xml
#	app/src/main/res/xml/pref_about.xml
#	app/src/main/res/xml/pref_advanced.xml
#	app/src/main/res/xml/pref_downloads.xml
#	app/src/main/res/xml/pref_general.xml
#	app/src/main/res/xml/pref_reader.xml
#	app/src/main/res/xml/pref_sources.xml
#	app/src/main/res/xml/pref_tracking.xml
Migrate to Tachiyomi 6.1
Rewrite batch add UI 
						
						
					 
					
						2017-08-24 11:24:23 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NerdNumber9 
							
						 
					 
					
						
						
							
						
						9dbb59f337 
					 
					
						
						
							
							Upstream merge  
						
						 
						
						... 
						
						
						
						Internal permission change
Fix url adder 
						
						
					 
					
						2017-05-04 23:38:17 -04:00