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

IWB 9: Added status snackbar to the IWB buttons #317

Merged
merged 213 commits into from
Aug 16, 2024
Merged

IWB 9: Added status snackbar to the IWB buttons #317

merged 213 commits into from
Aug 16, 2024

Commits on Jul 14, 2024

  1. added blacklist hook

    @FrankreedX
    FrankreedX committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    8ca9933 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into frankreed/foreignManagement1_blacklist_hook

    @FrankreedX
    FrankreedX committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    657384e View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2024

  1. Merge branch 'main' into frankreed/foreignManagement1_blacklist_hook

    @FrankreedX
    FrankreedX committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    296e07d View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. black list feature works

    @FrankreedX
    FrankreedX committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    ac7e815 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into frankreed/foreignManagement1_blacklist_hook

    @FrankreedX
    FrankreedX committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    0853aa4 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'frankreed/foreignManagement1_blacklist_hook' into frank… 

    …reed/foreignManagement2_blacklist_tab
    @FrankreedX
    FrankreedX committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    999af90 View commit details
    Browse the repository at this point in the history

  4. some unused stuff removal

    @FrankreedX
    FrankreedX committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    9fa672f View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2024

  1. waitlist seems to work

    @FrankreedX
    FrankreedX committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    5c66aba View commit details
    Browse the repository at this point in the history

  2. simplified removeBlacklist.js

    @FrankreedX
    FrankreedX committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    f5a1855 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'frankreed/foreignManagement2_blacklist_tab' into frankr… 

    …eed/foreignManagement3_waitlist_tab
    @FrankreedX
    FrankreedX committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    7c7625d View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2024

  1. pretty

    @FrankreedX
    FrankreedX committed Jul 20, 2024
    Configuration menu
    Copy the full SHA
    ca85173 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2024

  1. removed transaction and hope that it works

    @FrankreedX
    FrankreedX committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    852c832 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'frankreed/remove-user-assertion-failed-fix' into frankr… 

    …eed/foreignManagement1_blacklist_hook
    @FrankreedX
    FrankreedX committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    b9c50ef View commit details
    Browse the repository at this point in the history

  3. Merge branch 'frankreed/foreignManagement1_blacklist_hook' into frank… 

    …reed/foreignManagement2_blacklist_tab
    @FrankreedX
    FrankreedX committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    4f5ac10 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'frankreed/foreignManagement2_blacklist_tab' into frankr… 

    …eed/foreignManagement3_waitlist_tab
    @FrankreedX
    FrankreedX committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    d3fd882 View commit details
    Browse the repository at this point in the history

  5. fixed useBlackList.js hook firestore error, and made blacklist check … 

    …functional
    @FrankreedX
    FrankreedX committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    72c08a6 View commit details
    Browse the repository at this point in the history

  6. added refresh spinner for chooseTeam.js

    @FrankreedX
    FrankreedX committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    6ea881f View commit details
    Browse the repository at this point in the history

  7. Merge branch 'frankreed/foreignManagement1_blacklist_hook' into frank… 

    …reed/foreignManagement2_blacklist_tab
    @FrankreedX
    FrankreedX committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    6ac7af1 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'frankreed/foreignManagement2_blacklist_tab' into frankr… 

    …eed/foreignManagement3_waitlist_tab

