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

Controversial posts and comments #1106

Merged
merged 19 commits into from
Aug 24, 2023
Merged

Controversial posts and comments #1106

merged 19 commits into from
Aug 24, 2023

Commits on Jul 27, 2023

  1. Added Controversial sort options for posts and comments

    @iByteABit256
    iByteABit256 committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    9665061 View commit details
    Browse the repository at this point in the history

  2. Added Controversial sort options for posts and comments

    @iByteABit256
    iByteABit256 committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    6fb6fd4 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into controversial-posts-and-comments

    @iByteABit256
    iByteABit256 authored Jul 27, 2023
    Configuration menu
    Copy the full SHA
    23a3fde View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2023

  1. Merge branch 'main' into controversial-posts-and-comments

    @iByteABit256
    iByteABit256 authored Jul 29, 2023
    Configuration menu
    Copy the full SHA
    0467b17 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2023

  1. Added supported versions for sort types, siteVersion() in SiteViewMod… 

    …el, and showing sort type dialogs dynamically according to supported sort types
    @iByteABit256
    iByteABit256 committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    94f0cfe View commit details
    Browse the repository at this point in the history

  2. Fixed lint errors

    @iByteABit256
    iByteABit256 committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    d32f12d View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2023

  1. Added short form and long form to SortType enum, removed getLocalized… 

    …SortType utils, moved getSupportedSortTypes to the sort type enums, used them in Account settings as well
    @iByteABit256
    iByteABit256 committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    3ae3a02 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into controversial-posts-and-comments 

    # Conflicts:
#	app/src/main/java/com/jerboa/ui/components/person/PersonProfile.kt
#	app/src/main/java/com/jerboa/ui/components/person/PersonProfileActivity.kt
    @iByteABit256
    iByteABit256 committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    3bb0f3b View commit details
    Browse the repository at this point in the history

  3. Lint errors

    @iByteABit256
    iByteABit256 committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    7bfaddb View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2023

  1. Removed dialog string for Controversial and made everything use the s… 

    …hort form which is the same, removed the text field from the SortType enum and used the long form in the Dialogs forms
    @iByteABit256
    iByteABit256 committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    dcf0e65 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into controversial-posts-and-comments 

    # Conflicts:
#	app/src/main/java/com/jerboa/ui/components/person/PersonProfileActivity.kt
    @iByteABit256
    iByteABit256 committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    c431b74 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into controversial-posts-and-comments

    @iByteABit256
    iByteABit256 authored Aug 2, 2023
    Configuration menu
    Copy the full SHA
    dde6e65 View commit details
    Browse the repository at this point in the history

  4. lint

    @iByteABit256
    iByteABit256 committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    e6f2f46 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2023

  1. Fixed SortType and supported sort type indexes not lining up

    @iByteABit256
    iByteABit256 committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    21e26ef View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into controversial-posts-and-comments

    @iByteABit256
    iByteABit256 authored Aug 3, 2023
    Configuration menu
    Copy the full SHA
    b4c9c25 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2023

  1. Merge branch 'main' of github.com:iByteABit256/jerboa into controvers… 

    …ial-posts-and-comments
    @iByteABit256
    iByteABit256 committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    63df4cb View commit details
    Browse the repository at this point in the history

  2. unused imports

    @iByteABit256
    iByteABit256 committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    99ba843 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2023

  1. Merge branch 'main' into controversial-posts-and-comments

    @dessalines
    dessalines committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    e8d41cc View commit details
    Browse the repository at this point in the history

  2. Fixing lints.

    @dessalines
    dessalines committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    53ac0a8 View commit details
    Browse the repository at this point in the history