Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
432f901
Cambiando title
IndiraPe Mar 7, 2023
a366434
cambia de texto en index.html
IndiraPe Mar 7, 2023
85c3adf
Merge pull request #1 from IndiraPe/feature-initial
marielfico Mar 7, 2023
e649956
agrega mensajes para la usuaria
marielfico Mar 7, 2023
4c00737
Merge pull request #2 from marielfico/feature2
IndiraPe Mar 7, 2023
4ea09cc
agrega bienvenida y top
marielfico Mar 8, 2023
13aa44f
Merge pull request #3 from marielfico/feature3
IndiraPe Mar 8, 2023
298a6f0
sube cambios en nav, footer y backgound
IndiraPe Mar 8, 2023
72ea3d0
Merge branch 'main' into feature-initial
IndiraPe Mar 8, 2023
f574e9a
Merge pull request #4 from IndiraPe/feature-initial
IndiraPe Mar 8, 2023
9471500
finaliza la HU n°1
IndiraPe Mar 11, 2023
37a0966
sube un ultimo cambio en index
IndiraPe Mar 11, 2023
724b654
Merge pull request #5 from IndiraPe/devI
marielfico Mar 11, 2023
69a5d85
sube los últimos cambios en pokedex
IndiraPe Mar 12, 2023
a982cb1
Merge pull request #6 from IndiraPe/devI
marielfico Mar 12, 2023
b0d8c70
agrega la funcionalidad 'mostrar pkmn en la lista'
IndiraPe Mar 13, 2023
a7d0df1
Merge pull request #7 from IndiraPe/devI
marielfico Mar 13, 2023
996581c
Agrega el estilo del filtro
IndiraPe Mar 14, 2023
4522424
Merge pull request #8 from IndiraPe/devI
marielfico Mar 14, 2023
6ce9316
agrega el filtro region y cambios en html
IndiraPe Mar 18, 2023
7f1623c
Merge pull request #9 from IndiraPe/devI
marielfico Mar 18, 2023
5a6e713
este commit agrega las funciones de filtrado
marielfico Mar 18, 2023
c153692
Merge pull request #10 from IndiraPe/mariel
IndiraPe Mar 18, 2023
48bec02
borra comentarios innecesarios
IndiraPe Mar 18, 2023
9b81440
Merge pull request #11 from IndiraPe/devI
marielfico Mar 18, 2023
d52b8ff
Este commit agrega el buscador
marielfico Mar 19, 2023
0221336
Merge pull request #12 from IndiraPe/mariel
IndiraPe Mar 19, 2023
102212b
Este commit actualiza el filtro buscar pokémon
marielfico Mar 19, 2023
3623b4b
Merge pull request #13 from IndiraPe/mariel
IndiraPe Mar 19, 2023
fe28459
cambió la funcion del botón lupa a botón limpiar filtros
IndiraPe Mar 19, 2023
6972b77
agregó la plantilla de modal
IndiraPe Mar 20, 2023
fcf32e1
Merge pull request #14 from IndiraPe/devI
marielfico Mar 20, 2023
866691e
Este commit añade el array para buscar el pkm por num
marielfico Mar 20, 2023
b1cccb7
Merge pull request #15 from IndiraPe/mariel2
IndiraPe Mar 20, 2023
4c7ef4c
agregó los cambios del OH
IndiraPe Mar 20, 2023
29d4a8e
Merge pull request #16 from IndiraPe/devI
marielfico Mar 20, 2023
f005adf
agrega las funciones con 2 argumentos para facil testeo
IndiraPe Mar 20, 2023
67c3645
Merge pull request #17 from IndiraPe/devI
marielfico Mar 20, 2023
ea9b122
subió los cambios de la HU3
IndiraPe Mar 21, 2023
2f655b5
Merge pull request #18 from IndiraPe/devI
marielfico Mar 21, 2023
594a3ce
agregó los cambios en modal de la info del pokemon
IndiraPe Mar 22, 2023
09f6163
Merge pull request #19 from IndiraPe/devI
marielfico Mar 22, 2023
4bef965
agregó mas detalles de información en modal
IndiraPe Mar 23, 2023
11b7948
Merge pull request #20 from IndiraPe/devI
marielfico Mar 23, 2023
c303b7e
subió los cambios en pair programming
IndiraPe Mar 24, 2023
6915262
Merge pull request #21 from IndiraPe/devI
marielfico Mar 24, 2023
496752a
agrega el responsive en celular, y test de funcion filtrarRegion
IndiraPe Mar 27, 2023
3efb668
Merge pull request #22 from IndiraPe/devI
marielfico Mar 27, 2023
9bfa7ca
este commit añade responsive tablet y test al 100%
marielfico Mar 27, 2023
2312547
Merge pull request #23 from IndiraPe/mariel1
IndiraPe Mar 27, 2023
9349a74
Update README.md
IndiraPe Mar 27, 2023
7f83b2c
Update README.md
IndiraPe Mar 27, 2023
a492133
subió los avances del readMe y las estadísticas
IndiraPe Mar 28, 2023
cb00672
modificó algunas imagenes de ReadMe
IndiraPe Mar 28, 2023
27096f9
arregla la altura el título
IndiraPe Mar 28, 2023
e071e18
agregó los ultimos cambios en el ReadMe
IndiraPe Mar 28, 2023
8da2d85
agregó los últimos cambios de readme y fetch
IndiraPe Mar 28, 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
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"liveServer.settings.port": 5501
}
461 changes: 60 additions & 401 deletions README.md

Large diffs are not rendered by default.

Loading