Code

Agregue el readme con imágenes#6

Code

Open

Paola-To wants to merge 65 commits intoLaboratoria:masterLaboratoria/MEX-Data-Lovers-008:masterfrom Paola-To:rama-PaolaPaola-To/MEX-Data-Lovers-008:rama-PaolaCopy head branch name to clipboard

+6,192-414

Commits

Commits on Jun 28, 2019

• Agregue el readme con imagenes

  Paola-To

  committed
  463ca78

  Copy full SHA for 463ca78

• Merge pull request #1 from Paola-To/rama-Paola

  Show description for 9a1119c
  Paola-To

  authored
  9a1119c

  Copy full SHA for 9a1119c

• Corregi la extensión de las imagenes del readme

  Paola-To

  committed
  228ee60

  Copy full SHA for 228ee60

• Merge pull request #2 from Paola-To/rama-Paola

  Show description for ffbd3f3
  Paola-To

  authored
  ffbd3f3

  Copy full SHA for ffbd3f3

• Se agrego footer y botón de GO en el index

  Paola-To

  committed
  d7a8aae

  Copy full SHA for d7a8aae

Commits on Jun 30, 2019

• Agrego meta para hacer el html responsive y se descomenta la linea del script para acceder a la data

  rebe-san

  committed
  bffcc61

  Copy full SHA for bffcc61

Commits on Jul 2, 2019

• Agregue la parte de CSS y los distintos html en la maqueta

  Paola-To

  committed
  a4eae14

  Copy full SHA for a4eae14

• Merge pull request #3 from Paola-To/rama-Paola

  Show description for d8a9bca
  Paola-To

  authored
  d8a9bca

  Copy full SHA for d8a9bca

• Subo funcion que recorre la data y muestra el nombre y la imgen en html

  rebe-san

  committed
  7c8ccdf

  Copy full SHA for 7c8ccdf

• Merge branch 'rama-Paola' into rama-Rebeca

  rebe-san

  authored
  d9d3c96

  Copy full SHA for d9d3c96

• Subo main.js con la funcion que recorre la data y que muestra en el body el nombre y la imagen

  rebe-san

  committed
  828d70a

  Copy full SHA for 828d70a

• Merge branch 'rama-Rebeca' of https://github.com/rebe-san/MEX-Data-Lovers-008 into rama-Rebeca

  rebe-san

  committed
  39d952f

  Copy full SHA for 39d952f

• Merge pull request #5 from rebe-san/rama-Rebeca

  Show description for 81facfb
  Paola-To

  authored
  81facfb

  Copy full SHA for 81facfb

Commits on Jul 3, 2019

• Creo archivo app.js ,app.html y app.css , que contiene la data desplegada en forma de cards

  rebe-san

  committed
  125f99c

  Copy full SHA for 125f99c

• Merge pull request #6 from rebe-san/rama-Rebeca

  Show description for 0452065
  Paola-To

  authored
  0452065

  Copy full SHA for 0452065

• Agregue css en welcome.html

  Paola-To

  committed
  a3ed261

  Copy full SHA for a3ed261

• Merge branch 'master' into rama-Paola

  Paola-To

  authored
  7a1c185

  Copy full SHA for 7a1c185

• Merge pull request #7 from Paola-To/rama-Paola

  Show description for a64dbcf
  Paola-To

  authored
  a64dbcf

  Copy full SHA for a64dbcf

• Actualización de welcome.html

  Paola-To

  committed
  d284f95

  Copy full SHA for d284f95

• Merge branch 'rama-Paola' of https://github.com/Paola-To/MEX-Data-Lovers-008 into rama-Paola

  Paola-To

  committed
  a8b9cf5

  Copy full SHA for a8b9cf5

• Merge branch 'master' into rama-Paola

  Paola-To

  committed
  03cf36e

  Copy full SHA for 03cf36e

Commits on Jul 4, 2019

• Agregue estilo a appi.html

  Paola-To

  committed
  757315b

  Copy full SHA for 757315b

• Merge pull request #8 from Paola-To/rama-Paola

  Show description for 62700e5
  Paola-To

  authored
  62700e5

  Copy full SHA for 62700e5

• SE agrego estilo al index

  Paola-To

  committed
  a83591c

  Copy full SHA for a83591c

• Merge pull request #9 from Paola-To/rama-Paola

  Show description for 8c6b070
  Paola-To

  authored
  8c6b070

  Copy full SHA for 8c6b070

Commits on Jul 5, 2019

• Subo archivo data.js con la funcion filtrar por nombre

  rebe-san

  committed
  6badcfd

  Copy full SHA for 6badcfd

• Merge branch 'master' of https://github.com/Paola-To/MEX-Data-Lovers-008

  rebe-san

  committed
  a35ae01

  Copy full SHA for a35ae01

• Se agrego select a la welcome.html

  Paola-To

  committed
  07dea7b

  Copy full SHA for 07dea7b

• Merge pull request #10 from Paola-To/rama-Paola

  Show description for 7728b70
  Paola-To

  authored
  7728b70

  Copy full SHA for 7728b70

• Subo data.js con las funciones de ordenar ascendentemente y descendentemente por nombre

  rebe-san

  committed
  c9fc063

  Copy full SHA for c9fc063

• Merge branch 'master' of https://github.com/Paola-To/MEX-Data-Lovers-008

  rebe-san

  committed
  94c37bd

  Copy full SHA for 94c37bd

• Merge branch 'master' into rama-Rebeca

  rebe-san

  committed
  471e396

  Copy full SHA for 471e396

