Subiendo data cris1#14

Open

Cris-hr wants to merge 57 commits intoLaboratoria:mainfrom

Cris-hr:subiendoData-cris1

Commits on May 12, 2023

data subida
Cris-hr
committed

Commits on May 15, 2023

cambio main
Cris-hr
committed

Commits on May 16, 2023

background homepage

Katherine Encalada
authored and
Katherine Encalada
committed
add buttons homepage

Katherine Encalada
authored and
Katherine Encalada
committed
buttons homepage stile y JS

Katherine Encalada
authored and
Katherine Encalada
committed
diseñocards
Cris-hr
committed
Merge pull request #1 from Cris-hr/subiendoData-cris1
Cris-hr
authored
imagen homepage

Katherine Encalada
authored and
Katherine Encalada
committed
Merge branch 'main' of https://github.com/Cris-hr/DEV007-data-lovers into kathy

Katherine Encalada
authored and
Katherine Encalada
committed
Merge pull request #2 from Cris-hr/kathy
Cris-hr
authored

Commits on May 17, 2023

homepage images

Katherine Encalada
authored and
Katherine Encalada
committed
resumepage

Katherine Encalada
authored and
Katherine Encalada
committed
Merge pull request #3 from Cris-hr/kathy
Cris-hr
authored

Commits on May 19, 2023

cambios-contenedor-cards
Cris-hr
committed
Merge pull request #5 from Cris-hr/subiendoData-cris1
SolEncalada
authored
cambios resumePage

Katherine Encalada
authored and
Katherine Encalada
committed

Commits on May 22, 2023

bordes css
Cris-hr
committed
Merge pull request #6 from Cris-hr/subiendoData-cris1
SolEncalada
authored
boton pokedex en ResumePage

Katherine Encalada
authored and
Katherine Encalada
committed

Commits on May 23, 2023

Commits on May 24, 2023

cambios al header
Cris-hr
committed
Merge pull request #9 from Cris-hr/subiendoData-cris1
SolEncalada
authored
header pokedexpage selectfilter y homebutton

Katherine Encalada
authored and
Katherine Encalada
committed
selectfilter -filtrar por-

Katherine Encalada
authored and
Katherine Encalada
committed
boton ordenador nuevo
Cris-hr
committed
Merge pull request #10 from Cris-hr/kathy
Cris-hr
authored
resolucion de conflictos
Cris-hr
committed
Merge pull request #11 from Cris-hr/subiendoData-cris1
SolEncalada
authored
css selects pokedex page

Katherine Encalada
authored and
Katherine Encalada
committed
Merge pull request #12 from Cris-hr/kathy
SolEncalada
authored

Commits on May 26, 2023

funcion filtrado

Katherine Encalada
authored and
Katherine Encalada
committed
funcion de ordenar
Cris-hr
committed
cambios funcion ordenar
Cris-hr
committed
cambios funcion ordenar corregida
Cris-hr
committed
Merge pull request #13 from Cris-hr/subiendoData-cris1
SolEncalada
authored

Commits on May 30, 2023

test ordenar
Cris-hr
committed
Merge pull request #14 from Cris-hr/subiendoData-cris1
SolEncalada
authored
funcion buscador

Katherine Encalada
authored and
Katherine Encalada
committed
resolucion de conflictos

Katherine Encalada
authored and
Katherine Encalada
committed
Merge pull request #15 from Cris-hr/kathy
Cris-hr
authored
funcion de busqueda arreglada

Katherine Encalada
authored and
Katherine Encalada
committed
Merge pull request #16 from Cris-hr/kathy
Cris-hr
authored
test terminados
Cris-hr
committed
conflictos arreglados3
Cris-hr
committed
Merge pull request #17 from Cris-hr/subiendoData-cris1
SolEncalada
authored

Commits on May 31, 2023

arreglos responsive

Katherine Encalada
authored and
Katherine Encalada
committed
Merge pull request #18 from Cris-hr/kathy
Cris-hr
authored
ultimos cambios
Cris-hr
committed
Merge branch 'main' of https://github.com/Cris-hr/DEV007-data-lovers into subiendoData-cris1
Cris-hr
committed
Merge pull request #19 from Cris-hr/subiendoData-cris1
SolEncalada
authored

Commits on Jun 5, 2023

ultimo cambio
Cris-hr
committed