# Conflicts:
#	app/segments/(team)/chooseTeam.js
    @FrankreedX
    FrankreedX committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    ed8f8db View commit details
    Browse the repository at this point in the history

  9. updated invalidateKeys and fixed some styling

    @FrankreedX
    FrankreedX committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    07142cd View commit details
    Browse the repository at this point in the history

  10. updated faulty invalidateKeys lists

    @FrankreedX
    FrankreedX committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    872e3ce View commit details
    Browse the repository at this point in the history

  11. kinda works lmao

    @FrankreedX
    FrankreedX committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    817972a View commit details
    Browse the repository at this point in the history

  12. Merge branch 'frankreed/remove-user-assertion-failed-fix' into frankr… 

    …eed/foreignManagement1_blacklist_hook
    @FrankreedX
    FrankreedX committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    3b1463a View commit details
    Browse the repository at this point in the history

  13. Merge branch 'frankreed/foreignManagement1_blacklist_hook' into frank… 

    …reed/foreignManagement2_blacklist_tab
    @FrankreedX
    FrankreedX committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    52b16f8 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'frankreed/foreignManagement2_blacklist_tab' into frankr… 

    …eed/foreignManagement3_waitlist_tab
    @FrankreedX
    FrankreedX committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    edee24f View commit details
    Browse the repository at this point in the history

  15. updated the invalidateKeys again

    @FrankreedX
    FrankreedX committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    8fb3f94 View commit details
    Browse the repository at this point in the history

  16. navigation off chooseTeam works. Tech debt +1

    @FrankreedX
    FrankreedX committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    91ab448 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. half finished progress

    @FrankreedX
    FrankreedX committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    baa4e90 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into frankreed/remove-user-assertion-failed-fix

    @FrankreedX
    FrankreedX committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    8183b22 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'frankreed/remove-user-assertion-failed-fix' into frankr… 

    …eed/foreignManagement1_blacklist_hook
    @FrankreedX
    FrankreedX committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    6415dfe View commit details
    Browse the repository at this point in the history

  4. Merge branch 'frankreed/foreignManagement1_blacklist_hook' into frank… 

    …reed/foreignManagement2_blacklist_tab
    @FrankreedX
    FrankreedX committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    54469bf View commit details
    Browse the repository at this point in the history

  5. Merge branch 'frankreed/foreignManagement2_blacklist_tab' into frankr… 

    …eed/foreignManagement3_waitlist_tab
    @FrankreedX
    FrankreedX committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    ddc53cc View commit details
    Browse the repository at this point in the history

  6. Merge branch 'frankreed/foreignManagement3_waitlist_tab' into frankre… 

    …ed/foreignManagement4_overhaul_auth_redirects
    @FrankreedX
    FrankreedX committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    12dc38f View commit details
    Browse the repository at this point in the history

  7. Merge branch 'frankreed/foreignManagement4_overhaul_auth_redirects' i… 

    …nto frankreed/foreignManagement5_invite_tab
    @FrankreedX
    FrankreedX committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    eb76078 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2024

  1. Merge branch 'main' into frankreed/remove-user-assertion-failed-fix

    @FrankreedX
    FrankreedX committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    f763731 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'frankreed/remove-user-assertion-failed-fix' into frankr… 

    …eed/foreignManagement1_blacklist_hook
    @FrankreedX
    FrankreedX committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    91cea9e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'frankreed/foreignManagement1_blacklist_hook' into frank… 

    …reed/foreignManagement2_blacklist_tab
    @FrankreedX
    FrankreedX committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    51e60d3 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'frankreed/foreignManagement2_blacklist_tab' into frankr… 

    …eed/foreignManagement3_waitlist_tab
    @FrankreedX
    FrankreedX committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    0fba67e View commit details
    Browse the repository at this point in the history

  5. Merge branch 'frankreed/foreignManagement3_waitlist_tab' into frankre… 

    …ed/foreignManagement4_overhaul_auth_redirects
    @FrankreedX
    FrankreedX committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    3e5a65e View commit details
    Browse the repository at this point in the history

  6. Merge branch 'frankreed/foreignManagement4_overhaul_auth_redirects' i… 

    …nto frankreed/foreignManagement5_invite_tab
    @FrankreedX
    FrankreedX committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    06963df View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2024

  1. invite works

    @FrankreedX
    FrankreedX committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    3f52e48 View commit details
    Browse the repository at this point in the history

  2. added waitlistError to ErrorComponent

    @FrankreedX
    FrankreedX committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    180b096 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'frankreed/foreignManagement3_waitlist_tab' into frankre… 

    …ed/foreignManagement4_overhaul_auth_redirects
    @FrankreedX
    FrankreedX committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    dfddbc0 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'frankreed/foreignManagement4_overhaul_auth_redirects' i… 

    …nto frankreed/foreignManagement5_invite_tab

