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.

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

Feedback #1

Open
wants to merge 86 commits into
base: feedback
Choose a base branch
from
Open

Feedback #1

wants to merge 86 commits into from

Commits on Dec 19, 2023

  1. Configuration menu
    Copy the full SHA
    2b39c64 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8f9899e View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2024

  1. Archivos iniciales

    alex55fc committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    afee135 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #6 from SalesianosZaragoza/main

    Archivos iniciales
    ismaelbernadtello committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    5416294 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ebea1dc View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    dc2b0d9 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    8800d85 View commit details
    Browse the repository at this point in the history
  6. #4 y #7 Unidos

    ismaelbernadtello committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    64eb1e5 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #8 from SalesianosZaragoza/dev

    Dev Estable V1.0
    ismaelbernadtello committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    bab95c2 View commit details
    Browse the repository at this point in the history
  8. #5 Empezado

    ismaelbernadtello committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    22c9369 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2024

  1. Update README.md

    Como funcionar con las ramas
    Trainsick committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    9334239 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2024

  1. Merge branch 'main' into dev

    alex55fc committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    edabd4c View commit details
    Browse the repository at this point in the history
  2. Modificacion del Readme

    alex55fc committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    c09d679 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2024

  1. Configuration menu
    Copy the full SHA
    9cd509f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d972d0f View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2024

  1. Configuration menu
    Copy the full SHA
    42bc42d View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2024

  1. No funcional, solo una prueba

    El commit es unicamente para poder cambiarme de rama
    alex55fc committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    480f537 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3a372d5 View commit details
    Browse the repository at this point in the history
  3. WIP #11

    ismaelbernadtello committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    2b08e01 View commit details
    Browse the repository at this point in the history
  4. closes #10

    GemmaRubioJ committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    b8aaea4 View commit details
    Browse the repository at this point in the history
  5. WIP #11

    Creacion de hilos con la llamada al método admitirComandos
    ismaelbernadtello committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    b6ac2e4 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    86a11d9 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2024

  1. Configuration menu
    Copy the full SHA
    28d4d14 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2024

  1. Merge branch 'devGR' into dev

    # Conflicts:
    #	echo-server.py
    GemmaRubioJ committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    46232d7 View commit details
    Browse the repository at this point in the history
  2. codigo revisado y estable

    GemmaRubioJ committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    9438a2a View commit details
    Browse the repository at this point in the history
  3. Merge branch 'devGR' into dev

    # Conflicts:
    #	echo-server.py
    GemmaRubioJ committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    061bf38 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'dev'

    ismaelbernadtello committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    b8d2567 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    67ded06 View commit details
    Browse the repository at this point in the history
  6. metodo Create corregido

    GemmaRubioJ committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    8921230 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. Update README.md

    ismaelbernadtello committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    709c9a8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    da47a2e View commit details
    Browse the repository at this point in the history
  3. Closes #13

    Rediseño y directrices clarificadas para el flujo
    de trabajo en el archivo README.md
    
    Co-authored-by: IsmaelAbedCogollor <Abed.coism20@zaragoza.salesianos.edu>
    Co-authored-by: IsmaelBernadTello <Bernad.teism20@zaragoza.salesianos.edu>
    IamIsmaelDev and ismaelbernadtello committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    3f2c2c2 View commit details
    Browse the repository at this point in the history
  4. Corrección la nota "Pasos para subir cambios

    después de trabajar"
    
    Co-authored-by: IsmaelAbedCogollor <Abed.coism20@zaragoza.salesianos.edu>
    Co-authored-by: IsmaelBernadTello <Bernad.teism20@zaragoza.salesianos.edu>
    IamIsmaelDev and ismaelbernadtello committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    6d19433 View commit details
    Browse the repository at this point in the history
  5. Perfeccionando Readme.md

    Co-authored-by: IsmaelAbedCogollor <Abed.coism20@zaragoza.salesianos.edu>
    Co-authored-by: IsmaelBernadTello <Bernad.teism20@zaragoza.salesianos.edu>
    IamIsmaelDev and ismaelbernadtello committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    1d78dc5 View commit details
    Browse the repository at this point in the history
  6. Perfeccionamiento

    IamIsmaelDev committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    4bafe64 View commit details
    Browse the repository at this point in the history
  7. Perfeccionamiento

    IamIsmaelDev committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    1afbd21 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #14 from SalesianosZaragoza/dev_IAC

    Refinamiento del README
    ismaelbernadtello committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    5a5ea29 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2024

  1. Configuration menu
    Copy the full SHA
    f67aa5a View commit details
    Browse the repository at this point in the history
  2. Merge pull request #16 from SalesianosZaragoza/dev_IBT

    Closes #15 - Codigo formateado correctamente
    ismaelbernadtello committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    0ad339b View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2024

  1. Merge pull request #17 from SalesianosZaragoza/dev

    Merge dev with main
    ismaelbernadtello committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    c9af980 View commit details
    Browse the repository at this point in the history
  2. WIP #18

    Co-authored-by: <IsmaelBernadTello> <bernad.teism20@zaragoza.salesianos.edu>
    Co-authored-by: <IsmaelAbedCogollor> <abed.coism20@zaragoza.salesianos.edu>
    ismaelbernadtello and IamIsmaelDev committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    c007cc0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b3a138f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    17b72f9 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2024

  1. Closes #21

    GemmaRubioJ committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    de878c7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8b5fde4 View commit details
    Browse the repository at this point in the history
  3. Closes #23

    GemmaRubioJ committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    7d33a15 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    99d3321 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2024

  1. Closes #25

    GemmaRubioJ committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    db37974 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    93697c0 View commit details
    Browse the repository at this point in the history
  3. Closes 26 Co-authored-by: Ismael Bernad Tello <ismaelbernadtello@gmai…

    …l.com>
    
    Co-authored-by: Ismael Abed <abed.coism20@zaragoza.salesianos.edu>
    GemmaRubioJ committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    f0818a8 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4866724 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b96b8d7 View commit details
    Browse the repository at this point in the history
  6. Closes #35

    Co-authored-by: Ismael Bernad <bernad.teism20@zaragoza.salesianos.edu>
    Co-authored-by: Ismael Abed <abed.coism20@zaragoza.salesianos.edu>
    ismaelbernadtello and IamIsmaelDev committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    a737375 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2024

  1. Closes#37 - Solucionado bug join

    Co-authored-by: Ismael Bernad <bernad.teism20@zaragoza.salesianos.edu>
    Co-authored-by: Jesus Montero <montero.kijes20@zaragoza.salesianos.edu>
    ismaelbernadtello and jesusmonteroking committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    0d91b7a View commit details
    Browse the repository at this point in the history
  2. Closes #36 - Añadido comando /HELP

    Arreglado output al usar /QUIT y que no exista el canal
    
    Co-authored-by: Ismael Bernad <bernad.teism20@zaragoza.salesianos.edu>
    Co-authored-by: Jesus Montero <montero.kijes20@zaragoza.salesianos.edu>
    ismaelbernadtello and jesusmonteroking committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    7a7e009 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    55bfec3 View commit details
    Browse the repository at this point in the history
  4. Closes #39

    Co-authored-by: Ismael Bernad <bernad.teism20@zaragoza.salesianos.edu>
    Co-authored-by: Jesus Montero <montero.kijes20@zaragoza.salesianos.edu>
    3 people committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    a178445 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    3756580 View commit details
    Browse the repository at this point in the history
  6. Closes #29

    Lo he hecho yo solito, ismael me ha supervisado
    Co-authored-by: Jesus Montero <montero.kijes20@zaragoza.salesianos.edu>
    Co-authored-by: Ismael Bernad <bernad.teism20@zaragoza.salesianos.edu>
    jesusmonteroking committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    347a9c6 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    3b20e20 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    b3471f4 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    b267f5e View commit details
    Browse the repository at this point in the history
  10. Merge pull request #44 from SalesianosZaragoza/dev_IBT

    Closes #31 - Se agrega notificacion de sonido al recibir un mensaje o…
    ismaelbernadtello committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    678f972 View commit details
    Browse the repository at this point in the history
  11. Closes #34

    ismaelbernadtello committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    e2e5a68 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    95167ea View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    6dd7121 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2024

  1. Closes 43

    GemmaRubioJ committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    eaeb91b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ae594e4 View commit details
    Browse the repository at this point in the history
  3. Closes #30

    GemmaRubioJ committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    b9ba9de View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    866ec30 View commit details
    Browse the repository at this point in the history
  5. Closes #43

    GemmaRubioJ committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    4bf72a8 View commit details
    Browse the repository at this point in the history
  6. 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. Configuration menu
    Copy the full SHA
    fddbc2f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cd4f9fd View commit details
    Browse the repository at this point in the history
  3. update username

    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. 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 committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    d2adbd1 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    1d1cc61 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    286174c View commit details
    Browse the repository at this point in the history
  8. 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>
    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 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>
    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 committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    78c4d78 View commit details
    Browse the repository at this point in the history
  13. Create LICENSE

    ismaelbernadtello committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    5c9d3bf View commit details
    Browse the repository at this point in the history
  14. Merge pull request #51 from SalesianosZaragoza/dev

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