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

Testing #9

Open
wants to merge 51 commits into
base: master
Choose a base branch
from
Open

Testing #9

wants to merge 51 commits into from

Commits on Jun 26, 2020

  1. se agregro archivo readme.md en src

    @maragastanaduy
    maragastanaduy committed Jun 26, 2020
    Configuration menu
    Copy the full SHA
    247fb42 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from maragastanaduy/master 

    se agregro archivo readme.md en src
    @nsquezadam
    nsquezadam authored Jun 26, 2020
    Configuration menu
    Copy the full SHA
    0d9ac99 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2020

  1. Se actualiza Readme.md se incorporan imagenes nuevas

    @nsquezadam
    nsquezadam committed Jun 28, 2020
    Configuration menu
    Copy the full SHA
    85ecb3e View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2020

  1. Se estructura HTML y se agrega html de data

    @nsquezadam
    nsquezadam committed Jul 3, 2020
    Configuration menu
    Copy the full SHA
    ec905a9 View commit details
    Browse the repository at this point in the history

  2. background image add to src

    @maragastanaduy
    maragastanaduy committed Jul 3, 2020
    Configuration menu
    Copy the full SHA
    949dafc View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2 from maragastanaduy/master 

    background image add to src
    @nsquezadam
    nsquezadam authored Jul 3, 2020
    Configuration menu
    Copy the full SHA
    88c6b3e View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2020

  1. Modificacion de data, imagenes

    @liaramosg
    liaramosg committed Jul 4, 2020
    Configuration menu
    Copy the full SHA
    7d976d5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3 from liaramosg/master 

    Modificacion de data, imagenes
    @nsquezadam
    nsquezadam authored Jul 4, 2020
    Configuration menu
    Copy the full SHA
    7686e6e View commit details
    Browse the repository at this point in the history

  3. background image full size

    @maragastanaduy
    maragastanaduy committed Jul 4, 2020
    Configuration menu
    Copy the full SHA
    a7c1688 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #4 from maragastanaduy/master 

    background image full size
    @nsquezadam
    nsquezadam authored Jul 4, 2020
    Configuration menu
    Copy the full SHA
    e2ae10d View commit details
    Browse the repository at this point in the history

  5. actualizacion

    @nsquezadam
    nsquezadam committed Jul 4, 2020
    Configuration menu
    Copy the full SHA
    558e07b View commit details
    Browse the repository at this point in the history

  6. actualizacion other images

    @nsquezadam
    nsquezadam committed Jul 4, 2020
    Configuration menu
    Copy the full SHA
    e3d0f05 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2020

  1. testing landing page, html and css

    @maragastanaduy
    maragastanaduy committed Jul 6, 2020
    Configuration menu
    Copy the full SHA
    fbf3875 View commit details
    Browse the repository at this point in the history

  2. Fixed Menu bar, y tab configuration

    @liaramosg
    liaramosg committed Jul 6, 2020
    Configuration menu
    Copy the full SHA
    ce28d3c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into master

    @nsquezadam
    nsquezadam authored Jul 6, 2020
    Configuration menu
    Copy the full SHA
    fe1f635 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #6 from liaramosg/master 

    Fixed Menu bar, y tab configuration
    @nsquezadam
    nsquezadam authored Jul 6, 2020
    Configuration menu
    Copy the full SHA
    ad9f6cc View commit details
    Browse the repository at this point in the history

  5. actualizacion

    @nsquezadam
    nsquezadam committed Jul 6, 2020
    Configuration menu
    Copy the full SHA
    a5bc276 View commit details
    Browse the repository at this point in the history

  6. update landing page corrections

    @maragastanaduy
    maragastanaduy committed Jul 6, 2020
    Configuration menu
    Copy the full SHA
    73f5534 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #7 from maragastanaduy/master 

    update landing page corrections h1
    @nsquezadam
    nsquezadam authored Jul 6, 2020
    Configuration menu
    Copy the full SHA
    fb7e3ea View commit details
    Browse the repository at this point in the history

  8. actualizacion

    @nsquezadam
    nsquezadam committed Jul 6, 2020
    Configuration menu
    Copy the full SHA
    e44a4ad View commit details
    Browse the repository at this point in the history

  9. actualizacion

    @nsquezadam
    nsquezadam committed Jul 6, 2020
    Configuration menu
    Copy the full SHA
    556a13f View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2020

  1. readme update

    @maragastanaduy
    maragastanaduy committed Jul 7, 2020
    Configuration menu
    Copy the full SHA
    a8badca View commit details
    Browse the repository at this point in the history

  2. actualizacion

    @nsquezadam
    nsquezadam committed Jul 7, 2020
    Configuration menu
    Copy the full SHA
    c6f854d View commit details
    Browse the repository at this point in the history

  3. readme update

    @maragastanaduy
    maragastanaduy committed Jul 7, 2020
    Configuration menu
    Copy the full SHA
    7593e24 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #8 from maragastanaduy/master 

    update readme
    @nsquezadam
    nsquezadam authored Jul 7, 2020
    Configuration menu
    Copy the full SHA
    6d8a3c7 View commit details
    Browse the repository at this point in the history

  5. actualizacion

    @nsquezadam
    nsquezadam committed Jul 7, 2020
    Configuration menu
    Copy the full SHA
    fad061f View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2020

  1. Se realiza barra de menu fija y scroll pagina principal

    @nsquezadam
    nsquezadam committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    47fc4df View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2020

  1. se actualiza js con funcion data

    @nsquezadam
    nsquezadam committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    6ae0fd2 View commit details
    Browse the repository at this point in the history

  2. aModificacion pokepedia .html , avance cod js

    @nsquezadam
    nsquezadam committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    b8f551e View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2020

  1. se realiza primera funcion y se realiza test correspondiente

    @nsquezadam
    nsquezadam committed Jul 10, 2020
    Configuration menu
    Copy the full SHA
    3091063 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2020

  1. Actualizacion

    @nsquezadam
    nsquezadam committed Jul 11, 2020
    Configuration menu
    Copy the full SHA
    04ea964 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2020

  1. actualizacion

    @nsquezadam
    nsquezadam committed Jul 12, 2020
    Configuration menu
    Copy the full SHA
    f704c0e View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2020

  1. actualizacion

    @nsquezadam
    nsquezadam committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    9bcb9c4 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2020

  1. Se corrigen errores slint y sintaxis se completa codigo actualizacion… 

    … readme"
    @nsquezadam
    nsquezadam committed Jul 16, 2020
    Configuration menu
    Copy the full SHA
    9cb757f View commit details
    Browse the repository at this point in the history

  2. actualizacion metodo filter

    @nsquezadam
    nsquezadam committed Jul 16, 2020
    Configuration menu
    Copy the full SHA
    9740175 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2020

  1. actualizacion arreglo filtrado

    @nsquezadam
    nsquezadam committed Jul 17, 2020
    Configuration menu
    Copy the full SHA
    0110004 View commit details
    Browse the repository at this point in the history

  2. nueva actualizacion

    @nsquezadam
    nsquezadam committed Jul 17, 2020
    Configuration menu
    Copy the full SHA
    28612d2 View commit details
    Browse the repository at this point in the history

  3. cambios

    @maragastanaduy
    maragastanaduy committed Jul 17, 2020
    Configuration menu
    Copy the full SHA
    6e2580c View commit details
    Browse the repository at this point in the history

  4. Merge pull request #9 from maragastanaduy/master 

    cambios
    @nsquezadam
    nsquezadam authored Jul 17, 2020
    Configuration menu
    Copy the full SHA
    1121e9d View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2020

  1. se incluye 2 testing pass 35%

    @nsquezadam
    nsquezadam committed Jul 18, 2020
    Configuration menu
    Copy the full SHA
    98da56b View commit details
    Browse the repository at this point in the history

  2. cambio css y html

    @nsquezadam
    nsquezadam committed Jul 18, 2020
    Configuration menu
    Copy the full SHA
    99fc091 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2020

  1. actualizacion

    @nsquezadam
    nsquezadam committed Jul 19, 2020
    Configuration menu
    Copy the full SHA
    398d795 View commit details
    Browse the repository at this point in the history

  2. actualizaciacion

    @nsquezadam
    nsquezadam committed Jul 19, 2020
    Configuration menu
    Copy the full SHA
    744c6da View commit details
    Browse the repository at this point in the history

  3. Se agregan nuevos test y detalles al css y html

    @liaramosg
    liaramosg committed Jul 19, 2020
    Configuration menu
    Copy the full SHA
    464b7c6 View commit details
    Browse the repository at this point in the history

  4. Se agrgan test faltantes e imagen de tarjetas

    @liaramosg
    liaramosg committed Jul 19, 2020
    Configuration menu
    Copy the full SHA
    44f35ea View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into master

    @liaramosg
    liaramosg authored Jul 19, 2020
    Configuration menu
    Copy the full SHA
    12d547a View commit details
    Browse the repository at this point in the history

  6. Merge pull request #10 from liaramosg/master 

    Se agregan nuevos test y detalles al css y html
    @nsquezadam
    nsquezadam authored Jul 19, 2020
    Configuration menu
    Copy the full SHA
    4608c20 View commit details
    Browse the repository at this point in the history

  7. edicion readme

    @maragastanaduy
    maragastanaduy committed Jul 19, 2020
    Configuration menu
    Copy the full SHA
    3f3f24c View commit details
    Browse the repository at this point in the history

  8. Merge pull request #11 from maragastanaduy/master 

    edicion readme
    @nsquezadam
    nsquezadam authored Jul 19, 2020
    Configuration menu
    Copy the full SHA
    10ab05a View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2020

  1. se sube readme

    @nsquezadam
    nsquezadam committed Jul 22, 2020
    Configuration menu
    Copy the full SHA
    dcb292b View commit details
    Browse the repository at this point in the history

  2. actualiazacion

    @nsquezadam
    nsquezadam committed Jul 22, 2020
    Configuration menu
    Copy the full SHA
    5c2728d View commit details
    Browse the repository at this point in the history