# Conflicts:
#	app/segments/(team)/chooseTeam.js
    @FrankreedX
    FrankreedX committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    d54e5c1 View commit details
    Browse the repository at this point in the history

  5. pretty

    @FrankreedX
    FrankreedX committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    2743407 View commit details
    Browse the repository at this point in the history

  6. text input moves above keyboard now

    @FrankreedX
    FrankreedX committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    46f85e9 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2024

  1. Merge branch 'main' into frankreed/remove-user-assertion-failed-fix

    @FrankreedX
    FrankreedX committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    f983bbf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'frankreed/remove-user-assertion-failed-fix' into frankr… 

    …eed/foreignManagement1_blacklist_hook
    @FrankreedX
    FrankreedX committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    c9c8fbf View commit details
    Browse the repository at this point in the history

  3. Merge branch 'frankreed/foreignManagement1_blacklist_hook' into frank… 

    …reed/foreignManagement2_blacklist_tab
    @FrankreedX
    FrankreedX committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    5e1dc1b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'frankreed/foreignManagement2_blacklist_tab' into frankr… 

    …eed/foreignManagement3_waitlist_tab
    @FrankreedX
    FrankreedX committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    49b040e View commit details
    Browse the repository at this point in the history

  5. Merge branch 'frankreed/foreignManagement3_waitlist_tab' into frankre… 

    …ed/foreignManagement4_overhaul_auth_redirects
    @FrankreedX
    FrankreedX committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    2055022 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'frankreed/foreignManagement4_overhaul_auth_redirects' i… 

    …nto frankreed/foreignManagement5_invite_tab
    @FrankreedX
    FrankreedX committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    0f4459b View commit details
    Browse the repository at this point in the history

  7. Merge branch 'main' into frankreed/remove-user-assertion-failed-fix

    @FrankreedX
    FrankreedX committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    fe9e79e View commit details
    Browse the repository at this point in the history

  8. Merge branch 'frankreed/remove-user-assertion-failed-fix' into frankr… 

    …eed/foreignManagement1_blacklist_hook
    @FrankreedX
    FrankreedX committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    3872b6f View commit details
    Browse the repository at this point in the history

  9. Merge branch 'frankreed/foreignManagement1_blacklist_hook' into frank… 

    …reed/foreignManagement2_blacklist_tab
    @FrankreedX
    FrankreedX committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    b3481a3 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'frankreed/foreignManagement2_blacklist_tab' into frankr… 

    …eed/foreignManagement3_waitlist_tab
    @FrankreedX
    FrankreedX committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    de580e8 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'frankreed/foreignManagement3_waitlist_tab' into frankre… 

    …ed/foreignManagement4_overhaul_auth_redirects
    @FrankreedX
    FrankreedX committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    3ce1c25 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'frankreed/foreignManagement4_overhaul_auth_redirects' i… 

    …nto frankreed/foreignManagement5_invite_tab
    @FrankreedX
    FrankreedX committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    02c7865 View commit details
    Browse the repository at this point in the history

  13. minor comment change 

    Co-authored-by: Jake Gehrke <91503842+Gehrkej@users.noreply.github.com>
    @FrankreedX @Gehrkej
    FrankreedX and Gehrkej committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    35a5a26 View commit details
    Browse the repository at this point in the history

  14. changed console log wording in removeBlacklist 

    Co-authored-by: Jake Gehrke <91503842+Gehrkej@users.noreply.github.com>
    @FrankreedX @Gehrkej
    FrankreedX and Gehrkej committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    1ae93ef View commit details
    Browse the repository at this point in the history

  15. removed copied over comment

    @FrankreedX
    FrankreedX committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    f869cfb View commit details
    Browse the repository at this point in the history

  16. Merge remote-tracking branch 'origin/frankreed/foreignManagement2_bla… 

    …cklist_tab' into frankreed/foreignManagement2_blacklist_tab
    @FrankreedX
    FrankreedX committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    30081f4 View commit details
    Browse the repository at this point in the history

  17. updated tiny comment 

    Co-authored-by: Jake Gehrke <91503842+Gehrkej@users.noreply.github.com>
    @FrankreedX @Gehrkej
    FrankreedX and Gehrkej committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    340cb4d View commit details
    Browse the repository at this point in the history

  18. removed redundant log 

    Co-authored-by: Jake Gehrke <91503842+Gehrkej@users.noreply.github.com>
    @FrankreedX @Gehrkej
    FrankreedX and Gehrkej committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    b5ed7d8 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'frankreed/foreignManagement1_blacklist_hook' into frank… 

    …reed/foreignManagement2_blacklist_tab
    @FrankreedX
    FrankreedX committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    a066201 View commit details
    Browse the repository at this point in the history

  20. Merge branch 'frankreed/foreignManagement2_blacklist_tab' into frankr… 

    …eed/foreignManagement3_waitlist_tab
    @FrankreedX
    FrankreedX committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    067f6b4 View commit details
    Browse the repository at this point in the history

  21. Merge branch 'frankreed/foreignManagement3_waitlist_tab' into frankre… 

    …ed/foreignManagement4_overhaul_auth_redirects
    @FrankreedX
    FrankreedX committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    6d3fdd7 View commit details
    Browse the repository at this point in the history

  22. Merge branch 'frankreed/foreignManagement4_overhaul_auth_redirects' i… 

    …nto frankreed/foreignManagement5_invite_tab
    @FrankreedX
    FrankreedX committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    45e627d View commit details
    Browse the repository at this point in the history

  23. fix - added email to blacklist record

    @Gehrkej
    Gehrkej committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    cfd9e15 View commit details
    Browse the repository at this point in the history

  24. fix - added assertion if pfp exists when removing a user

    @Gehrkej
    Gehrkej committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    6bff91c View commit details
    Browse the repository at this point in the history

  25. Merge branch 'main' into Gehrkej/fix/add-email-to-blacklist

    @FrankreedX
    FrankreedX committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    a6dcbc8 View commit details
    Browse the repository at this point in the history

  26. Merge branch 'Gehrkej/fix/add-email-to-blacklist' into frankreed/fore… 

    …ignManagement1_blacklist_hook

# Conflicts:
#	dbOperations/removeUser.js
    @FrankreedX
    FrankreedX committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    89b82c9 View commit details
    Browse the repository at this point in the history

  27. Merge branch 'frankreed/foreignManagement1_blacklist_hook' into frank… 

    …reed/foreignManagement2_blacklist_tab
    @FrankreedX
    FrankreedX committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    6c48415 View commit details
    Browse the repository at this point in the history

  28. Merge branch 'frankreed/foreignManagement2_blacklist_tab' into frankr… 

    …eed/foreignManagement3_waitlist_tab
    @FrankreedX
    FrankreedX committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    58d3865 View commit details
    Browse the repository at this point in the history

  29. Merge branch 'frankreed/foreignManagement3_waitlist_tab' into frankre… 

    …ed/foreignManagement4_overhaul_auth_redirects
    @FrankreedX
    FrankreedX committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    8dab777 View commit details
    Browse the repository at this point in the history

  30. Merge branch 'frankreed/foreignManagement4_overhaul_auth_redirects' i… 

    …nto frankreed/foreignManagement5_invite_tab
    @FrankreedX
    FrankreedX committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    87e7e80 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2024

  1. Merge branch 'main' into frankreed/foreignManagement1_blacklist_hook

    @FrankreedX
    FrankreedX committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    605472b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'frankreed/foreignManagement1_blacklist_hook' into frank… 

    …reed/foreignManagement2_blacklist_tab
    @FrankreedX
    FrankreedX committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    7619df3 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'frankreed/foreignManagement2_blacklist_tab' into frankr… 

    …eed/foreignManagement3_waitlist_tab
    @FrankreedX
    FrankreedX committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    ab422e6 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'frankreed/foreignManagement3_waitlist_tab' into frankre… 

    …ed/foreignManagement4_overhaul_auth_redirects
    @FrankreedX
    FrankreedX committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    4bfbaab View commit details
    Browse the repository at this point in the history

  5. Merge branch 'frankreed/foreignManagement4_overhaul_auth_redirects' i… 

    …nto frankreed/foreignManagement5_invite_tab
    @FrankreedX
    FrankreedX committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    4204c74 View commit details
    Browse the repository at this point in the history

  6. added loading spinner to all buttons

    @FrankreedX
    FrankreedX committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    65cff29 View commit details
    Browse the repository at this point in the history

  7. can't invite already invited email

    @FrankreedX
    FrankreedX committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    3cf56c3 View commit details
    Browse the repository at this point in the history

  8. accepting invite will remove the invite

    @FrankreedX
    FrankreedX committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    fe94315 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'frankreed/foreignManagement5_invite_tab' into frankreed… 

    …/foreignManagement6_add_loading_spinner

