Code

Rama pamela torres gtz#17

Code

Open

Pamela-C-Torres-Gtz wants to merge 33 commits intoLaboratoria:masterLaboratoria/MEX-Data-Lovers-008:masterfrom Pamela-C-Torres-Gtz:ramaPamelaTorresGtzPamela-C-Torres-Gtz/MEX-Data-Lovers-008:ramaPamelaTorresGtzCopy head branch name to clipboard

+6,227-386

Commits

Commits on Jun 28, 2019

• B1-Empezando readme, con imagenes

  beelsanchez

  committed
  deb302c

  Copy full SHA for deb302c

• P1-redacción de mi parte proporcional del readme e imagenes utilizadas

  Pamela-C-Torres-Gtz

  committed
  b8fdf35

  Copy full SHA for b8fdf35

• Merge pull request #1 from Pamela-C-Torres-Gtz/ramaPamelaTorresGtz

  Show description for c5db335
  Pamela-C-Torres-Gtz

  authored
  c5db335

  Copy full SHA for c5db335

• Merge branch 'master' into rama-beelsanchez

  Pamela-C-Torres-Gtz

  authored
  d5fc64e

  Copy full SHA for d5fc64e

• Merge pull request #2 from beelsanchez/rama-beelsanchez

  Show description for a3488c4
  Pamela-C-Torres-Gtz

  authored
  a3488c4

  Copy full SHA for a3488c4

Commits on Jul 2, 2019

• Imagenes listas

  beelsanchez

  committed
  8bc9530

  Copy full SHA for 8bc9530

• Intento de mostrar data y botones de filtrado

  Pamela-C-Torres-Gtz

  committed
  5c74171

  Copy full SHA for 5c74171

• Merge remote-tracking branch 'origin/rama-beelsanchez' into rama-beelsanchez

  beelsanchez

  committed
  15f3fac

  Copy full SHA for 15f3fac

• Merge pull request #3 from Pamela-C-Torres-Gtz/ramaPamelaTorresGtz

  Show description for 8b6ec30
  Pamela-C-Torres-Gtz

  authored
  8b6ec30

  Copy full SHA for 8b6ec30

• Imagenes listas

  beelsanchez

  committed
  16d883b

  Copy full SHA for 16d883b

• Merge pull request #4 from beelsanchez/rama-beelsanchez

  Show description for 6b95bfd
  Pamela-C-Torres-Gtz

  authored
  6b95bfd

  Copy full SHA for 6b95bfd

Commits on Jul 3, 2019

• README modificado con la carpeta de imagenes, audio y video

  beelsanchez

  committed
  b6d02dd

  Copy full SHA for b6d02dd

• Se muestra las tarjetas de los pokemon en pantalla

  Pamela-C-Torres-Gtz

  committed
  0b69043

  Copy full SHA for 0b69043

• Merge pull request #5 from beelsanchez/rama-beelsanchez

  Show description for 9dc322a
  Pamela-C-Torres-Gtz

  authored
  9dc322a

  Copy full SHA for 9dc322a

• Prueba de subir 2 3 julio 2019

  Pamela-C-Torres-Gtz

  committed
  2765ea3

  Copy full SHA for 2765ea3

• Prueba2 3 de julio

  beelsanchez

  committed
  73b2dc1

  Copy full SHA for 73b2dc1

• Declarando variables para filter

  beelsanchez

  committed
  b2a3312

  Copy full SHA for b2a3312

• Tratando de darle estilo a la pagina

  Pamela-C-Torres-Gtz

  committed
  8903e5b

  Copy full SHA for 8903e5b

• Merge pull request #6 from beelsanchez/rama-beelsanchez

  Show description for df75234
  Pamela-C-Torres-Gtz

  authored
  df75234

  Copy full SHA for df75234

• intento tres

  Pamela-C-Torres-Gtz

  committed
  8d14008

  Copy full SHA for 8d14008

Commits on Jul 5, 2019

• Aparece data en tarjetas, funcion de ordenar en data.js.(PERo falta que ejecute). Estilo de letra y tarjetas en css

  Pamela-C-Torres-Gtz

  committed
  78002c1

  Copy full SHA for 78002c1

• Merge pull request #7 from Pamela-C-Torres-Gtz/ramaPamelaTorresGtz

  Show description for 6349938
  Pamela-C-Torres-Gtz

  authored
  6349938

  Copy full SHA for 6349938

• Merge pull request #8 from Pamela-C-Torres-Gtz/master

  Show description for afd0af5
  Pamela-C-Torres-Gtz

  authored
  afd0af5

  Copy full SHA for afd0af5

• Redacción de readme

  Pamela-C-Torres-Gtz

  committed
  3a1be03

  Copy full SHA for 3a1be03

Commits on Jul 10, 2019

• cambios en html, en los estilos y funciones teorica

  Pamela-C-Torres-Gtz

  committed
  35e24e7

  Copy full SHA for 35e24e7

Commits on Jul 11, 2019

• Merge branch 'ramaPamelaTorresGtz' of https://github.com/Pamela-C-Torres-Gtz/MEX-Data-Lovers-008 into ramaPamelaTorresGtz

  Pamela-C-Torres-Gtz

  committed
  3d483ce

  Copy full SHA for 3d483ce

• Merge pull request #9 from Pamela-C-Torres-Gtz/ramaPamelaTorresGtz

  Show description for dfd1223
  Pamela-C-Torres-Gtz

  authored
  dfd1223

  Copy full SHA for dfd1223

Commits on Jul 15, 2019

• Correcciones en html, css y archivos js (Ya filtra y esta en correccion ordenado)

  Pamela-C-Torres-Gtz

  committed
  b3ce464

  Copy full SHA for b3ce464

• Merge pull request #10 from Pamela-C-Torres-Gtz/ramaPamelaTorresGtz

  Show description for 46730e2
  Pamela-C-Torres-Gtz

  authored
  46730e2

  Copy full SHA for 46730e2

• Correccion de presnetación de tarjetas y tratar de corregir accion de ordenar

  Pamela-C-Torres-Gtz

  committed
  b85cc58

  Copy full SHA for b85cc58

• Merge pull request #11 from Pamela-C-Torres-Gtz/master

  Show description for 98eb6a3
  Pamela-C-Torres-Gtz

  authored
  98eb6a3

  Copy full SHA for 98eb6a3

• Merge remote-tracking branch 'origin/master' into ramaPamelaTorresGtz

  Pamela-C-Torres-Gtz

  committed
  314db0d

  Copy full SHA for 314db0d

• Merge branch 'ramaPamelaTorresGtz' of https://github.com/Pamela-C-Torres-Gtz/MEX-Data-Lovers-008 into ramaPamelaTorresGtz

  Pamela-C-Torres-Gtz

  committed
  7291e7d

  Copy full SHA for 7291e7d