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

Dev into Main #80

Merged
merged 34 commits into from
Nov 3, 2024
Merged

Dev into Main #80

merged 34 commits into from
Nov 3, 2024

Commits on Oct 9, 2024

  1. button add members ok, searchbar from component and cards ok

    @AlexandreRichert
    AlexandreRichert committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    538a909 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. translation and fix

    @AlexandreRichert
    AlexandreRichert committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    2227e7c View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2024

  1. Merge branch 'dev' of https://github.com/WildCodeSchool/2023-11-wns-b… 

    …leu-g2 into update-query-channel
    @AlexandreRichert
    AlexandreRichert committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    e94816b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'fix-navbar' of https://github.com/WildCodeSchool/2023-1… 

    …1-wns-bleu-g2 into update-query-channel
    @AlexandreRichert
    AlexandreRichert committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    ab1b5f8 View commit details
    Browse the repository at this point in the history

  3. add dark mode config for background, card and group page

    @Jasminegrz
    Jasminegrz committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    ec2dce3 View commit details
    Browse the repository at this point in the history

  4. added dark mode on home page

    @Jasminegrz
    Jasminegrz committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    b68958b View commit details
    Browse the repository at this point in the history

  5. dark mode added to toast

    @Jasminegrz
    Jasminegrz committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    eed90b2 View commit details
    Browse the repository at this point in the history

  6. dark mode added to alert

    @Jasminegrz
    Jasminegrz committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    c19e69d View commit details
    Browse the repository at this point in the history

  7. translation added on footer

    @Jasminegrz
    Jasminegrz committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    869450f View commit details
    Browse the repository at this point in the history

  8. translation added to about section

    @Jasminegrz
    Jasminegrz committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    537d18f View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2024

  1. disabled home buttons when connected

    @AlexandreRichert
    AlexandreRichert committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    16f1967 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2024

  1. Merge branch 'dev' of github.com:WildCodeSchool/2023-11-wns-bleu-g2 i… 

    …nto FE-dark-mode
    @Jasminegrz
    Jasminegrz committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    695e924 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. Merge branch 'dev' of https://github.com/WildCodeSchool/2023-11-wns-b… 

    …leu-g2 into update-query-channel
    @AlexandreRichert
    AlexandreRichert committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    2796ae3 View commit details
    Browse the repository at this point in the history

  2. create channel if a new member is added

    @AlexandreRichert
    AlexandreRichert committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    edb1e67 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

  1. added dark mode on nav bar

    @Jasminegrz
    Jasminegrz committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    a86b779 View commit details
    Browse the repository at this point in the history

  2. added dark mode on add members modal

    @Jasminegrz
    Jasminegrz committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    b0f1217 View commit details
    Browse the repository at this point in the history

  3. update to reset db file

    @Jasminegrz
    Jasminegrz committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    9062165 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2024

  1. Merge branch 'dev' of https://github.com/WildCodeSchool/2023-11-wns-b… 

    …leu-g2 into update-query-channel
    @AlexandreRichert
    AlexandreRichert committed Oct 26, 2024
    Configuration menu
    Copy the full SHA
    5dec9a4 View commit details
    Browse the repository at this point in the history

  2. conflict managing

    @AlexandreRichert
    AlexandreRichert committed Oct 26, 2024
    Configuration menu
    Copy the full SHA
    0646dd3 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #71 from WildCodeSchool/update-query-channel 

    Update query channel
    @AlexandreRichert
    AlexandreRichert authored Oct 26, 2024
    Configuration menu
    Copy the full SHA
    d511bcd View commit details
    Browse the repository at this point in the history

  4. test DevCard added

    @AlexandreRichert
    AlexandreRichert committed Oct 26, 2024
    Configuration menu
    Copy the full SHA
    1112244 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2024

  1. fix schema

    @AlexandreRichert
    AlexandreRichert committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    91d54da View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2024

  1. Merge branch 'update-query-channel' of github.com:WildCodeSchool/2023… 

    …-11-wns-bleu-g2 into update-query-channel
    @Fangornito
    Fangornito committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    46f1bbc View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2024

  1. Merge pull request #72 from WildCodeSchool/update-to-resetDb 

    update to reset db file
    @Jasminegrz
    Jasminegrz authored Oct 29, 2024
    Configuration menu
    Copy the full SHA
    8b0964a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of github.com:WildCodeSchool/2023-11-wns-bleu-g2 i… 

    …nto FE-dark-mode
    @Jasminegrz
    Jasminegrz committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    8cafe48 View commit details
    Browse the repository at this point in the history

  3. added dark mode to channel and chat

    @Jasminegrz
    Jasminegrz committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    39b6de0 View commit details
    Browse the repository at this point in the history

  4. fix color avatar and sign-in button

    @Jasminegrz
    Jasminegrz committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    8505d01 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2024

  1. delete the unused request and remove excess spaces

    @Jasminegrz
    Jasminegrz committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    3f5ae5c View commit details
    Browse the repository at this point in the history

  2. update to schema

    @Jasminegrz
    Jasminegrz committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    96bb26d View commit details
    Browse the repository at this point in the history

  3. Merge pull request #69 from WildCodeSchool/FE-dark-mode 

    Fe dark mode
    @Jasminegrz
    Jasminegrz authored Nov 3, 2024
    Configuration menu
    Copy the full SHA
    461993c View commit details
    Browse the repository at this point in the history

  4. Merge pull request #79 from WildCodeSchool/Fix-member-resolver 

    delete the unused request and remove excess spaces
    @Jasminegrz
    Jasminegrz authored Nov 3, 2024
    Configuration menu
    Copy the full SHA
    f2d11da View commit details
    Browse the repository at this point in the history

  5. Merge pull request #77 from WildCodeSchool/addUnitTest 

    test DevCard added
    @Jasminegrz
    Jasminegrz authored Nov 3, 2024
    Configuration menu
    Copy the full SHA
    0428d61 View commit details
    Browse the repository at this point in the history

  6. Revert "test DevCard added"

    @Jasminegrz
    Jasminegrz authored Nov 3, 2024
    Configuration menu
    Copy the full SHA
    ae5f8e8 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #81 from WildCodeSchool/revert-77-addUnitTest 

    Revert "test DevCard added"
    @Jasminegrz
    Jasminegrz authored Nov 3, 2024
    Configuration menu
    Copy the full SHA
    0a128f3 View commit details
    Browse the repository at this point in the history