# Conflicts:
#	app/segments/(team)/invitelist.js
    @FrankreedX
    FrankreedX committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    d4c180a View commit details
    Browse the repository at this point in the history

  10. workin on remove user

    @FrankreedX
    FrankreedX committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    a5b58e8 View commit details
    Browse the repository at this point in the history

  11. added invitelist bug fix

    @FrankreedX
    FrankreedX committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    d20d3dd View commit details
    Browse the repository at this point in the history

  12. migrating to react native paper Button's loading property for loading… 

    … spinner
    @FrankreedX
    FrankreedX committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    6a77ea0 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'frankreed/foreignManagement5_invite_tab' into frankreed… 

    …/foreignManagement6_add_loading_spinner
    @FrankreedX
    FrankreedX committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    6dd59e6 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2024

  1. redundant comment 

    Co-authored-by: Jake Gehrke <91503842+Gehrkej@users.noreply.github.com>
    @FrankreedX @Gehrkej
    FrankreedX and Gehrkej committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    cc97e8c View commit details
    Browse the repository at this point in the history

  2. :/ 

    Co-authored-by: Jake Gehrke <91503842+Gehrkej@users.noreply.github.com>
    @FrankreedX @Gehrkej
    FrankreedX and Gehrkej committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    d1413af View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into frankreed/foreignManagement1_blacklist_hook

    @FrankreedX
    FrankreedX committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    553300c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'frankreed/foreignManagement1_blacklist_hook' into frank… 

    …reed/foreignManagement2_blacklist_tab
    @FrankreedX
    FrankreedX committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    06c7b91 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'frankreed/foreignManagement2_blacklist_tab' into frankr… 

    …eed/foreignManagement3_waitlist_tab
    @FrankreedX
    FrankreedX committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    db00910 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'frankreed/foreignManagement3_waitlist_tab' into frankre… 

    …ed/foreignManagement4_overhaul_auth_redirects
    @FrankreedX
    FrankreedX committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    35cd182 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'frankreed/foreignManagement4_overhaul_auth_redirects' i… 

    …nto frankreed/foreignManagement5_invite_tab
    @FrankreedX
    FrankreedX committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    59ec3cf View commit details
    Browse the repository at this point in the history

  8. Merge branch 'frankreed/foreignManagement5_invite_tab' into frankreed… 

    …/foreignManagement6_add_loading_spinner
    @FrankreedX
    FrankreedX committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    43c1add View commit details
    Browse the repository at this point in the history

  9. prevent double navigation to chooseTeam screen

    @FrankreedX
    FrankreedX committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    eb74065 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'frankreed/foreignManagement4_overhaul_auth_redirects' i… 

    …nto frankreed/foreignManagement5_invite_tab
    @FrankreedX
    FrankreedX committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    326dc00 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'frankreed/foreignManagement5_invite_tab' into frankreed… 

    …/foreignManagement6_add_loading_spinner
    @FrankreedX
    FrankreedX committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    7ad4d1d View commit details
    Browse the repository at this point in the history

  12. remove half baked loading spinner on dialog component (will be its ow… 

    …n pr)
    @FrankreedX
    FrankreedX committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    8a4132f View commit details
    Browse the repository at this point in the history

  13. changed dialog component's signature to contain loading

    @FrankreedX
    FrankreedX committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    181ac9a View commit details
    Browse the repository at this point in the history

  14. fixed "invalid-argument"

    @FrankreedX
    FrankreedX committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    71823f0 View commit details
    Browse the repository at this point in the history

  15. Merge branch 'frankreed/remove_user_invalid_argument' into frankreed/… 

    …foreignManagement1_blacklist_hook

# Conflicts:
#	app/content/team/users/[user]/index.js
    @FrankreedX
    FrankreedX committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    364abe7 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'frankreed/foreignManagement1_blacklist_hook' into frank… 

    …reed/foreignManagement2_blacklist_tab
    @FrankreedX
    FrankreedX committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    c8d412e View commit details
    Browse the repository at this point in the history

  17. Merge branch 'frankreed/foreignManagement2_blacklist_tab' into frankr… 

    …eed/foreignManagement3_waitlist_tab
    @FrankreedX
    FrankreedX committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    dd31a1f View commit details
    Browse the repository at this point in the history

  18. Merge branch 'frankreed/foreignManagement3_waitlist_tab' into frankre… 

    …ed/foreignManagement4_overhaul_auth_redirects
    @FrankreedX
    FrankreedX committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    57ef84e View commit details
    Browse the repository at this point in the history

  19. Merge branch 'frankreed/foreignManagement4_overhaul_auth_redirects' i… 

    …nto frankreed/foreignManagement5_invite_tab
    @FrankreedX
    FrankreedX committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    b0ddd79 View commit details
    Browse the repository at this point in the history

  20. Merge branch 'frankreed/foreignManagement5_invite_tab' into frankreed… 

    …/foreignManagement6_add_loading_spinner
    @FrankreedX
    FrankreedX committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    b173acc View commit details
    Browse the repository at this point in the history

  21. Merge branch 'frankreed/foreignManagement6_add_loading_spinner' into … 

    …frankreed/foreignManagement7_dialog_spinner

