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
|
08baf798aa
|
Give view pager unique ids, avoiding subtle bugs
|
2017-12-04 22:22:35 +01:00 |
|
inorichi
|
04638535d8
|
Fix library options menu shown in chapters screen. Resolves #1096
|
2017-11-30 15:37:20 +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 |
|
inorichi
|
28a21d0b8f
|
Minor changes to download cache. Also keep the library view, as recreation is expensive
|
2017-11-28 23:58:37 +01:00 |
|
inorichi
|
e1582bd73a
|
Minor changes to download cache. Also keep the library view, as recreation is expensive
|
2017-11-28 23:58:37 +01: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 |
|
inorichi
|
2eeac0bf8b
|
UI with Conductor (#784)
|
2017-05-06 15:49:39 +02:00 |
|