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 to main #112

Merged
merged 56 commits into from
Nov 26, 2023
Merged

merge to main #112

merged 56 commits into from
Nov 26, 2023

Commits on Nov 17, 2023

  1. Mobile Responsive Costa Rica

    @Fuyuki325
    Fuyuki325 committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    6a82734 View commit details
    Browse the repository at this point in the history

  2. added WaterQualityAndFiltrationProject

    Dylan Wong committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    c698ca1 View commit details
    Browse the repository at this point in the history

  3. added WaterQuality

    Dylan Wong committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    9f064fa View commit details
    Browse the repository at this point in the history

  4. added why join section + small changes to focus.jsx to fix grid conte… 

    …nt layout
    @stanleylew5
    stanleylew5 committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    a4ef95e View commit details
    Browse the repository at this point in the history

  5. Created About Page

    @AgentEinstein
    AgentEinstein committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    102b4a4 View commit details
    Browse the repository at this point in the history

  6. added WaterQuality

    Dylan Wong committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    1283731 View commit details
    Browse the repository at this point in the history

  7. fix projecrs

    @menthy-wu
    menthy-wu committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    64f7bfc View commit details
    Browse the repository at this point in the history

  8. made changes

    @stanleylew5
    stanleylew5 committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    50aba20 View commit details
    Browse the repository at this point in the history

  9. Removed unneeded imports on page.js

    @Fuyuki325
    Fuyuki325 committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    2463a09 View commit details
    Browse the repository at this point in the history

  10. z-20 instead of z-10

    @stanleylew5
    stanleylew5 committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    febcdc8 View commit details
    Browse the repository at this point in the history

  11. Restored page.js to normal

    @Fuyuki325
    Fuyuki325 committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    29644b8 View commit details
    Browse the repository at this point in the history

  12. formatting

    @stanleylew5
    stanleylew5 committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    49d24ca View commit details
    Browse the repository at this point in the history

  13. added water quality

    Dylan Wong committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    af2f4d9 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #86 from acm-ucr/stanley/focusSection 

    stanley/whyjoin
    @menthy-wu
    menthy-wu authored Nov 17, 2023
    Configuration menu
    Copy the full SHA
    9b5f551 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #92 from acm-ucr/menthy/fix 

    fix projecrs
    @menthy-wu
    menthy-wu authored Nov 17, 2023
    Configuration menu
    Copy the full SHA
    806c470 View commit details
    Browse the repository at this point in the history

  16. Fixed import for img2

    @Fuyuki325
    Fuyuki325 committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    10e02ab View commit details
    Browse the repository at this point in the history

  17. Merge pull request #88 from acm-ucr/dylan/WaterQualityAndFiltrationPr… 

    …oject

Dylan/water quality and filtration project
    @menthy-wu
    menthy-wu authored Nov 17, 2023
    Configuration menu
    Copy the full SHA
    49d5fed View commit details
    Browse the repository at this point in the history

  18. add water

    @menthy-wu
    menthy-wu committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    8bd872b View commit details
    Browse the repository at this point in the history

  19. Merge pull request #84 from acm-ucr/Fuyuki/Mobile-Costa 

    Fuyuki/Mobile-Responsive-Costa-Rica
    @menthy-wu
    menthy-wu authored Nov 17, 2023
    Configuration menu
    Copy the full SHA
    3dd2967 View commit details
    Browse the repository at this point in the history

  20. Merge branch 'dev' of https://github.com/acm-ucr/ewb-website into dev

    @menthy-wu
    menthy-wu committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    9aa7d2e View commit details
    Browse the repository at this point in the history

  21. robotics page added

    @stanleylew5
    stanleylew5 committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    aed6630 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2023

  1. Merge pull request #96 from acm-ucr/menthy/water 

    add water
    @menthy-wu
    menthy-wu authored Nov 18, 2023
    Configuration menu
    Copy the full SHA
    7f167e0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #98 from acm-ucr/stanley/robotics 

    stanley/robotics
    @menthy-wu
    menthy-wu authored Nov 18, 2023
    Configuration menu
    Copy the full SHA
    73ab7d2 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2023

  1. forgot to format again whoopsies

    @stanleylew5
    stanleylew5 committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    ed7365a View commit details
    Browse the repository at this point in the history

  2. made changes

    @stanleylew5
    stanleylew5 committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    9e6568e View commit details
    Browse the repository at this point in the history

  3. Merge pull request #99 from acm-ucr/stanley/mobileResponsivenessFocus… 

    …Section

