| 
							
							
								 NerdNumber9 | 71c10df270 | Merge branch 'master' of https://github.com/inorichi/tachiyomi # Conflicts:
#	README.md
#	app/.gitignore
#	app/build.gradle
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAboutController.kt
#	app/src/main/res/raw/changelog_release.xml | 2018-06-09 19:52:02 -04:00 |  | 
			
				
					| 
							
							
								 Jozef Hollý | 9abce0cca3 | Vanity url (#1408) * vanity url
* vanity url
* vanity url | 2018-05-13 11:36:08 +02:00 |  | 
			
				
					| 
							
							
								 NerdNumber9 | 908128b55d | Merge upstream changes | 2017-11-29 21:53:02 -05:00 |  | 
			
				
					| 
							
							
								 Jozef Hollý | 537693f5cf | README, CONTRIBUTING and ISSUE_TEMPLATE, Discord (#952) * Include discord, change issue segment
* Update CONTRIBUTING.md
* Update ISSUE_TEMPLATE.md | 2017-08-28 09:42:44 +02: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 |  | 
			
				
					| 
							
							
								 Jozef Hollý | 634247c590 | New translation system (#844) * Change translation part
* Translated using Weblate (Russian)
Currently translated at 99.1% (355 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/ru/
* Added translation using Weblate (Dutch)
* Translated using Weblate (Spanish)
Currently translated at 67.8% (243 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/es/
* Translated using Weblate (Spanish)
Currently translated at 68.1% (244 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/es/
* Translated using Weblate (Spanish)
Currently translated at 68.4% (245 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/es/
* Translated using Weblate (Spanish)
Currently translated at 68.4% (245 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/es/
* Translated using Weblate (Spanish)
Currently translated at 68.7% (246 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/es/
* Translated using Weblate (Spanish)
Currently translated at 68.7% (246 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/es/
* Translated using Weblate (Dutch)
Currently translated at 48.6% (174 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/nl/
* Translated using Weblate (Dutch)
Currently translated at 48.8% (175 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/nl/
* Translated using Weblate (Spanish)
Currently translated at 68.9% (247 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/es/
* Translated using Weblate (Spanish)
Currently translated at 69.8% (250 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/es/
* Translated using Weblate (Spanish)
Currently translated at 71.2% (255 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/es/
* Translated using Weblate (Dutch)
Currently translated at 55.5% (199 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/nl/
* Translated using Weblate (Spanish)
Currently translated at 99.7% (357 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/es/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (358 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (358 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (358 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/nl/
* Translated using Weblate (Italian)
Currently translated at 86.3% (309 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/it/
* Translated using Weblate (Italian)
Currently translated at 86.8% (311 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/it/
* Translated using Weblate (Italian)
Currently translated at 87.4% (313 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/it/
* Translated using Weblate (Italian)
Currently translated at 87.9% (315 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/it/
* Translated using Weblate (Italian)
Currently translated at 92.4% (331 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/it/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (358 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (358 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/nl/
* Added translation using Weblate (Latvian)
* Translated using Weblate (Dutch)
Currently translated at 100.0% (358 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (358 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/nl/
* Translated using Weblate (Italian)
Currently translated at 98.6% (353 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/it/
* Translated using Weblate (Bulgarian)
Currently translated at 100.0% (358 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/bg/
* Translated using Weblate (Bulgarian)
Currently translated at 100.0% (358 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/bg/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (358 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/nl/
* Added translation using Weblate (Arabic)
* Translated using Weblate (Latvian)
Currently translated at 25.1% (90 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/lv/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (358 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/nl/
* Translated using Weblate (French)
Currently translated at 100.0% (358 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (358 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/fr/
* Added translation using Weblate (Korean)
* Translated using Weblate (Korean)
Currently translated at 1.1% (4 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/ko/
* Translated using Weblate (Korean)
Currently translated at 4.1% (15 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/ko/
트래킹? 동기화? 추적?
* Translated using Weblate (Korean)
Currently translated at 14.2% (51 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/ko/
* Added translation using Weblate (Portuguese (Brazil))
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 72.9% (261 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (358 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (358 of 358 strings)
Translation: Tachiyomi/Main
Translate-URL: http://weblate.j2ghz.com/projects/tachiyomi/main/pt_BR/ | 2017-07-05 17:09:27 +02:00 |  | 
			
				
					| 
							
							
								 NerdNumber9 | 9dbb59f337 | Upstream merge Internal permission change
Fix url adder | 2017-05-04 23:38:17 -04:00 |  | 
			
				
					| 
							
							
								 Jozef Hollý | fd9c24413d | Update CONTRIBUTING.md (#684) Add catalogue redirection to tachiyomi-extensions | 2017-02-12 19:31:38 +01:00 |  | 
			
				
					| 
							
							
								 Jozef Hollý | c31f0b4bb3 | Change travis gradle task, small doc update (#295) * Use gradle task build in travis
* Update CONTRIBUTING.md | 2016-05-10 13:42:08 +02:00 |  | 
			
				
					| 
							
							
								 J2ghz | 9786074119 | Move github files to .github/ | 2016-02-20 12:06:53 +01:00 |  |