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

Develop to develop G7 merge conflic #499

Merged
merged 94 commits into from
Jun 16, 2023
Merged

Develop to develop G7 merge conflic #499

merged 94 commits into from
Jun 16, 2023

Commits on Jun 8, 2023

  1. Update AddCourse.vue

    @Ptitbapt
    Ptitbapt committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    0d0b03b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'G2-cours-V2' of https://github.com/CodingFactory-Repos/… 

    …Coding-Tools into G2-cours-V2
    @Ptitbapt
    Ptitbapt committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    d3d54a9 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2023

  1. prettier + details addcourse

    @Ptitbapt
    Ptitbapt committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    427503f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop-G2' into G2-cours-V2

    @Ptitbapt
    Ptitbapt committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    d6688b4 View commit details
    Browse the repository at this point in the history

  3. form course -> language suggest

    @ThomasCast3
    ThomasCast3 committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    0a0f8c7 View commit details
    Browse the repository at this point in the history

  4. prettier

    @Ptitbapt
    Ptitbapt committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    07600ea View commit details
    Browse the repository at this point in the history

  5. Merge branch 'G2-cours-V2' of https://github.com/CodingFactory-Repos/… 

    …Coding-Tools into G2-cours-V2
    @ThomasCast3
    ThomasCast3 committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    6ffc2e3 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'G2-cours-V2' of https://github.com/CodingFactory-Repos/… 

    …Coding-Tools into G2-cours-V2
    @ThomasCast3
    ThomasCast3 committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    3c8b347 View commit details
    Browse the repository at this point in the history

  7. Svg Folder + Parts CoursDetails

    @Ptitbapt
    Ptitbapt committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    227fdba View commit details
    Browse the repository at this point in the history

  8. form open houses search suggestion

    @ThomasCast3
    ThomasCast3 committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    404ab00 View commit details
    Browse the repository at this point in the history

  9. Merged 'develop' into 'develop-G8'.

    @github-actions
    github-actions[bot] committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    4b3b502 View commit details
    Browse the repository at this point in the history

  10. Merged 'develop' into 'develop-G8'.

    @github-actions
    github-actions[bot] committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    e6b6213 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'develop' into G2/feature/connection_between_group

    @Ptitbapt
    Ptitbapt committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    f90b4f8 View commit details
    Browse the repository at this point in the history

  12. Update package-lock.json

    @Ptitbapt
    Ptitbapt committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    eaa931c View commit details
    Browse the repository at this point in the history

  13. Merged 'develop' into 'develop-G2'.

    @github-actions
    github-actions[bot] committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    f276bf1 View commit details
    Browse the repository at this point in the history

  14. Merged 'develop' into 'develop-G8'.

    @github-actions
    github-actions[bot] committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    2da00d9 View commit details
    Browse the repository at this point in the history

  15. Merged 'develop' into 'develop-G2'.

    @github-actions
    github-actions[bot] committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    30f77d7 View commit details
    Browse the repository at this point in the history

  16. Merged 'develop' into 'develop-G8'.

    @github-actions
    github-actions[bot] committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    2acef85 View commit details
    Browse the repository at this point in the history

  17. Merged 'develop' into 'develop-G2'.

    @github-actions
    github-actions[bot] committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    0c000a3 View commit details
    Browse the repository at this point in the history

  18. Merged 'develop' into 'develop-G8'.

    @github-actions
    github-actions[bot] committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    dd1939b View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2023

  1. Merged 'develop' into 'develop-G2'.

    @github-actions
    github-actions[bot] committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    04f841d View commit details
    Browse the repository at this point in the history

  2. Merged 'develop' into 'develop-G8'.

    @github-actions
    github-actions[bot] committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    e96fe36 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. Merge branch 'develop-G2' into G2-cours-V2

    @ThomasCast3
    ThomasCast3 committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    ff4d567 View commit details
    Browse the repository at this point in the history

  2. Merged 'develop' into 'develop-G2'.

    @github-actions
    github-actions[bot] committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    ffed9a0 View commit details
    Browse the repository at this point in the history

  3. Merged 'develop' into 'develop-G8'.

    @github-actions
    github-actions[bot] committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    ba01fa0 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into G2/feature/connection_between_group

    @Ptitbapt
    Ptitbapt committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    4ffd68e View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2023

  1. cours

    @Ptitbapt
    Ptitbapt committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    e252de3 View commit details
    Browse the repository at this point in the history

  2. Merged 'develop' into 'develop-G2'.

    @github-actions
    github-actions[bot] committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    696add0 View commit details
    Browse the repository at this point in the history

  3. Merged 'develop' into 'develop-G8'.

    @github-actions
    github-actions[bot] committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    d612bb5 View commit details
    Browse the repository at this point in the history

  4. Merged 'develop' into 'develop-G2'.

    @github-actions
    github-actions[bot] committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    d075795 View commit details
    Browse the repository at this point in the history

  5. Merged 'develop' into 'develop-G8'.

    @github-actions
    github-actions[bot] committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    bdef0f5 View commit details
    Browse the repository at this point in the history

  6. Merged 'develop' into 'develop-G2'.

    @github-actions
    github-actions[bot] committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    004f9e5 View commit details
    Browse the repository at this point in the history

  7. Merged 'develop' into 'develop-G8'.

    @github-actions
    github-actions[bot] committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    7a4d320 View commit details
    Browse the repository at this point in the history

  8. Merged 'develop' into 'develop-G2'.

    @github-actions
    github-actions[bot] committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    9e7e0d0 View commit details
    Browse the repository at this point in the history

  9. Merged 'develop' into 'develop-G8'.

    @github-actions
    github-actions[bot] committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    b6bf837 View commit details
    Browse the repository at this point in the history

  10. Merged 'develop' into 'develop-G2'.

    @github-actions
    github-actions[bot] committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    b70e3e7 View commit details
    Browse the repository at this point in the history

  11. Merged 'develop' into 'develop-G8'.

    @github-actions
    github-actions[bot] committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    1ba0660 View commit details
    Browse the repository at this point in the history

  12. Merged 'develop' into 'develop-G2'.

    @github-actions
    github-actions[bot] committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    748470f View commit details
    Browse the repository at this point in the history

  13. Merged 'develop' into 'develop-G5'.

    @github-actions
    github-actions[bot] committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    c328ff5 View commit details
    Browse the repository at this point in the history

  14. Merged 'develop' into 'develop-G8'.

    @github-actions
    github-actions[bot] committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    1a2d817 View commit details
    Browse the repository at this point in the history

  15. Link JPO with articles && add documents to articles & edit design home

    @TheoLandemaine
    TheoLandemaine committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    9a9fb88 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2023

  1. form cours saved in db + save pdf files

    @ThomasCast3
    ThomasCast3 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    d617e08 View commit details
    Browse the repository at this point in the history

  2. Merged 'develop' into 'develop-G2'.

    @github-actions
    github-actions[bot] committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    74b5583 View commit details
    Browse the repository at this point in the history

  3. Merged 'develop' into 'develop-G5'.

    @github-actions
    github-actions[bot] committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    d703bf1 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop-G2' into G2/feature/linkJPO

    @Loule95450
    Loule95450 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    1b9e4a6 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #485 from CodingFactory-Repos/G2/feature/linkJPO 

    Link JPO with articles && add documents to articles & edit design home
    @Loule95450
    Loule95450 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    87d13cf View commit details
    Browse the repository at this point in the history

  6. Merged 'develop' into 'develop-G2'.

    @github-actions
    github-actions[bot] committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    ed1c64f View commit details
    Browse the repository at this point in the history

  7. Merged 'develop' into 'develop-G5'.

    @github-actions
    github-actions[bot] committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    0574794 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'develop-G2' into G2-cours-V2

    @ThomasCast3
    ThomasCast3 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    c57a5d1 View commit details
    Browse the repository at this point in the history

  9. Merged 'develop' into 'develop-G2'.

    @github-actions
    github-actions[bot] committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    f93fbb9 View commit details
    Browse the repository at this point in the history

  10. Merged 'develop' into 'develop-G5'.

    @github-actions
    github-actions[bot] committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    68cdd84 View commit details
    Browse the repository at this point in the history

  11. CoursDetails

    @Ptitbapt
    Ptitbapt committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    bab52ec View commit details
    Browse the repository at this point in the history

  12. Merge branch 'develop-G2' into G2/feature/connection_between_group

    @Ptitbapt
    Ptitbapt committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    144ce6a View commit details
    Browse the repository at this point in the history

  13. Merged 'develop' into 'develop-G2'.

    @github-actions
    github-actions[bot] committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    fbde794 View commit details
    Browse the repository at this point in the history

  14. Merged 'develop' into 'develop-G5'.

    @github-actions
    github-actions[bot] committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    3f9fea9 View commit details
    Browse the repository at this point in the history

  15. Merged 'develop' into 'develop-G2'.

    @github-actions
    github-actions[bot] committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    55fd4b1 View commit details
    Browse the repository at this point in the history

  16. Merged 'develop' into 'develop-G5'.

    @github-actions
    github-actions[bot] committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    a0f7d7b View commit details
    Browse the repository at this point in the history

  17. Merged 'develop' into 'develop-G8'.

    @github-actions
    github-actions[bot] committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    1762906 View commit details
    Browse the repository at this point in the history

  18. Update Cours.vue

    @Ptitbapt
    Ptitbapt committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    e021da0 View commit details
    Browse the repository at this point in the history

  19. pdf files for course

    @ThomasCast3
    ThomasCast3 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    d886459 View commit details
    Browse the repository at this point in the history

  20. correction ajout form course

    @ThomasCast3
    ThomasCast3 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    f81a516 View commit details
    Browse the repository at this point in the history

  21. Merge branch 'develop' into G2/feature/connection_between_group

    @Ptitbapt
    Ptitbapt committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    b657da1 View commit details
    Browse the repository at this point in the history

  22. Merge branch 'G2-cours-V2' into G2/feature/connection_between_group

    @Ptitbapt
    Ptitbapt committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    a523bf9 View commit details
    Browse the repository at this point in the history

  23. fix(develop): Fix a crash

    @Maghwyn
    Maghwyn committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    d22040f View commit details
    Browse the repository at this point in the history

  24. Merge branch 'develop' into fix/develop-crash

    @Maghwyn
    Maghwyn committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    87dc269 View commit details
    Browse the repository at this point in the history

  25. fix(com): Remove the com

    @Maghwyn
    Maghwyn committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    4bf4e42 View commit details
    Browse the repository at this point in the history

  26. Merge pull request #491 from CodingFactory-Repos/fix/develop-crash 

    fix(develop): Fix a crash
    @AyakorK
    AyakorK committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    39a0c92 View commit details
    Browse the repository at this point in the history

  27. Merged 'develop' into 'develop-G2'.

    @github-actions
    github-actions[bot] committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    f225940 View commit details
    Browse the repository at this point in the history

  28. Merged 'develop' into 'develop-G5'.

    @github-actions
    github-actions[bot] committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    15d8031 View commit details
    Browse the repository at this point in the history

  29. Revert "Merge branch 'G2-cours-V2' into G2/feature/connection_between… 

    …_group"

