Commit Graph

57 Commits

Author SHA1 Message Date
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
5a3e30b30a Update conductor to latest snapshot (with a minor fix) 2018-02-27 19:06:34 +01:00
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
49eb638e15 Dependency updates 2018-02-18 20:02:31 +01:00
b766ddea54 Merge branch 'master' of https://github.com/inorichi/tachiyomi
Fix back button in library search
2017-11-29 21:41:05 -05:00
908128b55d Merge upstream changes 2017-11-29 21:53:02 -05:00
b240960a8a Update dependencies
Remove travis config as we don't use travis
2017-11-29 21:55:56 -05:00
604929d002 Update support library and kotlin 2017-11-28 00:21:38 +01:00
1347bfe243 This one should finally fix travis builds 2017-10-28 16:39:34 +02:00
f3689f09cd Use gradle's new dependencies API. Update a few dependencies 2017-10-28 16:10:51 +02:00
d545cfd38c Update Android Studio to 3.0 2017-10-28 14:44:19 +02:00
cd291f0a27 Migrate to realm for metadata 2017-08-25 17:31:38 -04:00
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
len
1794782323 Add option to invert volume keys. Closes #834 2017-06-11 11:36:12 +02:00
len
0210ee8747 Fix #819. Update support lib 2017-06-10 16:49:40 +02:00
9dbb59f337 Upstream merge
Internal permission change
Fix url adder
2017-05-04 23:38:17 -04:00
len
91cb892c74 Release 0.5.2 2017-04-14 12:46:58 +02:00
len
3be9881997 Kissmanga fix. Kotlin 1.1.1 2017-03-18 14:11:16 +01:00
len
c00eaae62b AS 2.3 and Kotlin 1.1 2017-03-03 17:42:46 +01:00
len
91c58640a7 Add crop borders functionality, #219 2017-02-12 00:30:32 +01:00
len
f98e0858a7 Improve download discovery performance in library updates view 2016-12-09 20:23:48 +01:00
414b8c9f21 Now uses glide for notification 2016-10-25 15:49:21 +02:00
len
22bbcaeed0 Remove builtin decoders from Rapid 2016-10-23 16:42:48 +02:00
len
e375101132 Revert "Support API 25. Use new DividerItemDecoration."
This reverts commit 05b14bae7b.
2016-10-22 21:42:48 +02:00
len
05b14bae7b Support API 25. Use new DividerItemDecoration. 2016-10-22 20:21:25 +02:00
len
b6011d4cf5 Minor changes 2016-10-16 20:50:32 +02:00
0b3dda18d3 Implement latest updates. (#472) 2016-09-30 21:11:51 +02:00
len
9f20e40257 Update kotlin and gradle build tools 2016-09-22 19:49:47 +02:00
len
46e09d174b Travis fix. Update gradle 2016-09-01 20:05:11 +02:00
len
f768393a4b Bump dependencies, set target sdk 24 2016-07-30 16:04:43 +02:00
172305fc6a Wrong card background fix + bump gradle version (#337) 2016-06-07 20:14:36 +02:00
len
e881488bcc Refactor and convert to Kotlin base classes. Fix FAB behavior 2016-04-28 21:54:54 +02:00
len
b4211ddc0c Remove unneeded repository 2016-04-09 17:46:42 +02:00
len
67c4781376 Upgrade support library. Switch gradle build tools and AS to 2.0. Adapt code to new support lib 2016-04-08 16:18:41 +02:00
len
06c63f1207 Fix a crash in the reader when restoring the instance. Removed capitalization on each word 2016-03-29 13:47:32 +02:00
len
53fae2939a Remove apt, add manual EventBusIndex (not sure if it works) 2016-03-19 18:39:18 +01:00
len
14f248546a Use kapt, remove retrolambda, migrate database and source to Kotlin 2016-03-19 17:48:55 +01:00
len
4ccce424de Reader view in Kotlin. Upgrade gradle wrapper. Remove ButterKnife from the project 2016-03-18 20:21:30 +01:00
len
f49577bc77 Manga in Kotlin. Expect some errors yet 2016-03-13 22:06:32 +01:00
b95d0e2848 Bump dependencies. Move ReactiveNetwork to app module. 2016-02-26 15:56:56 +01:00
c0452038f7 Partial migration of data package to Kotlin 2016-02-21 18:55:37 +01:00
c35184abdc Upgrade gradle. Other minor changes 2016-02-06 00:37:11 +01:00
b174adbab0 Use a gradient at the bottom of the cover. Remove external repositories from gradle 2016-01-24 23:41:21 +01:00
dd0a2d842a Improve recent chapters layout 2016-01-21 16:38:25 +01:00
67c9420606 Bump dependencies. Minor changes to download manager 2016-01-16 18:10:05 +01:00
d03e7e2f8c Add Rapid decoder for better image support. Reorganize readers. 2016-01-08 20:16:17 +01:00
e548cbf171 Allow to create/remove categories. Some refactoring. 2015-12-28 01:13:52 +01:00
04d9176c3c Update dependencies. Update last chapter read in MAL only when the reader is left, instead of on every chapter change. Other minor improvements. 2015-12-16 15:37:00 +01:00
5fda4ad786 Add sdk manager to gradle 2015-12-09 20:54:00 +01:00
8f7443a686 Add an option to change cache size and clear the cache 2015-12-07 15:53:01 +01:00