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

Feature/blocking #293

Merged
merged 23 commits into from
Oct 2, 2024
Merged

Feature/blocking #293

merged 23 commits into from
Oct 2, 2024

Commits on Oct 1, 2024

  1. block and unblock user services done

    @thabisomatau
    thabisomatau committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    d52d292 View commit details
    Browse the repository at this point in the history

  2. block now unfollows and unfriends

    @thabisomatau
    thabisomatau committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    517610a View commit details
    Browse the repository at this point in the history

  3. added isBlocked function

    @thabisomatau
    thabisomatau committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    26774b7 View commit details
    Browse the repository at this point in the history

  4. added "blocked" relationship status

    @thabisomatau
    thabisomatau committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    ed0d4e0 View commit details
    Browse the repository at this point in the history

  5. getBlockedUsers is now done

    @thabisomatau
    thabisomatau committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    7c3a626 View commit details
    Browse the repository at this point in the history

  6. added blocked as relationship status

    @thabisomatau
    thabisomatau committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    8f65da5 View commit details
    Browse the repository at this point in the history

  7. added functionality to unblock user

    @thabisomatau
    thabisomatau committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    56a8ae9 View commit details
    Browse the repository at this point in the history

  8. Update users.service.ts

    @thabisomatau
    thabisomatau committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    95cd333 View commit details
    Browse the repository at this point in the history

  9. handle blocking from followBottomSheet

    @thabisomatau
    thabisomatau committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    f5aa5d7 View commit details
    Browse the repository at this point in the history

  10. blocking/unblocking now works properly

    @thabisomatau
    thabisomatau committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    0cf005f View commit details
    Browse the repository at this point in the history

  11. added conditional for "Friends" text

    @thabisomatau
    thabisomatau committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    9ccfbac View commit details
    Browse the repository at this point in the history

  12. added navigation to blocked users

    @thabisomatau
    thabisomatau committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    72c85c5 View commit details
    Browse the repository at this point in the history

  13. added filter for blocked users

    @thabisomatau
    thabisomatau committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    fd21dff View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. generate mutiple userDTO now has userID parameter to filter out block… 

    …ed users
    @thabisomatau
    thabisomatau committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    beab35c View commit details
    Browse the repository at this point in the history

  2. added filtering for blocked users in generateMutipleRoom dto

    @thabisomatau
    thabisomatau committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    fbec2e4 View commit details
    Browse the repository at this point in the history

  3. passed in userID in generateMutiple.... functions

    @thabisomatau
    thabisomatau committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    369938f View commit details
    Browse the repository at this point in the history

  4. search endpoints now require Auth tokens

    @thabisomatau
    thabisomatau committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    a6ca731 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into feature/blocking

    @thabisomatau
    thabisomatau committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    4f0b74f View commit details
    Browse the repository at this point in the history

  6. Update DrawerContextMenu.tsx

    @thabisomatau
    thabisomatau committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    d512c30 View commit details
    Browse the repository at this point in the history

  7. blocked users now can't join room

    @thabisomatau
    thabisomatau committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    a76a771 View commit details
    Browse the repository at this point in the history

  8. fixed failing tests backend

    @thabisomatau
    thabisomatau committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    bd5275a View commit details
    Browse the repository at this point in the history

  9. jaden pls don kill me

    @thabisomatau
    thabisomatau committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    28d0e2f View commit details
    Browse the repository at this point in the history

  10. Merge branch 'develop' into feature/blocking

    @thabisomatau
    thabisomatau authored Oct 2, 2024
    Configuration menu
    Copy the full SHA
    b3c324a View commit details
    Browse the repository at this point in the history