This reverts commit a523bf9, reversing
changes made to b657da1.
    @Ptitbapt
    Ptitbapt committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    a84c279 View commit details
    Browse the repository at this point in the history

  30. debut ajout pdf

    @ThomasCast3
    ThomasCast3 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    57ea880 View commit details
    Browse the repository at this point in the history

  31. Revert "debut ajout pdf" 

    This reverts commit 57ea880.
    @ThomasCast3
    ThomasCast3 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    8f7dd4f View commit details
    Browse the repository at this point in the history

  32. Revert "Revert "debut ajout pdf"" 

    This reverts commit 8f7dd4f.
    @ThomasCast3
    ThomasCast3 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    285b310 View commit details
    Browse the repository at this point in the history

  33. ajout form cours

    @ThomasCast3
    ThomasCast3 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    1ffaa6e View commit details
    Browse the repository at this point in the history

  34. form cours

    @ThomasCast3
    ThomasCast3 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    7c8e849 View commit details
    Browse the repository at this point in the history

  35. fin form add course

    @ThomasCast3
    ThomasCast3 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    2a1c57d View commit details
    Browse the repository at this point in the history

  36. suggest language

    @ThomasCast3
    ThomasCast3 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    a374a47 View commit details
    Browse the repository at this point in the history

  37. Implement css for the retrospective light and dak mode

    @Kevw94
    Kevw94 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    83269a8 View commit details
    Browse the repository at this point in the history

  38. suggest langue

    @ThomasCast3
    ThomasCast3 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    648f3ef View commit details
    Browse the repository at this point in the history

  39. groupe projects

    @Ptitbapt
    Ptitbapt committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    8e633d8 View commit details
    Browse the repository at this point in the history

  40. Merge branch 'feature/connection_between_group' of https://github.com… 

    …/CodingFactory-Repos/Coding-Tools into G2/feature/connection_between_group
    @Ptitbapt
    Ptitbapt committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    13e3a53 View commit details
    Browse the repository at this point in the history

  41. Merge pull request #492 from CodingFactory-Repos/G8/feature/retroCSS 

    Implement css for the retrospective light and dak mode
    @Loule95450
    Loule95450 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    d894f5e View commit details
    Browse the repository at this point in the history

  42. delete useless import

    @RuKaSuu
    RuKaSuu committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    3e4e189 View commit details
    Browse the repository at this point in the history

  43. Merge branch 'develop' into G2/feature/connection_between_group

    @Ptitbapt
    Ptitbapt committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    54e2148 View commit details
    Browse the repository at this point in the history

  44. Merge branch 'G2/feature/connection_between_group' into develop-G2

    @Ptitbapt
    Ptitbapt committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    880c707 View commit details
    Browse the repository at this point in the history

  45. Merge pull request #494 from CodingFactory-Repos/develop-G5 

    Develop g5
    @Loule95450
    Loule95450 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    31a4752 View commit details
    Browse the repository at this point in the history

  46. Merged 'develop' into 'develop-G2'.

    @github-actions
    github-actions[bot] committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    8d1b960 View commit details
    Browse the repository at this point in the history

  47. Merge pull request #495 from CodingFactory-Repos/develop-G2 

    Develop g2
    @Loule95450
    Loule95450 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    0fc78ee View commit details
    Browse the repository at this point in the history

  48. Merge branch 'develop' into develop-G8

    @Loule95450
    Loule95450 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    fedaf9b View commit details
    Browse the repository at this point in the history

  49. Merge pull request #493 from CodingFactory-Repos/develop-G8 

    Develop g8
    @Loule95450
    Loule95450 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    a6e8a6c View commit details
    Browse the repository at this point in the history

  50. possible fix of the white page error

    @Maghwyn
    Maghwyn committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    71c0357 View commit details
    Browse the repository at this point in the history

  51. Merge branch 'develop' into fix/whitescreen-question

    @Maghwyn
    Maghwyn committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    7986665 View commit details
    Browse the repository at this point in the history

  52. Merge pull request #498 from CodingFactory-Repos/fix/whitescreen-ques… 

    …tion

possible fix of the white page error
    @Loule95450
    Loule95450 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    ded6694 View commit details
    Browse the repository at this point in the history

  53. Merge branch 'develop-G7' into develop

    @Loule95450
    Loule95450 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    8595150 View commit details
    Browse the repository at this point in the history