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

Merge changes from dev into master #30

Merged
merged 25 commits into from
Mar 30, 2024
Merged

Merge changes from dev into master #30

merged 25 commits into from
Mar 30, 2024

Commits on Mar 24, 2024

  1. remove api folder, cleanup code

    @Firebird1029
    Firebird1029 committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    bf2a4f1 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2024

  1. Merge pull request #27 from Firebird1029/delete-api-folder 

    remove api folder, cleanup code
    @davidcrair
    davidcrair authored Mar 29, 2024
    Configuration menu
    Copy the full SHA
    bf6e41e View commit details
    Browse the repository at this point in the history

  2. Round genres shared percentage

    @davidcrair
    davidcrair committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    9ae50d4 View commit details
    Browse the repository at this point in the history

  3. Update user data and unify page

    @davidcrair
    davidcrair committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    a55ef98 View commit details
    Browse the repository at this point in the history

  4. Bug fix: Add rounding matching artists

    @davidcrair
    davidcrair committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    798c544 View commit details
    Browse the repository at this point in the history

  5. Update UnifyContent.jsx

    @davidcrair
    davidcrair committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    affc6bb View commit details
    Browse the repository at this point in the history

  6. Update enter code button to log out

    @davidcrair
    davidcrair committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    dbf4742 View commit details
    Browse the repository at this point in the history

  7. Update redirect in unify when not logged in

    @davidcrair
    davidcrair committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    c426458 View commit details
    Browse the repository at this point in the history

  8. Update Pie Charts 

    Make them more vinyl-like + refactoring
    @hoixw
    hoixw committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    f6c52a3 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2024

  1. Update error messages

    @davidcrair
    davidcrair committed Mar 30, 2024
    Configuration menu
    Copy the full SHA
    7059c3e View commit details
    Browse the repository at this point in the history

  2. Add errors to user page and unify page

    @davidcrair
    davidcrair committed Mar 30, 2024
    Configuration menu
    Copy the full SHA
    a81484c View commit details
    Browse the repository at this point in the history

  3. Redirect /user/ to user page

    @davidcrair
    davidcrair committed Mar 30, 2024
    Configuration menu
    Copy the full SHA
    492dd67 View commit details
    Browse the repository at this point in the history

  4. Update page.jsx

    @davidcrair
    davidcrair committed Mar 30, 2024
    Configuration menu
    Copy the full SHA
    057e07b View commit details
    Browse the repository at this point in the history

  5. Update page.jsx

    @davidcrair
    davidcrair committed Mar 30, 2024
    Configuration menu
    Copy the full SHA
    458c213 View commit details
    Browse the repository at this point in the history

  6. Update frontend.t.js.snap

    @davidcrair
    davidcrair committed Mar 30, 2024
    Configuration menu
    Copy the full SHA
    e9949ab View commit details
    Browse the repository at this point in the history

  7. Merge pull request #28 from Firebird1029/deployment_fixes 

    Deployment fixes
    @hoixw
    hoixw authored Mar 30, 2024
    Configuration menu
    Copy the full SHA
    f73be06 View commit details
    Browse the repository at this point in the history

  8. Update README.md

    @davidcrair
    davidcrair committed Mar 30, 2024
    Configuration menu
    Copy the full SHA
    910c941 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #29 from Firebird1029/update_readme 

    Update README.md
    @hoixw
    hoixw authored Mar 30, 2024
    Configuration menu
    Copy the full SHA
    74a63e3 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #31 from Firebird1029/master 

    Merge pull request #26 from Firebird1029/dev
    @davidcrair
    davidcrair authored Mar 30, 2024
    Configuration menu
    Copy the full SHA
    70bf057 View commit details
    Browse the repository at this point in the history

  11. Update index_content.jsx

    @davidcrair
    davidcrair committed Mar 30, 2024
    Configuration menu
    Copy the full SHA
    7973b48 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'dev' of https://github.com/Firebird1029/unify-cs439 int… 

    …o dev
    @davidcrair
    davidcrair committed Mar 30, 2024
    Configuration menu
    Copy the full SHA
    e598f6b View commit details
    Browse the repository at this point in the history

  13. Update index_content.jsx

    @davidcrair
    davidcrair committed Mar 30, 2024
    Configuration menu
    Copy the full SHA
    5df4345 View commit details
    Browse the repository at this point in the history

  14. Update README.md

    @davidcrair
    davidcrair committed Mar 30, 2024
    Configuration menu
    Copy the full SHA
    fc29ff2 View commit details
    Browse the repository at this point in the history

  15. Update README.md

    @davidcrair
    davidcrair committed Mar 30, 2024
    Configuration menu
    Copy the full SHA
    a354a02 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #32 from Firebird1029/fix_lint 

    Fix lint
    @hoixw
    hoixw authored Mar 30, 2024
    Configuration menu
    Copy the full SHA
    75d0c86 View commit details
    Browse the repository at this point in the history