# Conflicts:
#	app/content/team/users/[user]/index.js
    @FrankreedX
    FrankreedX committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    881ee57 View commit details
    Browse the repository at this point in the history

  22. debounced invite button

    @FrankreedX
    FrankreedX committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    beb38bd View commit details
    Browse the repository at this point in the history

  23. added key

    @FrankreedX
    FrankreedX committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    68aad1c View commit details
    Browse the repository at this point in the history

  24. Merge branch 'frankreed/foreignManagement2_blacklist_tab' into frankr… 

    …eed/foreignManagement3_waitlist_tab
    @FrankreedX
    FrankreedX committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    c6aba50 View commit details
    Browse the repository at this point in the history

  25. Merge branch 'frankreed/foreignManagement3_waitlist_tab' into frankre… 

    …ed/foreignManagement4_overhaul_auth_redirects
    @FrankreedX
    FrankreedX committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    18d78ca View commit details
    Browse the repository at this point in the history

  26. Merge branch 'frankreed/foreignManagement4_overhaul_auth_redirects' i… 

    …nto frankreed/foreignManagement5_invite_tab
    @FrankreedX
    FrankreedX committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    9048f77 View commit details
    Browse the repository at this point in the history

  27. Merge branch 'frankreed/foreignManagement5_invite_tab' into frankreed… 

    …/foreignManagement6_add_loading_spinner
    @FrankreedX
    FrankreedX committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    f95ca38 View commit details
    Browse the repository at this point in the history

  28. Merge branch 'frankreed/foreignManagement6_add_loading_spinner' into … 

    …frankreed/foreignManagement7_dialog_spinner
    @FrankreedX
    FrankreedX committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    c46eb8c View commit details
    Browse the repository at this point in the history

  29. Merge branch 'frankreed/foreignManagement7_dialog_spinner' into frank… 

    …reed/foreignManagement8_debouncin
    @FrankreedX
    FrankreedX committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    2df4f46 View commit details
    Browse the repository at this point in the history

  30. last usage of Activity Indicator in a simple button replaced 

    temp
    @FrankreedX
    FrankreedX committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    e4b082d View commit details
    Browse the repository at this point in the history

  31. Merge branch 'frankreed/foreignManagement6_add_loading_spinner' into … 

    …frankreed/foreignManagement7_dialog_spinner
    @FrankreedX
    FrankreedX committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    5dc01b4 View commit details
    Browse the repository at this point in the history

  32. Merge branch 'frankreed/foreignManagement7_dialog_spinner' into frank… 

    …reed/foreignManagement8_debouncin
    @FrankreedX
    FrankreedX committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    bfc7f9f View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2024

  1. Fixed Android keyboard avoiding for invitelist

    @FrankreedX
    FrankreedX committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    a030a08 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'frankreed/foreignManagement5_invite_tab' into frankreed… 

    …/foreignManagement6_add_loading_spinner
    @FrankreedX
    FrankreedX committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    d6c6471 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'frankreed/foreignManagement6_add_loading_spinner' into … 

    …frankreed/foreignManagement7_dialog_spinner
    @FrankreedX
    FrankreedX committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    d040a56 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'frankreed/foreignManagement7_dialog_spinner' into frank… 

    …reed/foreignManagement8_debouncin
    @FrankreedX
    FrankreedX committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    e83935c View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2024

  1. Merge branch 'main' into frankreed/remove_user_invalid_argument

    @FrankreedX
    FrankreedX committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    d9b2ab3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'frankreed/remove_user_invalid_argument' into frankreed/… 

    …foreignManagement1_blacklist_hook
    @FrankreedX
    FrankreedX committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    f129a8f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'frankreed/foreignManagement1_blacklist_hook' into frank… 

    …reed/foreignManagement2_blacklist_tab
    @FrankreedX
    FrankreedX committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    fbee72c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'frankreed/foreignManagement2_blacklist_tab' into frankr… 

    …eed/foreignManagement3_waitlist_tab
    @FrankreedX
    FrankreedX committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    16df1e7 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'frankreed/foreignManagement3_waitlist_tab' into frankre… 

    …ed/foreignManagement4_overhaul_auth_redirects
    @FrankreedX
    FrankreedX committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    41f1613 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'frankreed/foreignManagement4_overhaul_auth_redirects' i… 

    …nto frankreed/foreignManagement5_invite_tab
    @FrankreedX
    FrankreedX committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    ffb514b View commit details
    Browse the repository at this point in the history

  7. Merge branch 'frankreed/foreignManagement5_invite_tab' into frankreed… 

    …/foreignManagement6_add_loading_spinner
    @FrankreedX
    FrankreedX committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    8502e6d View commit details
    Browse the repository at this point in the history

  8. Merge branch 'frankreed/foreignManagement6_add_loading_spinner' into … 

    …frankreed/foreignManagement7_dialog_spinner
    @FrankreedX
    FrankreedX committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    0b2e37f View commit details
    Browse the repository at this point in the history

  9. Merge branch 'frankreed/foreignManagement7_dialog_spinner' into frank… 

    …reed/foreignManagement8_debouncin
    @FrankreedX
    FrankreedX committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    7c6fd33 View commit details
    Browse the repository at this point in the history

  10. removed redundant remove user fix

    @FrankreedX
    FrankreedX committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    118684e View commit details
    Browse the repository at this point in the history

  11. Merge branch 'frankreed/foreignManagement1_blacklist_hook' into frank… 

    …reed/foreignManagement2_blacklist_tab
    @FrankreedX
    FrankreedX committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    8951322 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'frankreed/foreignManagement2_blacklist_tab' into frankr… 

    …eed/foreignManagement3_waitlist_tab
    @FrankreedX
    FrankreedX committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    5fe346d View commit details
    Browse the repository at this point in the history

  13. Merge branch 'frankreed/foreignManagement3_waitlist_tab' into frankre… 

    …ed/foreignManagement4_overhaul_auth_redirects
    @FrankreedX
    FrankreedX committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    b76cba6 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'frankreed/foreignManagement4_overhaul_auth_redirects' i… 

    …nto frankreed/foreignManagement5_invite_tab
    @FrankreedX
    FrankreedX committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    e1971d6 View commit details
    Browse the repository at this point in the history

  15. Merge branch 'frankreed/foreignManagement5_invite_tab' into frankreed… 

    …/foreignManagement6_add_loading_spinner
    @FrankreedX
    FrankreedX committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    826c907 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'frankreed/foreignManagement6_add_loading_spinner' into … 

    …frankreed/foreignManagement7_dialog_spinner

