Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge2.0 #1023

Merged
merged 24 commits into from
Jul 20, 2023
Merged

merge2.0 #1023

merged 24 commits into from
Jul 20, 2023

Commits on Jun 6, 2023

  1. merge28 

    Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/f03a83413689923633c8ebe5634b34c566733961
    @LuftVerbot
    LuftVerbot committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    aeeecad View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2023

  1. Update EntryToolbar.kt

    @LuftVerbot
    LuftVerbot committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    3eae48e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3 from jmir1/dev 

    test
    @LuftVerbot
    LuftVerbot authored Jun 8, 2023
    Configuration menu
    Copy the full SHA
    0eb23fa View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2023

  1. Merge pull request #4 from jmir1/dev 

    feat(player): Sheet Condense and Fixes (aniyomiorg#1028)
    @LuftVerbot
    LuftVerbot authored Jun 13, 2023
    Configuration menu
    Copy the full SHA
    7918e23 View commit details
    Browse the repository at this point in the history

  2. merge29 

    Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/c6e5f8abd9e0e2096d3a8ad17a370107e20cc288
    @LuftVerbot
    LuftVerbot committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    26145b9 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. merge30 

    Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/ad4912803bda73e0f1d5e2e0246561a508e72fd7
    @LuftVerbot
    LuftVerbot committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    1c6a18b View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2023

  1. Merge pull request #8 from aniyomiorg/dev 

    Dev
    @LuftVerbot
    LuftVerbot authored Jun 19, 2023
    Configuration menu
    Copy the full SHA
    500cec5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'merge2.5' into merge2.0

    @LuftVerbot
    LuftVerbot committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    85466da View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2023

  1. Merge pull request #11 from aniyomiorg/dev 

    feat(player): Add chapter seeking (aniyomiorg#1040)
    @LuftVerbot
    LuftVerbot authored Jun 24, 2023
    Configuration menu
    Copy the full SHA
    c6028f3 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2023

  1. Merge pull request #13 from aniyomiorg/dev

    @LuftVerbot
    LuftVerbot authored Jul 7, 2023
    Configuration menu
    Copy the full SHA
    834bde7 View commit details
    Browse the repository at this point in the history

  2. merge31 

    Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/e917349bb7e1fb37b5cf58a130a33d13e1872093
    @LuftVerbot
    LuftVerbot committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    c0324ec View commit details
    Browse the repository at this point in the history

  3. merge32 

    Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/bebd4be43d73617de2cfbc1ff4289e81f535a8e6
    @LuftVerbot
    LuftVerbot committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    4f5ea99 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2023

  1. Merge pull request #14 from aniyomiorg/dev 

    feat(doubleTapSkip): Add 3 second option (aniyomiorg#1055)
    @LuftVerbot
    LuftVerbot authored Jul 8, 2023
    Configuration menu
    Copy the full SHA
    e2dcc1d View commit details
    Browse the repository at this point in the history

  2. merge33 

    Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/4d3e13b0d13a902f0755714e0f56d284acad5a5f
    @LuftVerbot
    LuftVerbot committed Jul 8, 2023
    Configuration menu
    Copy the full SHA
    afb88c9 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2023

  1. merge34 

    Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/c955ac6a66690adef75d41ffa6dac68bd9d2e764
    @LuftVerbot
    LuftVerbot committed Jul 9, 2023
    Configuration menu
    Copy the full SHA
    6b084c6 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. Merge pull request #15 from aniyomiorg/dev 

    feat(player): Implement a new seekbar (aniyomiorg#1061)
    @LuftVerbot
    LuftVerbot authored Jul 11, 2023
    Configuration menu
    Copy the full SHA
    b361eb3 View commit details
    Browse the repository at this point in the history

  2. merge fix

    @LuftVerbot
    LuftVerbot committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    615c489 View commit details
    Browse the repository at this point in the history

  3. revert change & add back ComposeView.setComposeContent

    @LuftVerbot
    LuftVerbot committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    03ca409 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2023

  1. Merge branch 'dev' into merge2.0

    @LuftVerbot
    LuftVerbot authored Jul 13, 2023
    Configuration menu
    Copy the full SHA
    5ed968f View commit details
    Browse the repository at this point in the history

  2. merge fix

    @LuftVerbot
    LuftVerbot committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    8f92a69 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2023

  1. merge35 

    Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/dfdb688b437c38954b1072b7a1df15921a437868
    @LuftVerbot
    LuftVerbot committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    bf05ad6 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2023

  1. fix library update restriction naming(on merge progress))

    @LuftVerbot
    LuftVerbot committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    e5b5c2e View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2023

  1. Merge branch 'dev' into pr/1023

    @quickdesh
    quickdesh committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    65b1b1e View commit details
    Browse the repository at this point in the history

  2. fix lint & supress

    @LuftVerbot
    LuftVerbot committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    51d6440 View commit details
    Browse the repository at this point in the history