• Merge pull request #11 from rebe-san/rama-Rebeca

  Show description for 6a77e77
  Paola-To

  authored
  6a77e77

  Copy full SHA for 6a77e77

• Se agrego CSS a index,welcome.

  Paola-To

  committed
  73df436

  Copy full SHA for 73df436

• Merge branch 'master' of https://github.com/Paola-To/MEX-Data-Lovers-008

  rebe-san

  committed
  bc3595e

  Copy full SHA for bc3595e

• Merge branch 'master' into rama-Rebeca

  rebe-san

  committed
  69d6102

  Copy full SHA for 69d6102

• Se soluciono el conflicto de index.html

  Paola-To

  committed
  a33e486

  Copy full SHA for a33e486

• Se agrego favicon

  Paola-To

  committed
  3cccc05

  Copy full SHA for 3cccc05

• Merge pull request #12 from Paola-To/rama-Paola

  Show description for 034c442
  Paola-To

  authored
  034c442

  Copy full SHA for 034c442

• Subo appi.html con el input para filtrar por nombre y appi.js con la funcion correspondiente

  rebe-san

  committed
  96f85fb

  Copy full SHA for 96f85fb

• Merge pull request #13 from rebe-san/rama-Rebeca

  Show description for c424d39
  Paola-To

  authored
  c424d39

  Copy full SHA for c424d39

• Merge pull request #14 from rebe-san/rama-Rebeca

  Show description for 8505ea6
  Paola-To

  authored
  8505ea6

  Copy full SHA for 8505ea6

Commits on Jul 8, 2019

• Se sue archivo con las funciones de filtrar por nombre , ordenar ascendentemente y descendentemente , asi como funcion de escritura de nodos

  rebe-san

  committed
  7efb24c

  Copy full SHA for 7efb24c

• Merge branch 'rama-Paola' into rama-Rebeca

  Paola-To

  authored
  d9f2e84

  Copy full SHA for d9f2e84

• Merge pull request #15 from rebe-san/rama-Rebeca

  Show description for c31209b
  Paola-To

  authored
  c31209b

  Copy full SHA for c31209b

• Merge branch 'master' into rama-Paola

  Paola-To

  authored
  7cb6ae2

  Copy full SHA for 7cb6ae2

• Merge pull request #16 from Paola-To/rama-Paola

  Show description for 4d42332
  Paola-To

  authored
  4d42332

  Copy full SHA for 4d42332

Commits on Jul 9, 2019

• Agregue iconos redimensionados, y css responsive en header

  Paola-To

  committed
  b9fdfa2

  Copy full SHA for b9fdfa2

• Merge pull request #17 from Paola-To/rama-Paola

  Show description for dd06fd8
  Paola-To

  authored
  dd06fd8

  Copy full SHA for dd06fd8

• Subo funciones reordenadas y la funcion que calcula la altura promedio de los pokemones

  rebe-san

  committed
  41eec75

  Copy full SHA for 41eec75

• Merge branch 'rama-Rebeca' of https://github.com/rebe-san/MEX-Data-Lovers-008 into rama-Rebeca

  rebe-san

  committed
  2de2ec0

  Copy full SHA for 2de2ec0

• Merge branch 'master' into rama-Rebeca

  Paola-To

  authored
  327d92b

  Copy full SHA for 327d92b

• Merge pull request #18 from rebe-san/rama-Rebeca

  Show description for c5c5901
  Paola-To

  authored
  c5c5901

  Copy full SHA for c5c5901

Commits on Jul 13, 2019

• Subo archivo style.css comentado y modificado para hacer el diseño responsive

  rebe-san

  committed
  ff1a7f3

  Copy full SHA for ff1a7f3

Commits on Jul 14, 2019

• Merge pull request #19 from rebe-san/rama-Rebeca

  Show description for 2a39aa1
  Paola-To

  authored
  2a39aa1

  Copy full SHA for 2a39aa1

• Actualización funciones

  Paola-To

  committed
  3e6e4b2

  Copy full SHA for 3e6e4b2

• Merge branch 'master' into rama-Paola

  Paola-To

  authored
  63bfa1f

  Copy full SHA for 63bfa1f

• Merge pull request #20 from Paola-To/rama-Paola

  Show description for 05ec86d
  Paola-To

  authored
  05ec86d

  Copy full SHA for 05ec86d

Commits on Jul 15, 2019

• Subo archivo data.spec.js con los test para las funciones de filtrado por nombre , ordenar ascendente y descende, se crea el objeto functions y las funciones pasan a ser metodos de este objeto,esto…

  Show description for 8e2df6c
  rebe-san

  committed
  8e2df6c

  Copy full SHA for 8e2df6c

• Merge branch 'rama-Paola' into rama-Rebeca

  Paola-To

  authored
  f6b603f

  Copy full SHA for f6b603f

• Merge pull request #21 from rebe-san/rama-Rebeca

  Show description for 2371a42
  Paola-To

  authored
  2371a42

  Copy full SHA for 2371a42

• Merge pull request #22 from Paola-To/rama-Paola

  Show description for 97250dc
  Paola-To

  authored
  97250dc

  Copy full SHA for 97250dc

• Subo archivos quitando comentarios y ordenando el codigo

  rebe-san

  committed
  981da2d

  Copy full SHA for 981da2d

• Merge pull request #23 from rebe-san/rama-Rebeca

  Show description for 5b88958
  Paola-To

  authored
  5b88958

  Copy full SHA for 5b88958

• Actualización del Readme

  Paola-To

  committed
  24e0c8f

  Copy full SHA for 24e0c8f