# Conflicts:
#	app/content/team/users/[user]/index.js
    @FrankreedX
    FrankreedX committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    6f1f1a9 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'frankreed/foreignManagement7_dialog_spinner' into frank… 

    …reed/foreignManagement8_debouncin
    @FrankreedX
    FrankreedX committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    682517e View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2024

  1. Merge branch 'main' into frankreed/remove_user_invalid_argument

    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    b6b0018 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'frankreed/remove_user_invalid_argument' into frankreed/… 

    …foreignManagement1_blacklist_hook

# Conflicts:
#	app/segments/(team)/chooseTeam.js
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    310b3f9 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/frankreed/foreignManagement2_bla… 

    …cklist_tab' into frankreed/foreignManagement1_blacklist_hook
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    d6aaba8 View commit details
    Browse the repository at this point in the history

  4. pretty

    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    e924029 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/frankreed/foreignManagement3_wai… 

    …tlist_tab' into frankreed/foreignManagement1_blacklist_hook

# Conflicts:
#	app/segments/(team)/chooseTeam.js
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    2da6b41 View commit details
    Browse the repository at this point in the history

  6. pretty

    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    9737dc3 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/frankreed/foreignManagement4_ove… 

    …rhaul_auth_redirects' into frankreed/foreignManagement1_blacklist_hook

# Conflicts:
#	dbOperations/hooks/useUserInfo.js
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    fca54a9 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'frankreed/foreignManagement4_overhaul_auth_redirects' i… 

    …nto frankreed/foreignManagement5_invite_tab

# Conflicts:
#	app/segments/(team)/chooseTeam.js
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    e342ea5 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'frankreed/foreignManagement5_invite_tab' into frankreed… 

    …/foreignManagement6_add_loading_spinner

# Conflicts:
#	app/(auth)/signup.js
#	app/segments/(team)/chooseTeam.js
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    0b4e27d View commit details
    Browse the repository at this point in the history

  10. pretty

    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    ab7034f View commit details
    Browse the repository at this point in the history

  11. Merge remote-tracking branch 'origin/frankreed/foreignManagement7_dia… 

    …log_spinner' into frankreed/foreignManagement6_add_loading_spinner
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    7dfe5b8 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'frankreed/foreignManagement7_dialog_spinner' into frank… 

    …reed/foreignManagement8_debouncin
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    c0f576d View commit details
    Browse the repository at this point in the history

  13. Merge branch 'frankreed/foreignManagement1_blacklist_hook' into frank… 

    …reed/foreignManagement2_blacklist_tab
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    8564bcf View commit details
    Browse the repository at this point in the history

  14. Merge branch 'frankreed/foreignManagement2_blacklist_tab' into frankr… 

    …eed/foreignManagement3_waitlist_tab

# Conflicts:
#	app/segments/(team)/chooseTeam.js
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    307bc50 View commit details
    Browse the repository at this point in the history

  15. Merge branch 'frankreed/foreignManagement3_waitlist_tab' into frankre… 

    …ed/foreignManagement4_overhaul_auth_redirects

# Conflicts:
#	dbOperations/hooks/useUserInfo.js
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    eec6a3b View commit details
    Browse the repository at this point in the history

  16. Merge branch 'frankreed/foreignManagement4_overhaul_auth_redirects' i… 

    …nto frankreed/foreignManagement5_invite_tab

# Conflicts:
#	app/segments/(team)/chooseTeam.js
#	dbOperations/hooks/useUserInfo.js
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    3c2d9a2 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'frankreed/foreignManagement5_invite_tab' into frankreed… 

    …/foreignManagement6_add_loading_spinner
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    a43b8e9 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'frankreed/foreignManagement7_dialog_spinner' into frank… 

    …reed/foreignManagement8_debouncin
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    9d11e0e View commit details
    Browse the repository at this point in the history

  19. pretty

    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    92af713 View commit details
    Browse the repository at this point in the history

  20. Merge branch 'frankreed/foreignManagement1_blacklist_hook' into frank… 

    …reed/foreignManagement2_blacklist_tab
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    0d44915 View commit details
    Browse the repository at this point in the history

  21. pretty

    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    e6c5e8a View commit details
    Browse the repository at this point in the history

  22. Merge branch 'frankreed/foreignManagement2_blacklist_tab' into frankr… 

    …eed/foreignManagement3_waitlist_tab

# Conflicts:
#	app/segments/(team)/chooseTeam.js
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    fe33609 View commit details
    Browse the repository at this point in the history

  23. Merge branch 'frankreed/foreignManagement3_waitlist_tab' into frankre… 

    …ed/foreignManagement4_overhaul_auth_redirects
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    d6b73b3 View commit details
    Browse the repository at this point in the history

  24. pretty

    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    a094d4c View commit details
    Browse the repository at this point in the history

  25. Merge branch 'frankreed/foreignManagement4_overhaul_auth_redirects' i… 

    …nto frankreed/foreignManagement5_invite_tab

# Conflicts:
#	app/segments/(team)/chooseTeam.js
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    8e4c349 View commit details
    Browse the repository at this point in the history

  26. Merge branch 'frankreed/foreignManagement5_invite_tab' into frankreed… 

    …/foreignManagement6_add_loading_spinner
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    590a055 View commit details
    Browse the repository at this point in the history

  27. IWB-7: allow using the "loading" property in DialogComponent (#313)

    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    472a708 View commit details
    Browse the repository at this point in the history

  28. added missing state from merge

    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    2194eb3 View commit details
    Browse the repository at this point in the history

  29. Merge branch 'frankreed/foreignManagement1_blacklist_hook' into frank… 

    …reed/foreignManagement2_blacklist_tab
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    a67a223 View commit details
    Browse the repository at this point in the history

  30. Merge branch 'frankreed/foreignManagement2_blacklist_tab' into frankr… 

    …eed/foreignManagement3_waitlist_tab
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    189ecdc View commit details
    Browse the repository at this point in the history

  31. Merge branch 'frankreed/foreignManagement3_waitlist_tab' into frankre… 

    …ed/foreignManagement4_overhaul_auth_redirects
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    3e944d5 View commit details
    Browse the repository at this point in the history

  32. Merge branch 'frankreed/foreignManagement4_overhaul_auth_redirects' i… 

    …nto frankreed/foreignManagement5_invite_tab
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    af682fc View commit details
    Browse the repository at this point in the history

  33. Merge branch 'frankreed/foreignManagement5_invite_tab' into frankreed… 

    …/foreignManagement6_add_loading_spinner
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    d6b114b View commit details
    Browse the repository at this point in the history

  34. Merge branch 'frankreed/foreignManagement6_add_loading_spinner' into … 

    …frankreed/foreignManagement8_debouncin
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    e4f1778 View commit details
    Browse the repository at this point in the history

  35. simple fix

    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    de570e5 View commit details
    Browse the repository at this point in the history

  36. Merge branch 'frankreed/fix_verified_redirect_bug' into frankreed/for… 

    …eignManagement1_blacklist_hook
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    d0b040e View commit details
    Browse the repository at this point in the history

  37. Merge branch 'frankreed/foreignManagement1_blacklist_hook' into frank… 

    …reed/foreignManagement2_blacklist_tab
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    65ff8f0 View commit details
    Browse the repository at this point in the history

  38. Merge branch 'frankreed/foreignManagement2_blacklist_tab' into frankr… 

    …eed/foreignManagement3_waitlist_tab
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    cd94dc2 View commit details
    Browse the repository at this point in the history

  39. Merge branch 'frankreed/foreignManagement3_waitlist_tab' into frankre… 

    …ed/foreignManagement4_overhaul_auth_redirects
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    bbaf4fa View commit details
    Browse the repository at this point in the history

  40. Merge branch 'frankreed/foreignManagement4_overhaul_auth_redirects' i… 

    …nto frankreed/foreignManagement5_invite_tab
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    1d28b0f View commit details
    Browse the repository at this point in the history

  41. Merge branch 'frankreed/foreignManagement5_invite_tab' into frankreed… 

    …/foreignManagement6_add_loading_spinner
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    40fe953 View commit details
    Browse the repository at this point in the history

  42. Merge branch 'frankreed/foreignManagement6_add_loading_spinner' into … 

    …frankreed/foreignManagement8_debouncin
    @FrankreedX
    FrankreedX committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    c371457 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. better align invite input with above elements

    @FrankreedX
    FrankreedX committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    93a7cb2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'frankreed/foreignManagement5_invite_tab' into frankreed… 

    …/foreignManagement6_add_loading_spinner
    @FrankreedX
    FrankreedX committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    e677c31 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'frankreed/foreignManagement6_add_loading_spinner' into … 

    …frankreed/foreignManagement8_debouncin
    @FrankreedX
    FrankreedX committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    0113ae7 View commit details
    Browse the repository at this point in the history

  4. debounced invitelist without changing the color of the loading wheel

    @FrankreedX
    FrankreedX committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    e08cadc View commit details
    Browse the repository at this point in the history

  5. changed more "white" to use themecolors, and added spinner color to s… 

    …ome buttons
    @FrankreedX
    FrankreedX committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    07d2346 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'frankreed/foreignManagement6_add_loading_spinner' into … 

    …frankreed/foreignManagement8_debouncin
    @FrankreedX
    FrankreedX committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    d1864ac View commit details
    Browse the repository at this point in the history

  7. debounced and error handled Unban

    @FrankreedX
    FrankreedX committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    2d7c2f5 View commit details
    Browse the repository at this point in the history

  8. Added status snackbar to the IWB buttons

    @FrankreedX
    FrankreedX committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    6e29e4c View commit details
    Browse the repository at this point in the history

  9. Merge branch 'main' into frankreed/fix_verified_redirect_bug

    @FrankreedX
    FrankreedX committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    c2104b9 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'frankreed/fix_verified_redirect_bug' into frankreed/for… 

    …eignManagement1_blacklist_hook

# Conflicts:
#	context/Auth.js
    @FrankreedX
    FrankreedX committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    e54fe2e View commit details
    Browse the repository at this point in the history

  11. Merge branch 'frankreed/foreignManagement1_blacklist_hook' into frank… 

    …reed/foreignManagement2_blacklist_tab
    @FrankreedX
    FrankreedX committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    9daf486 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'frankreed/foreignManagement2_blacklist_tab' into frankr… 

    …eed/foreignManagement3_waitlist_tab
    @FrankreedX
    FrankreedX committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    75af2f7 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'frankreed/foreignManagement3_waitlist_tab' into frankre… 

    …ed/foreignManagement4_overhaul_auth_redirects

# Conflicts:
#	dbOperations/hooks/useUserInfo.js
    @FrankreedX
    FrankreedX committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    21620ef View commit details
    Browse the repository at this point in the history

  14. Merge branch 'frankreed/foreignManagement4_overhaul_auth_redirects' i… 

    …nto frankreed/foreignManagement5_invite_tab
    @FrankreedX
    FrankreedX committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    1ea9cfe View commit details
    Browse the repository at this point in the history

  15. Merge branch 'frankreed/foreignManagement5_invite_tab' into frankreed… 

    …/foreignManagement6_add_loading_spinner
    @FrankreedX
    FrankreedX committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    802a2b0 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'frankreed/foreignManagement6_add_loading_spinner' into … 

    …frankreed/foreignManagement8_debouncin
    @FrankreedX
    FrankreedX committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    90a4e20 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'frankreed/foreignManagement8_debouncin' into frankreed/… 

    …foreignManagement9_status_snackbar
    @FrankreedX
    FrankreedX committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    5b24b7d View commit details
    Browse the repository at this point in the history

  18. Merge branch 'main' into frankreed/foreignManagement3_waitlist_tab 

    # Conflicts:
#	app/segments/(team)/chooseTeam.js
#	app/segments/(team)/manageForeignRequests.js
    @FrankreedX
    FrankreedX committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    1440550 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'frankreed/foreignManagement3_waitlist_tab' into frankre… 

    …ed/foreignManagement4_overhaul_auth_redirects
    @FrankreedX
    FrankreedX committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    cd8393d View commit details
    Browse the repository at this point in the history

  20. Merge branch 'frankreed/foreignManagement4_overhaul_auth_redirects' i… 

    …nto frankreed/foreignManagement5_invite_tab
    @FrankreedX
    FrankreedX committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    0503312 View commit details
    Browse the repository at this point in the history

  21. Merge branch 'frankreed/foreignManagement5_invite_tab' into frankreed… 

    …/foreignManagement6_add_loading_spinner
    @FrankreedX
    FrankreedX committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    b45e01e View commit details
    Browse the repository at this point in the history

  22. Merge branch 'frankreed/foreignManagement6_add_loading_spinner' into … 

    …frankreed/foreignManagement8_debouncin
    @FrankreedX
    FrankreedX committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    e936660 View commit details
    Browse the repository at this point in the history

  23. Merge branch 'frankreed/foreignManagement8_debouncin' into frankreed/… 

    …foreignManagement9_status_snackbar
    @FrankreedX
    FrankreedX committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    0b78f5c View commit details
    Browse the repository at this point in the history

  24. Merge branch 'main' into frankreed/foreignManagement4_overhaul_auth_r… 

    …edirects

# Conflicts:
#	app/segments/(team)/chooseTeam.js
    @FrankreedX
    FrankreedX committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    c82967a View commit details
    Browse the repository at this point in the history

  25. Merge branch 'frankreed/foreignManagement4_overhaul_auth_redirects' i… 

    …nto frankreed/foreignManagement5_invite_tab
    @FrankreedX
    FrankreedX committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    5417279 View commit details
    Browse the repository at this point in the history

  26. Merge branch 'frankreed/foreignManagement5_invite_tab' into frankreed… 

    …/foreignManagement6_add_loading_spinner
    @FrankreedX
    FrankreedX committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    4c9afac View commit details
    Browse the repository at this point in the history

  27. Merge branch 'frankreed/foreignManagement6_add_loading_spinner' into … 

    …frankreed/foreignManagement8_debouncin
    @FrankreedX
    FrankreedX committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    5649598 View commit details
    Browse the repository at this point in the history

  28. Merge branch 'frankreed/foreignManagement8_debouncin' into frankreed/… 

    …foreignManagement9_status_snackbar
    @FrankreedX
    FrankreedX committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    cf59256 View commit details
    Browse the repository at this point in the history

  29. Merge branch 'main' into frankreed/foreignManagement9_status_snackbar 

    # Conflicts:
#	app/segments/(team)/blacklist.js
#	app/segments/(team)/invitelist.js
#	app/segments/(team)/waitlist.js
    @FrankreedX
    FrankreedX committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    022c37d View commit details
    Browse the repository at this point in the history