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

Make confirm popup for adult consent #2419

Merged
merged 25 commits into from
Apr 18, 2024
Merged

Make confirm popup for adult consent #2419

merged 25 commits into from
Apr 18, 2024

Commits on Apr 12, 2024

  1. Make confirm popup for adult consent

    @SleeplessOne1917
    SleeplessOne1917 committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    fff198a View commit details
    Browse the repository at this point in the history

  2. Fix import

    @SleeplessOne1917
    SleeplessOne1917 committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    d51cf75 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into content-warning

    @SleeplessOne1917
    SleeplessOne1917 authored Apr 12, 2024
    Configuration menu
    Copy the full SHA
    588bacb View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2024

  1. Fix blur and adjust user settings

    @SleeplessOne1917
    SleeplessOne1917 committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    b1fc470 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'content-warning' of https://github.com/LemmyNet/lemmy-ui … 

    …into content-warning
    @SleeplessOne1917
    SleeplessOne1917 committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    e98d1c9 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into content-warning

    @SleeplessOne1917
    SleeplessOne1917 committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    3cae1b5 View commit details
    Browse the repository at this point in the history

  4. Make confirmation popup more stylish

    @SleeplessOne1917
    SleeplessOne1917 committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    0413fd6 View commit details
    Browse the repository at this point in the history

  5. Add setting to site settings form

    @SleeplessOne1917
    SleeplessOne1917 committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    fea5ff1 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2024

  1. Fix modal bug

    @SleeplessOne1917
    SleeplessOne1917 committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    fb38faf View commit details
    Browse the repository at this point in the history

  2. Put adult consent logic all in one place

    @SleeplessOne1917
    SleeplessOne1917 committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    c430678 View commit details
    Browse the repository at this point in the history

  3. Make modal use markdown

    @SleeplessOne1917
    SleeplessOne1917 committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    4fc425b View commit details
    Browse the repository at this point in the history

  4. Fix consent modal showing up for currently logged in admin

    @SleeplessOne1917
    SleeplessOne1917 committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    b6d7efd View commit details
    Browse the repository at this point in the history

  5. Add go-back redirect countdown

    @SleeplessOne1917
    SleeplessOne1917 committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    42bc4ab View commit details
    Browse the repository at this point in the history

  6. Center modal title

    @SleeplessOne1917
    SleeplessOne1917 committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    9869b00 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

  1. Handle enable_nsfw correctly

    @SleeplessOne1917
    SleeplessOne1917 committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    afae55c View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2024

  1. Blur background of modal to hide spicy things

    @SleeplessOne1917
    SleeplessOne1917 committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    1e76395 View commit details
    Browse the repository at this point in the history

  2. Add translations

    @SleeplessOne1917
    SleeplessOne1917 committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    160048c View commit details
    Browse the repository at this point in the history

  3. Remove delay between page loading and being blurred

    @SleeplessOne1917
    SleeplessOne1917 committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    5197206 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into content-warning

    @SleeplessOne1917
    SleeplessOne1917 authored Apr 16, 2024
    Configuration menu
    Copy the full SHA
    f97f396 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2024

  1. Merge branch 'main' into content-warning

    @SleeplessOne1917
    SleeplessOne1917 committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    bbce909 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. Revert "Remove delay between page loading and being blurred" 

    This reverts commit 5197206.
    @matc-pub
    matc-pub committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    8e5599e View commit details
    Browse the repository at this point in the history

  2. Blur SSR by default when content warning is set

    @matc-pub
    matc-pub committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    1b4903d View commit details
    Browse the repository at this point in the history

  3. Make blur work correctly

    @SleeplessOne1917
    SleeplessOne1917 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    ce72377 View commit details
    Browse the repository at this point in the history

  4. Prevent images from downloading without consent

    @SleeplessOne1917
    SleeplessOne1917 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    3cbe7e1 View commit details
    Browse the repository at this point in the history

  5. Autoexpand

    @SleeplessOne1917
    SleeplessOne1917 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    d5cfc73 View commit details
    Browse the repository at this point in the history