Skip to content

Filtrado de data #22

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

Open
fiorella-yumi-diaz wants to merge 29 commits into
base: main
Choose a base branch
from
Open

Filtrado de data #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
eeab6ff
Esqueleto de navegador con HTML y CSS
AngieMora1 Mar 12, 2023
41010cd
Merge pull request #1 from AngieMora1/main
fiorella-yumi-diaz Mar 12, 2023
8db0562
Menu responsive con funcionalidad de ventanas
fiorella-yumi-diaz Mar 13, 2023
87c6eea
Visualizacion de la data en el interfaz
fiorella-yumi-diaz Mar 13, 2023
2011d4a
Merge pull request #4 from AngieMora1/main
fiorella-yumi-diaz Mar 13, 2023
2120d52
Cambios HU1 modificacion con CSS de secciones cajas de cada pokemon
AngieMora1 Mar 16, 2023
61a6ba4
Merge pull request #1 from fiorella-yumi/main
fiorella-yumi-diaz Mar 16, 2023
cf544de
Merge pull request #2 from fiorella-yumi/main
fiorella-yumi-diaz Mar 16, 2023
4cd782a
Merge pull request #5 from AngieMora1/angie
fiorella-yumi-diaz Mar 16, 2023
d393f25
modificaciones de css con el data
fiorella-yumi-diaz Mar 16, 2023
d934003
Merge branch 'fiorella' of https://github.com/AngieMora1/DEV005-data-…
fiorella-yumi-diaz Mar 16, 2023
feddbfe
Funcion filtrado en data y main, impresion en consola
AngieMora1 Mar 20, 2023
530e9bb
Merge branch 'angie' of https://github.com/AngieMora1/DEV005-data-lov…
AngieMora1 Mar 20, 2023
206275f
Prueba de data en consola
fiorella-yumi-diaz Mar 20, 2023
c9262f5
Merge pull request #3 from fiorella-yumi/main
fiorella-yumi-diaz Mar 20, 2023
ed53faa
Merge branch 'angie' of https://github.com/AngieMora1/DEV005-data-lov…
fiorella-yumi-diaz Mar 20, 2023
934b58c
Filtrado en la interfaz por tipos
AngieMora1 Mar 20, 2023
35834f4
Resolviendo conflicto
fiorella-yumi-diaz Mar 20, 2023
38515f1
Resolviendo conflictos
AngieMora1 Mar 20, 2023
f60e805
resolviendo conflictos
fiorella-yumi-diaz Mar 20, 2023
2c36f7c
Funcion filtrado por tipos y por generacion
fiorella-yumi-diaz Mar 21, 2023
4a7ce8c
Resolviendo problemas de ramas
AngieMora1 Mar 21, 2023
3ee7c38
Co-authored-by: fiorella-yumi <fiorella-yumi@users.noreply.github.com>
AngieMora1 Mar 21, 2023
dda8f00
Solucion de conflictos de filtrado por generacion y tipo
AngieMora1 Mar 21, 2023
9e4a3ef
Merge branch 'fiorella' into angie
AngieMora1 Mar 21, 2023
cce03a4
Modificacion de las funciones de filtrado y del nav
AngieMora1 Mar 23, 2023
08ef20f
cambio main
AngieMora1 Mar 23, 2023
1d06d6b
Resolviendo conflictos
AngieMora1 Mar 23, 2023
8116e95
Merge branch 'angie' of https://github.com/AngieMora1/DEV005-data-lov…
AngieMora1 Mar 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading