Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mastodon/mastodon-android
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: sk22/megalodon
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: feature/delete-redraft
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 17 commits
  • 7 files changed
  • 1 contributor

Commits on May 11, 2022

  1. add ui items for redraft

    @sk22
    sk22 committed May 11, 2022
    Configuration menu
    Copy the full SHA
    d844a77 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2022

  1. Merge branch 'master' into feature/delete-redraft

    @sk22
    sk22 committed May 26, 2022
    Configuration menu
    Copy the full SHA
    273c841 View commit details
    Browse the repository at this point in the history

  2. implement deleting and re-drafting

    @sk22
    sk22 committed May 26, 2022
    Configuration menu
    Copy the full SHA
    3a4d13b View commit details
    Browse the repository at this point in the history

  3. fix german strings

    @sk22
    sk22 committed May 26, 2022
    Configuration menu
    Copy the full SHA
    968de36 View commit details
    Browse the repository at this point in the history

  4. remove unused imports

    @sk22
    sk22 committed May 26, 2022
    Configuration menu
    Copy the full SHA
    195c4d7 View commit details
    Browse the repository at this point in the history

  5. Add proguard rules for parceler 

    according to http://parceler.org/
fixes issue where parceler can't find parcelable class
    @sk22
    sk22 committed May 26, 2022
    Configuration menu
    Copy the full SHA
    f2b9ede View commit details
    Browse the repository at this point in the history

  6. preserve visibility when re-drafting

    @sk22
    sk22 committed May 26, 2022
    Configuration menu
    Copy the full SHA
    e8b43c7 View commit details
    Browse the repository at this point in the history

  7. hide redraft button when not applicable

    @sk22
    sk22 committed May 26, 2022
    Configuration menu
    Copy the full SHA
    b8be1f1 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2022

  1. Revert "preserve visibility when re-drafting" 

    This reverts commit e8b43c7.
    @sk22
    sk22 committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    1a12659 View commit details
    Browse the repository at this point in the history

  2. Revert "implement deleting and re-drafting" 

    This reverts commit 3a4d13b.
    @sk22
    sk22 committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    56b7608 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into feature/delete-redraft

    @sk22
    sk22 committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    8b2d06c View commit details
    Browse the repository at this point in the history

  4. re-implement redraft from upstream edit function

    @sk22
    sk22 committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    5742493 View commit details
    Browse the repository at this point in the history

  5. fix re-drafting replies

    @sk22
    sk22 committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    977f3d0 View commit details
    Browse the repository at this point in the history

  6. show reply icon as workaround for #341

    @sk22
    sk22 committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    aecaba2 View commit details
    Browse the repository at this point in the history

  7. navigate to re-drafted status when opened

    @sk22
    sk22 committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    443b985 View commit details
    Browse the repository at this point in the history

  8. fix null pointer exception

    @sk22
    sk22 committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    5ec4e53 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2022

  1. don't lock visibility for redrafted posts 

    fixes #40
    @sk22
    sk22 committed Nov 12, 2022
    Configuration menu
    Copy the full SHA
    91bd600 View commit details
    Browse the repository at this point in the history
Loading