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

6조 과제 제출 (강해경, 강현주, 김지원, 안가을) #7

Open
wants to merge 119 commits into
base: main
Choose a base branch
from
Open

6조 과제 제출 (강해경, 강현주, 김지원, 안가을) #7

wants to merge 119 commits into from

Commits on Jan 16, 2023

  1. Chore: Project setting

    @iziz9
    iziz9 committed Jan 16, 2023
    Configuration menu
    Copy the full SHA
    654201a View commit details
    Browse the repository at this point in the history

  2. Chore: Project setting

    @iziz9
    iziz9 committed Jan 16, 2023
    Configuration menu
    Copy the full SHA
    67075be View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1 from toy-project-6/kanghyeonju 

    Chore: Project setting
    @iziz9
    iziz9 authored Jan 16, 2023
    Configuration menu
    Copy the full SHA
    86aa193 View commit details
    Browse the repository at this point in the history

  4. Chore: Project setting-3

    @iziz9
    iziz9 committed Jan 16, 2023
    Configuration menu
    Copy the full SHA
    0d5e1b0 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #2 from toy-project-6/kanghyeonju 

    Chore: Project setting-3
    @iziz9
    iziz9 authored Jan 16, 2023
    Configuration menu
    Copy the full SHA
    166f982 View commit details
    Browse the repository at this point in the history

  6. eslint & prettier setting

    @hae9
    hae9 committed Jan 16, 2023
    Configuration menu
    Copy the full SHA
    9c6dc3a View commit details
    Browse the repository at this point in the history

  7. Merge branch 'main' of https://github.com/toy-project-6/toy-project

    @hae9
    hae9 committed Jan 16, 2023
    Configuration menu
    Copy the full SHA
    8d6a4d1 View commit details
    Browse the repository at this point in the history

  8. feature: create router

    @hae9
    hae9 committed Jan 16, 2023
    Configuration menu
    Copy the full SHA
    f6180b9 View commit details
    Browse the repository at this point in the history

  9. Feat: add VideoPlayer component

    @iziz9
    iziz9 committed Jan 16, 2023
    Configuration menu
    Copy the full SHA
    153be60 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2023

  1. Stopped tranking .env File

    @hae9
    hae9 committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    7109a20 View commit details
    Browse the repository at this point in the history

  2. Stopped tracking .env File

    @iziz9
    iziz9 committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    ce61df4 View commit details
    Browse the repository at this point in the history

  3. Chore: Project setting

    @iziz9
    iziz9 committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    a8f8a2a View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feature/dev' into kanghyeonju

    @iziz9
    iziz9 committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    e02e0d2 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1 from toy-project-6/kanghyeonju 

    Chore: Project setting
    @iziz9
    iziz9 authored Jan 17, 2023
    Configuration menu
    Copy the full SHA
    46b2ac8 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' of https://github.com/toy-project-6/toy-6tube int… 

    …o kanghaekyung
    @hae9
    hae9 committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    f8493cb View commit details
    Browse the repository at this point in the history

  7. 🎨 - Imporve structure

    @zwonkim
    zwonkim committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    10725e0 View commit details
    Browse the repository at this point in the history

  8. 🎨 - Improve structure

    @zwonkim
    zwonkim committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    4bd0a8a View commit details
    Browse the repository at this point in the history

  9. Merge pull request #2 from toy-project-6/kimjiwon 

    jiwon) feat: create VideoCard component
    @zwonkim
    zwonkim authored Jan 17, 2023
    Configuration menu
    Copy the full SHA
    4eb007c View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2023

  1. 💄 Add : header, nav componenet 

    create header, nav ui
    @hae9
    hae9 committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    4f851ef View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into kanghaekyung

    @hae9
    hae9 authored Jan 18, 2023
    Configuration menu
    Copy the full SHA
    d3fc55f View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3 from toy-project-6/kanghaekyung 

    💄 Add : header, nav componenet
    @hae9
    hae9 authored Jan 18, 2023
    Configuration menu
    Copy the full SHA
    db6fc8d View commit details
    Browse the repository at this point in the history

  4. 💄 update : home page layout

    @hae9
    hae9 committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    f196363 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #4 from toy-project-6/kanghaekyung 

    💄 update : home page layout
    @hae9
    hae9 authored Jan 18, 2023
    Configuration menu
    Copy the full SHA
    1169401 View commit details
    Browse the repository at this point in the history

  6. 🏗️ Edit: router structure, Delete: Router.jsx

    @hae9
    hae9 committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    3467d42 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #5 from toy-project-6/kanghaekyung 

    🏗️ Edit: router structure, Delete: Router.jsx
    @hae9
    hae9 authored Jan 18, 2023
    Configuration menu
    Copy the full SHA
    c76e1e9 View commit details
    Browse the repository at this point in the history

  8. ✨ Add : channel detail page

    @zwonkim
    zwonkim committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    62eb650 View commit details
    Browse the repository at this point in the history

  9. 💄 Add: related video bar 

    Complete related video bar layout
    @iziz9
    iziz9 committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    f6546bb View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2023

  1. Merge pull request #6 from toy-project-6/kanghyeonju 

    💄 Add: related video bar
    @hae9
    hae9 authored Jan 19, 2023
    Configuration menu
    Copy the full SHA
    380d58b View commit details
    Browse the repository at this point in the history

  2. 🔀 Merge: for git pull

    @hae9
    hae9 committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    0f6f3a9 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' of https://github.com/toy-project-6/toy-6tube int… 

    …o kanghaekyung
    @hae9
    hae9 committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    695f63b View commit details
    Browse the repository at this point in the history

  4. Add search page

    @autumnly1007
    autumnly1007 committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    5fb8c9a View commit details
    Browse the repository at this point in the history

  5. 🎨 Modify: markup structure

    @iziz9
    iziz9 committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    c74ee4a View commit details
    Browse the repository at this point in the history

  6. Merge pull request #7 from toy-project-6/kanghyeonju 

    🎨 Modify: markup structure
    @iziz9
    iziz9 authored Jan 19, 2023
    Configuration menu
    Copy the full SHA
    3d34a77 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'main' into AhnGaEul

    @autumnly1007
    autumnly1007 authored Jan 19, 2023
    Configuration menu
    Copy the full SHA
    0f5dad5 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #8 from toy-project-6/AhnGaEul 

    Add search page
    @autumnly1007
    autumnly1007 authored Jan 19, 2023
    Configuration menu
    Copy the full SHA
    7837f69 View commit details
    Browse the repository at this point in the history

  9. Update search page

    @autumnly1007
    autumnly1007 committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    1fd79de View commit details
    Browse the repository at this point in the history

  10. Merge pull request #9 from toy-project-6/AhnGaEul 

    Update search page
    @autumnly1007
    autumnly1007 authored Jan 19, 2023
    Configuration menu
    Copy the full SHA
    c1dea5b View commit details
    Browse the repository at this point in the history

  11. 💄 update detailpage style

    @hae9
    hae9 committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    68e85bd View commit details
    Browse the repository at this point in the history

  12. Merge branch 'main' of https://github.com/toy-project-6/toy-6tube int… 

    …o kanghaekyung
    @hae9
    hae9 committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    e39cbf3 View commit details
    Browse the repository at this point in the history

  13. add utils in channel detail page

    @zwonkim
    zwonkim committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    c2067f1 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'feature/kimjiwon' into kimjiwon

    @zwonkim
    zwonkim committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    258b3b9 View commit details
    Browse the repository at this point in the history

  15. fix the conflicts

    @zwonkim
    zwonkim committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    10381a1 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #10 from toy-project-6/kimjiwon 

    edit detail page
    @zwonkim
    zwonkim authored Jan 19, 2023
    Configuration menu
    Copy the full SHA
    632f22b View commit details
    Browse the repository at this point in the history

  17. ✨ Feature: add detail video

    @hae9
    hae9 committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    c08a193 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'main' of https://github.com/toy-project-6/toy-6tube int… 

    …o kanghaekyung
    @hae9
    hae9 committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    fff5b3e View commit details
    Browse the repository at this point in the history

  19. 🔧 Add: React-tooltip

    @iziz9
    iziz9 committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    530e53c View commit details
    Browse the repository at this point in the history

  20. Merge pull request #11 from toy-project-6/kanghyeonju 

    🔧 Add: React-tooltip
    @iziz9
    iziz9 authored Jan 19, 2023
    Configuration menu
    Copy the full SHA
    02ca237 View commit details
    Browse the repository at this point in the history

  21. Update Search page

    @autumnly1007
    autumnly1007 committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    c7ffa5c View commit details
    Browse the repository at this point in the history

  22. Merge pull request #12 from toy-project-6/AhnGaEul 

    Update Search page
    @autumnly1007
    autumnly1007 authored Jan 19, 2023
    Configuration menu
    Copy the full SHA
    7e9c403 View commit details
    Browse the repository at this point in the history

  23. create HoverVideo component

    @zwonkim
    zwonkim committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    60cf165 View commit details
    Browse the repository at this point in the history

  24. fix conflicts

    @zwonkim
    zwonkim committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    d74ae9b View commit details
    Browse the repository at this point in the history

  25. Merge pull request #13 from toy-project-6/kimjiwon 

    create VideoCardInfo component
    @zwonkim
    zwonkim authored Jan 19, 2023
    Configuration menu
    Copy the full SHA
    4b5a897 View commit details
    Browse the repository at this point in the history

  26. ✨ Add : detail youtube player

    @hae9
    hae9 committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    d46e679 View commit details
    Browse the repository at this point in the history

  27. Merge branch 'main' of https://github.com/toy-project-6/toy-6tube int… 

    …o kanghaekyung
    @hae9
    hae9 committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    ad2b203 View commit details
    Browse the repository at this point in the history

  28. 💄 Add: pop up tooltip when hover channel name 

    -툴팁 기능 추가
    @iziz9
    iziz9 committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    e887fa7 View commit details
    Browse the repository at this point in the history

  29. Merge pull request #14 from toy-project-6/kanghyeonju 

    💄 Add: pop up tooltip when hover channel name
    @iziz9
    iziz9 authored Jan 19, 2023
    Configuration menu
    Copy the full SHA
    01bc954 View commit details
    Browse the repository at this point in the history

  30. 💄 Modify: header, scrollbar, text styles 

    툴팁 위치 조정, 헤더 인풋 디자인 변경, 전체 색상 및 텍스트 굵기 변경
    @iziz9
    iziz9 committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    9864fa2 View commit details
    Browse the repository at this point in the history

  31. Merge pull request #15 from toy-project-6/kanghyeonju 

    💄 Modify: header, scrollbar, text styles
    @iziz9
    iziz9 authored Jan 19, 2023
    Configuration menu
    Copy the full SHA
    47f3444 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2023

  1. Edit : Navbar style

    @hae9
    hae9 committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    1fdcd56 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/toy-project-6/toy-6tube int… 

    …o kanghaekyung
    @hae9
    hae9 committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    60bde85 View commit details
    Browse the repository at this point in the history

  3. 🎨 Edit : player component

    @hae9
    hae9 committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    edfe88f View commit details
    Browse the repository at this point in the history

  4. Merge pull request #16 from toy-project-6/kanghaekyung 

    🎨 Edit : player component
    @hae9
    hae9 authored Jan 20, 2023
    Configuration menu
    Copy the full SHA
    386ea7c View commit details
    Browse the repository at this point in the history

  5. ✨ Add: comments container

    @iziz9
    iziz9 committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    775d30d View commit details
    Browse the repository at this point in the history

  6. Merge pull request #17 from toy-project-6/kanghyeonju 

    ✨ Add: comments container
    @iziz9
    iziz9 authored Jan 20, 2023
    Configuration menu
    Copy the full SHA
    6e26f56 View commit details
    Browse the repository at this point in the history

  7. Add search page infinity scroll

    @autumnly1007
    autumnly1007 committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    74d3043 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #18 from toy-project-6/AhnGaEul 

    Add search page infinity scroll
    @autumnly1007
    autumnly1007 authored Jan 20, 2023
    Configuration menu
    Copy the full SHA
    a6f8f14 View commit details
    Browse the repository at this point in the history

  9. add and update UI

    @zwonkim
    zwonkim committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    e3a9e59 View commit details
    Browse the repository at this point in the history

  10. 💄 Add : home banner and buttons

    @hae9
    hae9 committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    e6a8980 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'main' of https://github.com/toy-project-6/toy-6tube int… 

    …o kanghaekyung
    @hae9
    hae9 committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    397baef View commit details
    Browse the repository at this point in the history

  12. fix the conflict

    @zwonkim
    zwonkim committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    b3b2b61 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #19 from toy-project-6/kimjiwon 

    add and update UI
    @zwonkim
    zwonkim authored Jan 20, 2023
    Configuration menu
    Copy the full SHA
    e99861f View commit details
    Browse the repository at this point in the history

  14. edit styling(responsive)

    @zwonkim
    zwonkim committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    5c56a6b View commit details
    Browse the repository at this point in the history

  15. Merge pull request #20 from toy-project-6/kimjiwon 

    edit styling(responsive)
    @zwonkim
    zwonkim authored Jan 20, 2023
    Configuration menu
    Copy the full SHA
    5b54ef3 View commit details
    Browse the repository at this point in the history

  16. 🐛 Test: bug fix test

    @iziz9
    iziz9 committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    c2c1a33 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'main' of https://github.com/toy-project-6/toy-6tube int… 

    …o kanghyeonju
    @iziz9
    iziz9 committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    8de06e2 View commit details
    Browse the repository at this point in the history

  18. 🐛 Fix: hover video size 

    git push upstream kanghyeonju
    @iziz9
    iziz9 committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    d9dbc87 View commit details
    Browse the repository at this point in the history

  19. 💄 Add : home netflix UI

    @hae9
    hae9 committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    043447a View commit details
    Browse the repository at this point in the history

  20. Merge branch 'main' of https://github.com/toy-project-6/toy-6tube int… 

    …o kanghaekyung
    @hae9
    hae9 committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    339b23e View commit details
    Browse the repository at this point in the history

  21. Merge pull request #22 from toy-project-6/kanghaekyung 

    Add : home banner and buttons
    @hae9
    hae9 authored Jan 20, 2023
    Configuration menu
    Copy the full SHA
    3861d69 View commit details
    Browse the repository at this point in the history

  22. data change

    @hae9
    hae9 committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    6eca445 View commit details
    Browse the repository at this point in the history

  23. 🦺 Add icons, modify request codes

    @iziz9
    iziz9 committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    16d15d8 View commit details
    Browse the repository at this point in the history

  24. Merge branch 'main' into kanghyeonju

    @iziz9
    iziz9 authored Jan 20, 2023
    Configuration menu
    Copy the full SHA
    9541b62 View commit details
    Browse the repository at this point in the history

  25. Merge pull request #21 from toy-project-6/kanghyeonju 

    Fix: hover video size
    @iziz9
    iziz9 authored Jan 20, 2023
    Configuration menu
    Copy the full SHA
    d6617dc View commit details
    Browse the repository at this point in the history

  26. Merge branch 'main' of https://github.com/toy-project-6/toy-6tube int… 

    …o kanghaekyung
    @hae9
    hae9 committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    3fc1468 View commit details
    Browse the repository at this point in the history

  27. edit

    @hae9
    hae9 committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    136ed2d View commit details
    Browse the repository at this point in the history

  28. Merge pull request #23 from toy-project-6/kanghaekyung 

    Kanghaekyung
    @hae9
    hae9 authored Jan 20, 2023
    Configuration menu
    Copy the full SHA
    e9dae03 View commit details
    Browse the repository at this point in the history

  29. fix the error

    @zwonkim
    zwonkim committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    1db731e View commit details
    Browse the repository at this point in the history

  30. 수정

    @hae9
    hae9 committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    18959e9 View commit details
    Browse the repository at this point in the history

  31. Merge pull request #24 from toy-project-6/kanghaekyung 

    수정
    @iziz9
    iziz9 authored Jan 20, 2023
    Configuration menu
    Copy the full SHA
    998cf59 View commit details
    Browse the repository at this point in the history

  32. ongoing

    @iziz9
    iziz9 committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    5063f07 View commit details
    Browse the repository at this point in the history

  33. 🐛 Fix: fix the bug by add import code

    @iziz9
    iziz9 committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    9924576 View commit details
    Browse the repository at this point in the history

  34. Merge pull request #25 from toy-project-6/kanghyeonju 

    Fix: tooltip bug
    @iziz9
    iziz9 authored Jan 20, 2023
    Configuration menu
    Copy the full SHA
    56119a4 View commit details
    Browse the repository at this point in the history

  35. 🐛 Fix : buttons feature

    @hae9
    hae9 committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    2b48b70 View commit details
    Browse the repository at this point in the history

  36. Merge branch 'main' of https://github.com/toy-project-6/toy-6tube int… 

    …o kanghaekyung
    @hae9
    hae9 committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    42226f2 View commit details
    Browse the repository at this point in the history

  37. Merge pull request #26 from toy-project-6/kanghaekyung 

    🐛 Fix : buttons feature
    @hae9
    hae9 authored Jan 20, 2023
    Configuration menu
    Copy the full SHA
    6990400 View commit details
    Browse the repository at this point in the history

  38. 💄 Update: UI / Fix: vidioDuration error

    @iziz9
    iziz9 committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    aff5bbd View commit details
    Browse the repository at this point in the history

  39. Merge pull request #27 from toy-project-6/kanghyeonju 

    💄 Update: UI / Fix: vidioDuration error
    @iziz9
    iziz9 authored Jan 20, 2023
    Configuration menu
    Copy the full SHA
    a9d33e7 View commit details
    Browse the repository at this point in the history

  40. ✅ Test: deploy test

    @iziz9
    iziz9 committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    d020a30 View commit details
    Browse the repository at this point in the history

  41. Merge pull request #28 from toy-project-6/kanghyeonju 

    ✅ Test: deploy test
    @iziz9
    iziz9 authored Jan 20, 2023
    Configuration menu
    Copy the full SHA
    e76c088 View commit details
    Browse the repository at this point in the history

  42. 🐛 Fix error when click related video

    @iziz9
    iziz9 committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    b8e80a5 View commit details
    Browse the repository at this point in the history

  43. Merge pull request #29 from toy-project-6/kanghyeonju 

    🐛 Fix error when click related video
    @iziz9
    iziz9 authored Jan 20, 2023
    Configuration menu
    Copy the full SHA
    5282c65 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2023

  1. 📝 update: Readme.md

    @hae9
    hae9 committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    47225c8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/toy-project-6/toy-6tube int… 

    …o kanghaekyung
    @hae9
    hae9 committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    5985276 View commit details
    Browse the repository at this point in the history

  3. 💄 update style

    @iziz9
    iziz9 committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    6fed336 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #31 from toy-project-6/kanghaekyung 

    📝 update: Readme.md
    @hae9
    hae9 authored Jan 21, 2023
    Configuration menu
    Copy the full SHA
    436f726 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #32 from toy-project-6/kanghyeonju 

    💄 update style
    @iziz9
    iziz9 authored Jan 21, 2023
    Configuration menu
    Copy the full SHA
    976d7c5 View commit details
    Browse the repository at this point in the history

  6. readme.md

    @iziz9
    iziz9 committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    56a3ed2 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'main' of https://github.com/toy-project-6/toy-6tube int… 

    …o kanghyeonju
    @iziz9
    iziz9 committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    efabddd View commit details
    Browse the repository at this point in the history

  8. changes

    @zwonkim
    zwonkim committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    9ab208b View commit details
    Browse the repository at this point in the history

  9. Merge branch 'main' of https://github.com/toy-project-6/toy-6tube int… 

    …o kimjiwon
    @zwonkim
    zwonkim committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    06a5b23 View commit details
    Browse the repository at this point in the history

  10. add readme

    @zwonkim
    zwonkim committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    ab6b64f View commit details
    Browse the repository at this point in the history

  11. Merge pull request #34 from toy-project-6/kimjiwon 

    add readme
    @zwonkim
    zwonkim authored Jan 21, 2023
    Configuration menu
    Copy the full SHA
    a85fe89 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'main' of https://github.com/toy-project-6/toy-6tube int… 

    …o kanghyeonju
    @iziz9
    iziz9 committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    c5e5a2e View commit details
    Browse the repository at this point in the history

  13. 📝 Update README.md

    @iziz9
    iziz9 committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    5551e8f View commit details
    Browse the repository at this point in the history

  14. Merge pull request #35 from toy-project-6/kanghyeonju 

    Update readme.md
    @iziz9
    iziz9 authored Jan 21, 2023
    Configuration menu
    Copy the full SHA
    2269f4c View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2023

  1. edit styling

    @zwonkim
    zwonkim committed Jan 22, 2023
    Configuration menu
    Copy the full SHA
    f03657e View commit details
    Browse the repository at this point in the history

  2. fix the conflict

    @zwonkim
    zwonkim committed Jan 22, 2023
    Configuration menu
    Copy the full SHA
    b6b85fd View commit details
    Browse the repository at this point in the history

  3. Merge pull request #36 from toy-project-6/kimjiwon 

    edit styling
    @zwonkim
    zwonkim authored Jan 22, 2023
    Configuration menu
    Copy the full SHA
    85cc34f View commit details
    Browse the repository at this point in the history

  4. 📝 Update: Readme.md

    @iziz9
    iziz9 committed Jan 22, 2023
    Configuration menu
    Copy the full SHA
    30ef68a View commit details
    Browse the repository at this point in the history