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

Version Final #51

Merged
merged 16 commits into from
Mar 11, 2024
Merged

Version Final #51

merged 16 commits into from
Mar 11, 2024

Commits on Mar 9, 2024

  1. Closes #30

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

  2. Merge pull request #48 from SalesianosZaragoza/devGR 

    Dev gr
    @GemmaRubioJ
    GemmaRubioJ committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    866ec30 View commit details
    Browse the repository at this point in the history

  3. Closes #43

    @GemmaRubioJ
    GemmaRubioJ committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    4bf72a8 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #49 from SalesianosZaragoza/devGR 

    Closes #43
    @GemmaRubioJ
    GemmaRubioJ committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    abe8d3c View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2024

  1. Sound Bug Fixed + QUIT user controlled

    @ismaelbernadtello
    ismaelbernadtello committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    fddbc2f View commit details
    Browse the repository at this point in the history

  2. Changed audio library to pygame and added to instalacion.py

    @ismaelbernadtello
    ismaelbernadtello committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    cd4f9fd View commit details
    Browse the repository at this point in the history

  3. update username

    @GemmaRubioJ
    GemmaRubioJ committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    a6954ed View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dev' into devGR

    @GemmaRubioJ
    GemmaRubioJ committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    cd3b53b View commit details
    Browse the repository at this point in the history

  5. Merge pull request #50 from SalesianosZaragoza/devGR 

    update username
    @GemmaRubioJ
    GemmaRubioJ committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    d2adbd1 View commit details
    Browse the repository at this point in the history

  6. Nuevo audio añadido para whisper

    @ismaelbernadtello
    ismaelbernadtello committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    1d1cc61 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'dev' of https://github.com/SalesianosZaragoza/chat-chatjdt 

     into dev
    @ismaelbernadtello
    ismaelbernadtello committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    286174c View commit details
    Browse the repository at this point in the history

  8. Eliminados archivos basura

    @ismaelbernadtello
    ismaelbernadtello committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    892b57e View commit details
    Browse the repository at this point in the history

  9. Comentarios/documentacion sobre el código añadidos 

    Co-authored-by: Ismael Bernad <bernad.teism20@zaragoza.salesianos.edu>
Co-authored-by: Jesus Montero <montero.kijes20@zaragoza.salesianos.edu>
Co-authored-by: Ismael Abed <abed.coism20@zaragoza.salesianos.edu>
Co-authored-by: Gemma Rubio <gemi.816@gmail.com>
Co-authored-by: Alexander Fuela <fuela.caale23@zaragoza.salesianos.edu>
Co-authored-by: Cristian LÓPEZ <lopez.socri22@zaragoza.salesianos.edu>
    @ismaelbernadtello @jesusmonteroking
    @IamIsmaelDev @GemmaRubioJ @alex55fc @Trainsick
    6 people committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    69b3f03 View commit details
    Browse the repository at this point in the history

  10. Actualización README.md 

    Co-authored-by: Ismael Bernad <bernad.teism20@zaragoza.salesianos.edu>
Co-authored-by: Jesus Montero <montero.kijes20@zaragoza.salesianos.edu>
Co-authored-by: Ismael Abed <abed.coism20@zaragoza.salesianos.edu>
Co-authored-by: Gemma Rubio <gemi.816@gmail.com>
Co-authored-by: Alexander Fuela <fuela.caale23@zaragoza.salesianos.edu>
Co-authored-by: Cristian LÓPEZ <lopez.socri22@zaragoza.salesianos.edu>
    @GemmaRubioJ
    GemmaRubioJ committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    5892a8b View commit details
    Browse the repository at this point in the history

  11. Update README.md 

    Co-authored-by: Ismael Bernad <bernad.teism20@zaragoza.salesianos.edu>
Co-authored-by: Jesus Montero <montero.kijes20@zaragoza.salesianos.edu>
Co-authored-by: Ismael Abed <abed.coism20@zaragoza.salesianos.edu>
Co-authored-by: Gemma Rubio <gemi.816@gmail.com>
Co-authored-by: Alexander Fuela <fuela.caale23@zaragoza.salesianos.edu>
Co-authored-by: Cristian LÓPEZ <lopez.socri22@zaragoza.salesianos.edu>
    @ismaelbernadtello @jesusmonteroking
    @IamIsmaelDev @GemmaRubioJ @alex55fc @Trainsick
    6 people committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    66ba227 View commit details
    Browse the repository at this point in the history

  12. Create LICENSE

    @ismaelbernadtello
    ismaelbernadtello committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    5c9d3bf View commit details
    Browse the repository at this point in the history