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 #12

Open
wants to merge 23 commits into
base: dev_dani
Choose a base branch
from
Open

Dev #12

wants to merge 23 commits into from

Commits on May 10, 2021

  1. Merge pull request #4 from Matrics-App/dev 

    Merge DEV -> Xavi || #SPRINT2
    @Xavi-PL
    Xavi-PL authored May 10, 2021
    Configuration menu
    Copy the full SHA
    c1ef351 View commit details
    Browse the repository at this point in the history

  2. ADDED: Align-Right formularios de requisitos, semaforo gris

    @Xavi-PL
    Xavi-PL committed May 10, 2021
    Configuration menu
    Copy the full SHA
    287db51 View commit details
    Browse the repository at this point in the history

  3. FIXED: Modal subir ficheros

    @Xavi-PL
    Xavi-PL committed May 10, 2021
    Configuration menu
    Copy the full SHA
    8594167 View commit details
    Browse the repository at this point in the history

  4. Nuevo aspecto modal subir ficheros

    @Xavi-PL
    Xavi-PL committed May 10, 2021
    Configuration menu
    Copy the full SHA
    63a296b View commit details
    Browse the repository at this point in the history

  5. Mas bonito todo :D

    @Xavi-PL
    Xavi-PL committed May 10, 2021
    Configuration menu
    Copy the full SHA
    3bac716 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2021

  1. Prueba camara

    @Xavi-PL
    Xavi-PL committed May 11, 2021
    Configuration menu
    Copy the full SHA
    cc88c32 View commit details
    Browse the repository at this point in the history

  2. reqPhoto + reqGallery

    @Xavi-PL
    Xavi-PL committed May 11, 2021
    Configuration menu
    Copy the full SHA
    ea5bfaa View commit details
    Browse the repository at this point in the history

  3. Merge pull request #7 from Matrics-App/dev 

    Getting from Dev
    @MarcMerino
    MarcMerino authored May 11, 2021
    Configuration menu
    Copy the full SHA
    157c869 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #8 from Matrics-App/dev 

    Dev
    @MarcMerino
    MarcMerino authored May 11, 2021
    Configuration menu
    Copy the full SHA
    a0298b8 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'dev_xavi' into dev

    @MarcMerino
    MarcMerino authored May 11, 2021
    Configuration menu
    Copy the full SHA
    8b5e5d6 View commit details
    Browse the repository at this point in the history

  6. Fixed some merge issues

    @MarcMerino
    MarcMerino committed May 11, 2021
    Configuration menu
    Copy the full SHA
    364597a View commit details
    Browse the repository at this point in the history

  7. Merge pull request #11 from Matrics-App/dev_marc 

    Dev marc
    @MarcMerino
    MarcMerino authored May 11, 2021
    Configuration menu
    Copy the full SHA
    037b65e View commit details
    Browse the repository at this point in the history

  8. Merge pull request #13 from Matrics-App/dev 

    Dev
    @MarcMerino
    MarcMerino authored May 11, 2021
    Configuration menu
    Copy the full SHA
    a198c4c View commit details
    Browse the repository at this point in the history

Commits on May 12, 2021

  1. login con API

    @gerser2000
    gerser2000 committed May 12, 2021
    Configuration menu
    Copy the full SHA
    d4f08fc View commit details
    Browse the repository at this point in the history

  2. login con api

    @gerser2000
    gerser2000 committed May 12, 2021
    Configuration menu
    Copy the full SHA
    c023631 View commit details
    Browse the repository at this point in the history

  3. fail arreglado

    @gerser2000
    gerser2000 committed May 12, 2021
    Configuration menu
    Copy the full SHA
    ae620cc View commit details
    Browse the repository at this point in the history

  4. datos de usuario con api

    @gerser2000
    gerser2000 committed May 12, 2021
    Configuration menu
    Copy the full SHA
    42afdcf View commit details
    Browse the repository at this point in the history

  5. Merge pull request #14 from Matrics-App/dev 

    Dev
    @MarcMerino
    MarcMerino authored May 12, 2021
    Configuration menu
    Copy the full SHA
    bc86a79 View commit details
    Browse the repository at this point in the history

  6. Designing modal for Login Helper

    @MarcMerino
    MarcMerino committed May 12, 2021
    Configuration menu
    Copy the full SHA
    ed6f777 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'dev_marc' of https://github.com/Matrics-App/app into de… 

    …v_marc
    @MarcMerino
    MarcMerino committed May 12, 2021
    Configuration menu
    Copy the full SHA
    3561bdf View commit details
    Browse the repository at this point in the history

Commits on May 13, 2021

  1. Finished design of Login Helper

    @MarcMerino
    MarcMerino committed May 13, 2021
    Configuration menu
    Copy the full SHA
    c408a35 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #15 from Matrics-App/dev_marc 

    Dev marc
    @MarcMerino
    MarcMerino authored May 13, 2021
    Configuration menu
    Copy the full SHA
    daf2545 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2021

  1. Merge pull request #18 from AWS2/dev_gerard 

    Dev gerard
    @gerser2000
    gerser2000 authored May 14, 2021
    Configuration menu
    Copy the full SHA
    46a6b7a View commit details
    Browse the repository at this point in the history