NerdNumber9 
							
						 
					 
					
						
						
							
						
						615fa05a75 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/inorichi/tachiyomi  
						
						... 
						
						
						
						# Conflicts:
#	README.md
#	app/build.gradle
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt
#	app/src/main/res/layout/manga_info_controller.xml
#	app/src/main/res/raw/changelog_release.xml 
						
						
					 
					
						2018-03-13 15:58:47 -04:00 
						 
				 
			
				
					
						
							
							
								inorichi 
							
						 
					 
					
						
						
							
						
						0d5b8edf31 
					 
					
						
						
							
							Release v0.7.0  
						
						
						
						
					 
					
						2018-03-11 12:10:56 +01:00 
						 
				 
			
				
					
						
							
							
								inorichi 
							
						 
					 
					
						
						
							
						
						31b45666b0 
					 
					
						
						
							
							Kotlin update  
						
						
						
						
					 
					
						2018-03-09 21:47:02 +01:00 
						 
				 
			
				
					
						
							
							
								inorichi 
							
						 
					 
					
						
						
							
						
						8e50ac67bc 
					 
					
						
						
							
							Bugfixes and extension installation improvements  
						
						
						
						
					 
					
						2018-03-02 18:10:10 +01:00 
						 
				 
			
				
					
						
							
							
								inorichi 
							
						 
					 
					
						
						
							
						
						5a3e30b30a 
					 
					
						
						
							
							Update conductor to latest snapshot (with a minor fix)  
						
						
						
						
					 
					
						2018-02-27 19:06:34 +01:00 
						 
				 
			
				
					
						
							
							
								NerdNumber9 
							
						 
					 
					
						
						
							
						
						a71ae29c98 
					 
					
						
						
							
							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-24 11:13:43 -05:00 
						 
				 
			
				
					
						
							
							
								inorichi 
							
						 
					 
					
						
						
							
						
						49eb638e15 
					 
					
						
						
							
							Dependency updates  
						
						
						
						
					 
					
						2018-02-18 20:02:31 +01:00 
						 
				 
			
				
					
						
							
							
								NerdNumber9 
							
						 
					 
					
						
						
							
						
						c54d26d6ba 
					 
					
						
						
							
							Fix broken favorites sync  
						
						... 
						
						
						
						Release v6.8.2 
						
						
					 
					
						2018-02-15 17:21:33 -05:00 
						 
				 
			
				
					
						
							
							
								NerdNumber9 
							
						 
					 
					
						
						
							
						
						5447bd098b 
					 
					
						
						
							
							Release v6.8.1  
						
						
						
						
					 
					
						2018-02-14 17:21:29 -05:00 
						 
				 
			
				
					
						
							
							
								NerdNumber9 
							
						 
					 
					
						
						
							
						
						2b7c0e8e80 
					 
					
						
						
							
							Fix gallery browsing  
						
						
						
						
					 
					
						2018-02-12 16:22:54 -05:00 
						 
				 
			
				
					
						
							
							
								inorichi 
							
						 
					 
					
						
						
							
						
						02e187f066 
					 
					
						
						
							
							Add notice for updating extensions  
						
						
						
						
					 
					
						2018-02-05 22:55:29 +01:00 
						 
				 
			
				
					
						
							
							
								Carlos 
							
						 
					 
					
						
						
							
						
						854112095b 
					 
					
						
						
							
							Downloading extensions from Github Repo. ( #1101 )  
						
						... 
						
						
						
						Downloading extensions from Github Repo. 
						
						
					 
					
						2018-02-05 22:50:56 +01:00 
						 
				 
			
				
					
						
							
							
								NerdNumber9 
							
						 
					 
					
						
						
							
						
						8c8f2585aa 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						... 
						
						
						
						# Conflicts:
#	README.md
#	app/build.gradle
#	app/src/main/java/eu/kanade/tachiyomi/App.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/updater/UpdateDownloaderReceiver.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoPresenter.kt
#	app/src/main/res/menu/library.xml
#	app/src/main/res/values/strings.xml
#	app/src/test/java/eu/kanade/tachiyomi/data/database/ChapterRecognitionTest.kt 
						
						
					 
					
						2018-01-29 12:16:32 -05:00 
						 
				 
			
				
					
						
							
							
								Carlos 
							
						 
					 
					
						
						
							
						
						7f63e318f1 
					 
					
						
						
							
							Catalog visuals update 1155 ( #1167 )  
						
						... 
						
						
						
						* adjusted search to be lower in navview
* close drawer on search
moved search and reset to bottom
* switched sort icon to arrow
* allow secondary drawer to swipe open and close
* fixed click to collapse for sortgroup, and group item
updated to rc4 flexibleadapter
* added header to drawer
* changed string to Search filters
* collapsed sort group
* fixed arrow size
* added divider line
* fixed vector size
* add divider id and tools text 
						
						
					 
					
						2018-01-23 18:50:48 +01:00 
						 
				 
			
				
					
						
							
							
								Josh 
							
						 
					 
					
						
						
							
						
						34d21c1de3 
					 
					
						
						
							
							Information Page Improvements (click to search, copy to clipboard, etc) ( #1139 )  
						
						... 
						
						
						
						* adds long click to copy details per inorichi/tachiyomi#1127 
* Added the latest update date for inorichi/tachiyomi#1098  and possible fix for inorichi/tachiyomi#1141 
* cleanup some mistakes I left
* adds modifications to full name display for inorichi/tachiyomi#1141  and click to search on various information pieces for inorichi/tachiyomi#860 
* This modifies how the full title shows up in the info pages and also properly ellipsizes the titles in the catalogue/library list views
* Changes full title layout in horizontal mode
* Adds the tags in using AndroidTagGroup library
* reverting the sdk version in the gradle build
* code cleanup
* added back status update 
						
						
					 
					
						2018-01-18 19:15:33 +01:00 
						 
				 
			
				
					
						
							
							
								inorichi 
							
						 
					 
					
						
						
							
						
						75e828923a 
					 
					
						
						
							
							Release v0.6.8  
						
						
						
						
					 
					
						2018-01-16 17:02:13 +01:00 
						 
				 
			
				
					
						
							
							
								inorichi 
							
						 
					 
					
						
						
							
						
						634356e72f 
					 
					
						
						
							
							Release v0.6.7  
						
						
						
						
					 
					
						2018-01-09 20:42:44 +01:00 
						 
				 
			
				
					
						
							
							
								NerdNumber9 
							
						 
					 
					
						
						
							
						
						1a811d0917 
					 
					
						
						
							
							Code cleanup  
						
						... 
						
						
						
						Release v6.6.0
Cleanup changelog 
						
						
					 
					
						2017-12-08 18:21:26 -05:00 
						 
				 
			
				
					
						
							
							
								NerdNumber9 
							
						 
					 
					
						
						
							
						
						9af552c15a 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/inorichi/tachiyomi  
						
						... 
						
						
						
						# Conflicts:
#	README.md
#	app/build.gradle
#	app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/NoResultsException.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/latest_updates/LatestUpdatesPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt 
						
						
					 
					
						2017-12-07 23:20:27 -05:00 
						 
				 
			
				
					
						
							
							
								inorichi 
							
						 
					 
					
						
						
							
						
						f287d313c3 
					 
					
						
						
							
							Release 0.6.6  
						
						
						
						
					 
					
						2017-12-05 19:50:53 +01:00 
						 
				 
			
				
					
						
							
							
								inorichi 
							
						 
					 
					
						
						
							
						
						d690d6e0e3 
					 
					
						
						
							
							Use synthetic view's new caching method  
						
						
						
						
					 
					
						2017-12-03 01:03:15 +01:00 
						 
				 
			
				
					
						
							
							
								inorichi 
							
						 
					 
					
						
						
							
						
						9ba8d88b07 
					 
					
						
						
							
							Dependency updates  
						
						
						
						
					 
					
						2017-12-02 20:59:35 +01:00 
						 
				 
			
				
					
						
							
							
								NerdNumber9 
							
						 
					 
					
						
						
							
						
						b766ddea54 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/inorichi/tachiyomi  
						
						... 
						
						
						
						Fix back button in library search 
						
						
					 
					
						2017-11-29 21:41:05 -05:00 
						 
				 
			
				
					
						
							
							
								NerdNumber9 
							
						 
					 
					
						
						
							
						
						5cb219d83e 
					 
					
						
						
							
							Various changes  
						
						
						
						
					 
					
						2017-11-29 21:44:35 -05:00 
						 
				 
			
				
					
						
							
							
								NerdNumber9 
							
						 
					 
					
						
						
							
						
						908128b55d 
					 
					
						
						
							
							Merge upstream changes  
						
						
						
						
					 
					
						2017-11-29 21:53:02 -05:00 
						 
				 
			
				
					
						
							
							
								NerdNumber9 
							
						 
					 
					
						
						
							
						
						b240960a8a 
					 
					
						
						
							
							Update dependencies  
						
						... 
						
						
						
						Remove travis config as we don't use travis 
						
						
					 
					
						2017-11-29 21:55:56 -05:00 
						 
				 
			
				
					
						
							
							
								inorichi 
							
						 
					 
					
						
						
							
						
						d87c8428fe 
					 
					
						
						
							
							Release 0.6.5  
						
						
						
						
					 
					
						2017-11-29 18:49:22 +01:00 
						 
				 
			
				
					
						
							
							
								inorichi 
							
						 
					 
					
						
						
							
						
						b91d8e4c19 
					 
					
						
						
							
							Release 0.6.5  
						
						
						
						
					 
					
						2017-11-29 18:49:22 +01:00 
						 
				 
			
				
					
						
							
							
								inorichi 
							
						 
					 
					
						
						
							
						
						604929d002 
					 
					
						
						
							
							Update support library and kotlin  
						
						
						
						
					 
					
						2017-11-28 00:21:38 +01:00 
						 
				 
			
				
					
						
							
							
								inorichi 
							
						 
					 
					
						
						
							
						
						4a9151e4aa 
					 
					
						
						
							
							Release 0.6.4  
						
						
						
						
					 
					
						2017-11-23 18:38:51 +01:00 
						 
				 
			
				
					
						
							
							
								inorichi 
							
						 
					 
					
						
						
							
						
						c437a33f2a 
					 
					
						
						
							
							A few fixes and dependency updates  
						
						
						
						
					 
					
						2017-11-11 15:31:32 +01:00 
						 
				 
			
				
					
						
							
							
								inorichi 
							
						 
					 
					
						
						
							
						
						23c0f2c313 
					 
					
						
						
							
							Update subsampling. Export /storage/ to SAF  
						
						
						
						
					 
					
						2017-11-02 18:49:09 +01:00 
						 
				 
			
				
					
						
							
							
								inorichi 
							
						 
					 
					
						
						
							
						
						5c4139be45 
					 
					
						
						
							
							Update flexible adapter. Show fast scroller in chapters screen  
						
						
						
						
					 
					
						2017-11-02 16:58:32 +01:00 
						 
				 
			
				
					
						
							
							
								inorichi 
							
						 
					 
					
						
						
							
						
						f3689f09cd 
					 
					
						
						
							
							Use gradle's new dependencies API. Update a few dependencies  
						
						
						
						
					 
					
						2017-10-28 16:10:51 +02:00 
						 
				 
			
				
					
						
							
							
								inorichi 
							
						 
					 
					
						
						
							
						
						d545cfd38c 
					 
					
						
						
							
							Update Android Studio to 3.0  
						
						
						
						
					 
					
						2017-10-28 14:44:19 +02:00 
						 
				 
			
				
					
						
							
							
								inorichi 
							
						 
					 
					
						
						
							
						
						ca30fd6088 
					 
					
						
						
							
							Actually use latest Glide version. Minor doc fix  
						
						
						
						
					 
					
						2017-10-14 18:37:23 +02:00 
						 
				 
			
				
					
						
							
							
								len 
							
						 
					 
					
						
						
							
						
						1470e9d5ca 
					 
					
						
						
							
							Glide v4  
						
						
						
						
					 
					
						2017-10-14 18:16:11 +02:00 
						 
				 
			
				
					
						
							
							
								len 
							
						 
					 
					
						
						
							
						
						4abd2d709f 
					 
					
						
						
							
							Introduce coroutines.  Fix   #1027 . Lower notification channels' importance  
						
						
						
						
					 
					
						2017-10-13 00:12:29 +02:00 
						 
				 
			
				
					
						
							
							
								len 
							
						 
					 
					
						
						
							
						
						75c41b645a 
					 
					
						
						
							
							Target sdk 26. Dependency updates.  
						
						
						
						
					 
					
						2017-09-23 17:14:04 +02:00 
						 
				 
			
				
					
						
							
							
								Bram van de Kerkhof 
							
						 
					 
					
						
						
							
						
						54c8b3ef29 
					 
					
						
						
							
							Global Search ( #849 )  
						
						... 
						
						
						
						* Global Search
* Cards are now independent of design by use of recycler.
* Added local
* Some attribute fixes + moved onclick to controller.
* Lots of improvements to code
* Reversed some stuff. Thanks API 16
* Code fixes
* Performance improvements
* Moved adapter creation to constructor
* Small changes
* Removed sources settings from settings menu. Added OnChangeListener in catalogue. Made setting icon visible if room.
* bug fix
* Code review part uno
* Code review part uno-2
* Single recycler approach
* Add last source used
* Fix scroll state and some layout issues
* Fix wrong item binding
* Use data class for items
* Calculate item position and count while binding
* Fix background color with slices
* Reuse slices. Fix card background. Flatten constraint layout
* Fix global_search scroll issue
* Store last state with global search
* Minor changes
* Remove catalogue toolbar spinner. Persist catalogue across process restarts
* Save view state of recycler views. Set toolbar title with current query 
						
						
					 
					
						2017-09-23 13:11:39 +02:00 
						 
				 
			
				
					
						
							
							
								len 
							
						 
					 
					
						
						
							
						
						0db4fcc27e 
					 
					
						
						
							
							Release 0.6.3  
						
						
						
						
					 
					
						2017-09-10 12:29:17 +02:00 
						 
				 
			
				
					
						
							
							
								len 
							
						 
					 
					
						
						
							
						
						d95adf2631 
					 
					
						
						
							
							Release 0.6.2  
						
						
						
						
					 
					
						2017-09-09 14:00:21 +02:00 
						 
				 
			
				
					
						
							
							
								inorichi 
							
						 
					 
					
						
						
							
						
						3c550c1781 
					 
					
						
						
							
							Kotlin 1.1.4. Add discord link in about  
						
						
						
						
					 
					
						2017-08-28 10:00:13 +02:00 
						 
				 
			
				
					
						
							
							
								NerdNumber9 
							
						 
					 
					
						
						
							
						
						7053777997 
					 
					
						
						
							
							Release version v6.1.4  
						
						... 
						
						
						
						Offload metadata check to background thread
Add search cache 
						
						
					 
					
						2017-08-28 03:20:35 -04: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 
							
						 
					 
					
						
						
							
						
						08dffda2a1 
					 
					
						
						
							
							Fix NHentai and PervEden sources  
						
						... 
						
						
						
						Version bump to v6.1.2 
						
						
					 
					
						2017-08-25 19:08:33 -04:00 
						 
				 
			
				
					
						
							
							
								NerdNumber9 
							
						 
					 
					
						
						
							
						
						cd291f0a27 
					 
					
						
						
							
							Migrate to realm for metadata  
						
						
						
						
					 
					
						2017-08-25 17:31:38 -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