stanley / mobile responsiveness for focus section
    @menthy-wu
    menthy-wu authored Nov 20, 2023
    Configuration menu
    Copy the full SHA
    96582dc View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dev' of https://github.com/acm-ucr/ewb-website into dev

    @menthy-wu
    menthy-wu committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    422ac93 View commit details
    Browse the repository at this point in the history

  5. add picture

    @menthy-wu
    menthy-wu committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    4be9eaa View commit details
    Browse the repository at this point in the history

  6. fix board

    @menthy-wu
    menthy-wu committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    58285aa View commit details
    Browse the repository at this point in the history

  7. fixed focus + added pic

    @stanleylew5
    stanleylew5 committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    25044f9 View commit details
    Browse the repository at this point in the history

  8. removed padding from nav bar

    @stanleylew5
    stanleylew5 committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    c6457de View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. kevin/tanzaniaMobile

    @Kevinloritsch
    Kevinloritsch committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    166bb54 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2023

  1. Added About

    @Fuyuki325
    Fuyuki325 committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    12cf590 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2023

  1. Merge branch 'dev' of https://github.com/acm-ucr/ewb-website into Age… 

    …ntEinstein/About
    @AgentEinstein
    AgentEinstein committed Nov 25, 2023
    Configuration menu
    Copy the full SHA
    3c01771 View commit details
    Browse the repository at this point in the history

  2. fixed small changes involving div removal and self closing

    @AgentEinstein
    AgentEinstein committed Nov 25, 2023
    Configuration menu
    Copy the full SHA
    08fe8a6 View commit details
    Browse the repository at this point in the history

  3. Landing page now responsive on most mobile phones

    @AgentEinstein
    AgentEinstein committed Nov 25, 2023
    Configuration menu
    Copy the full SHA
    a01fc22 View commit details
    Browse the repository at this point in the history

  4. added board mobile responsiveness

    @dylanwong6605
    dylanwong6605 committed Nov 25, 2023
    Configuration menu
    Copy the full SHA
    062efed View commit details
    Browse the repository at this point in the history

  5. added mobile responsive board

    @dylanwong6605
    dylanwong6605 committed Nov 25, 2023
    Configuration menu
    Copy the full SHA
    70952d1 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #107 from acm-ucr/dylan/MobileResponseBoard 

    added board mobile responsiveness
    @menthy-wu
    menthy-wu authored Nov 25, 2023
    Configuration menu
    Copy the full SHA
    7220932 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #102 from acm-ucr/stanley/whyjoin 

    stanley/whyjoin
    @menthy-wu
    menthy-wu authored Nov 25, 2023
    Configuration menu
    Copy the full SHA
    46f0bac View commit details
    Browse the repository at this point in the history

  8. Merge pull request #103 from acm-ucr/stanley/navbar 

    stanley/navbar
    @menthy-wu
    menthy-wu authored Nov 25, 2023
    Configuration menu
    Copy the full SHA
    c87b6b9 View commit details
    Browse the repository at this point in the history

  9. delete useless file

    @menthy-wu
    menthy-wu committed Nov 25, 2023
    Configuration menu
    Copy the full SHA
    9f46480 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #106 from acm-ucr/AgentEinstein/LandingPage 

    Landing page now responsive on most mobile phones
    @menthy-wu
    menthy-wu authored Nov 25, 2023
    Configuration menu
    Copy the full SHA
    b70b2cd View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2023

  1. fix about page

    @menthy-wu
    menthy-wu committed Nov 26, 2023
    Configuration menu
    Copy the full SHA
    3c6e32b View commit details
    Browse the repository at this point in the history

  2. fix about

    @menthy-wu
    menthy-wu committed Nov 26, 2023
    Configuration menu
    Copy the full SHA
    b9115d1 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #104 from acm-ucr/kevin/tanzaniaMobile 

    kevin/tanzaniaMobile
    @menthy-wu
    menthy-wu authored Nov 26, 2023
    Configuration menu
    Copy the full SHA
    c2d985a View commit details
    Browse the repository at this point in the history

  4. fix about page

    @menthy-wu
    menthy-wu committed Nov 26, 2023
    Configuration menu
    Copy the full SHA
    fbc9dda View commit details
    Browse the repository at this point in the history

  5. Merge branch 'dev' of https://github.com/acm-ucr/ewb-website into Age… 

    …ntEinstein/About
    @menthy-wu
    menthy-wu committed Nov 26, 2023
    Configuration menu
    Copy the full SHA
    e2f4139 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'AgentEinstein/About' of https://github.com/acm-ucr/ewb-… 

    …website into AgentEinstein/About
    @menthy-wu
    menthy-wu committed Nov 26, 2023
    Configuration menu
    Copy the full SHA
    be02dd3 View commit details
    Browse the repository at this point in the history

  7. fix about

    @menthy-wu
    menthy-wu committed Nov 26, 2023
    Configuration menu
    Copy the full SHA
    be53a88 View commit details
    Browse the repository at this point in the history

  8. revert abotu section

    @menthy-wu
    menthy-wu committed Nov 26, 2023
    Configuration menu
    Copy the full SHA
    0c548d2 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #105 from acm-ucr/Fuyuki/About 

    Fuyuki/About
    @menthy-wu
    menthy-wu authored Nov 26, 2023
    Configuration menu
    Copy the full SHA
    2835453 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #87 from acm-ucr/AgentEinstein/About 

    Created About Page
    @menthy-wu
    menthy-wu authored Nov 26, 2023
    Configuration menu
    Copy the full SHA
    e6c7078 View commit details
    Browse the repository at this point in the history

  11. fix home page

    @menthy-wu
    menthy-wu committed Nov 26, 2023
    Configuration menu
    Copy the full SHA
    dbccd40 View commit details
    Browse the repository at this point in the history

  12. add duration

    @menthy-wu
    menthy-wu committed Nov 26, 2023
    Configuration menu
    Copy the full SHA
    32f808b View commit details
    Browse the repository at this point in the history

  13. Merge pull request #108 from acm-ucr/menthy/home 

    fix home page
    @menthy-wu
    menthy-wu authored Nov 26, 2023
    Configuration menu
    Copy the full SHA
    10dc56f View commit details
    Browse the repository at this point in the history