Code

3rd sprint#32

Code

Open

IamPixelMx wants to merge 85 commits intoLaboratoria:masterLaboratoria/MEX-Data-Lovers-008:masterfrom IamPixelMx:3rdSprintIamPixelMx/MEX-Data-Lovers-008:3rdSprintCopy head branch name to clipboard

+8,130-368

Commits

Commits on Jun 26, 2019

• se acomodó la data de steam.js de manera vertical

  IamPixelMx

  committed
  e5e1b14

  Copy full SHA for e5e1b14

Commits on Jun 28, 2019

• se modificó README para la primera entrega

  IamPixelMx

  committed
  7fa8317

  Copy full SHA for 7fa8317

• se modificó para primera entrega

  IamPixelMx

  committed
  372e736

  Copy full SHA for 372e736

• Update README.md

  IamPixelMx

  authored
  c8bbb56

  Copy full SHA for c8bbb56

• Update README.md

  IamPixelMx

  authored
  b1fa3b8

  Copy full SHA for b1fa3b8

• Update README.md

  IamPixelMx

  authored
  78f77bd

  Copy full SHA for 78f77bd

• Update README.md

  IamPixelMx

  authored
  22209c6

  Copy full SHA for 22209c6

• Merge pull request #1 from eriika19/Itzel

  Show description for dc02aed
  IamPixelMx

  authored
  dc02aed

  Copy full SHA for dc02aed

• se actualizó la informacion del README para la primera entrega

  IamPixelMx

  committed
  ad805b9

  Copy full SHA for ad805b9

• se agrego el readme

  IamPixelMx

  committed
  3047cf3

  Copy full SHA for 3047cf3

• se volcio a corregir

  IamPixelMx

  committed
  1723ac5

  Copy full SHA for 1723ac5

• se volció a corregir

  IamPixelMx

  committed
  954c20b

  Copy full SHA for 954c20b

• Merge pull request #2 from eriika19/Itzel

  Show description for 96d8de1
  IamPixelMx

  authored
  96d8de1

  Copy full SHA for 96d8de1

Commits on Jul 1, 2019

• se actualizo el readme con algunas de la observaciones hechas en el demo y se mejoraron las imÃágenes dentro de la carpeta de img-readme

  IamPixelMx

  committed
  8e99f01

  Copy full SHA for 8e99f01

• se modifico el orden en la informacion recabada y se elimino la imagen de interes

  IamPixelMx

  committed
  a24e643

  Copy full SHA for a24e643

• se agrego una imagen de steam al README

  IamPixelMx

  committed
  1ad6315

  Copy full SHA for 1ad6315

• Merge pull request #3 from eriika19/Itzel

  Show description for 97a2c69
  IamPixelMx

  authored
  97a2c69

  Copy full SHA for 97a2c69

• se agrego funcion filterData, que ya filtrar pero solo palabras, y objeto global handleData

  IamPixelMx

  committed
  915792d

  Copy full SHA for 915792d

• display

  MonseCuevas

  committed
  eef4651

  Copy full SHA for eef4651

• Merge pull request #4 from MonseCuevas/monse

  Show description for 9ddf53f
  IamPixelMx

  authored
  9ddf53f

  Copy full SHA for 9ddf53f

Commits on Jul 2, 2019

• se agrego pocas lineas de codigo en index.html y steam.js

  IamPixelMx

  committed
  4dd541d

  Copy full SHA for 4dd541d

• se eliminaron lineas extras, se codeo tres posibles funciones para la manipulacion de data y se fusiono las nuevas lineas de codigo para el estilo y la estructura html

  IamPixelMx

  committed
  c0596e4

  Copy full SHA for c0596e4

• Actualizar steam.js para usar solo data

  IamPixelMx

  committed
  56c8dda

  Copy full SHA for 56c8dda

• Arreglar la barra de navegacion

  IamPixelMx

  committed
  9838648

  Copy full SHA for 9838648

• Resuelve conflictos after rebase

  IamPixelMx

  committed
  bb65f33

  Copy full SHA for bb65f33

• se arreglo todo lo que pasooooo

  IamPixelMx

  committed
  b8aa5b0

  Copy full SHA for b8aa5b0

• Merge pull request #5 from eriika19/Itzel

  Show description for d73bf7e
  IamPixelMx

  authored
  d73bf7e

  Copy full SHA for d73bf7e

Commits on Jul 3, 2019

• corrio el filtrado de noticias, se agrego la seccion de noticias y se le dio formato, se programo lo necesario en js para la seccion de noticias

  IamPixelMx

  committed
  b3ea1b6

  Copy full SHA for b3ea1b6

• agregue logo

  MonseCuevas

  committed
  55492f1

  Copy full SHA for 55492f1

• Merge pull request #7 from eriika19/Itzel

  Show description for 6e015d7
  IamPixelMx

  authored
  6e015d7

  Copy full SHA for 6e015d7

• Merge branch 'master' into monse

  IamPixelMx

  authored
  1f0e6ff

  Copy full SHA for 1f0e6ff

• Merge pull request #6 from MonseCuevas/monse

  Show description for ffa215d
  IamPixelMx

  authored
  ffa215d

  Copy full SHA for ffa215d

• redame

  MonseCuevas

  committed
  08213f5

  Copy full SHA for 08213f5

• Merge pull request #1 from MonseCuevas/monse

  Show description for 1f2dd99
  MonseCuevas

  authored
  1f2dd99

  Copy full SHA for 1f2dd99

Commits on Jul 4, 2019

• Modificacion a video

  MonseCuevas

  committed
  0573a21

  Copy full SHA for 0573a21

• Merge pull request #2 from MonseCuevas/monse

  Show description for b8841a4
  MonseCuevas

  authored
  b8841a4

  Copy full SHA for b8841a4

• se agrego indicativo que confirma al usuario que su busqueda se a ha realizado, sea cambio el estilo del input para busqueda, se dio orden y estilo a la barra de navegacion lateral, se agregaron li…

  Show description for 05afed3
  IamPixelMx

  committed
  05afed3

  Copy full SHA for 05afed3

• Merge pull request #9 from eriika19/Itzel

  Show description for a037911
  IamPixelMx

  authored
  a037911

  Copy full SHA for a037911

• Merge branch 'master' into master

  IamPixelMx

  authored
  11d7a97

  Copy full SHA for 11d7a97

• Merge pull request #8 from MonseCuevas/master

  Show description for 7a62b17
  IamPixelMx

  authored
  7a62b17

  Copy full SHA for 7a62b17

• se arreglo el conflicto del video y un poco la barra de busqueda

  IamPixelMx

  committed
  a3b80d3

  Copy full SHA for a3b80d3

• se acomodo un poco video y barra de busqueda

  IamPixelMx

  committed
  8d3f90a

  Copy full SHA for 8d3f90a

• Merge pull request #10 from eriika19/Itzel

  Show description for 6ffb64b
  IamPixelMx

  authored
  6ffb64b

  Copy full SHA for 6ffb64b

• se arreglo problema con la barra de navigacion horicontal y se vincula funciones de busqueda para la barra lateral

  IamPixelMx

  committed
  ff3e4eb

  Copy full SHA for ff3e4eb

• Merge pull request #11 from eriika19/Itzel

  Show description for a310d25
  IamPixelMx

  authored
  a310d25

  Copy full SHA for a310d25

Commits on Jul 5, 2019

• persona

  MonseCuevas

  committed
  617f855

  Copy full SHA for 617f855

• Merge pull request #3 from MonseCuevas/monse

  Show description for c080d1e
  MonseCuevas

  authored
  c080d1e

  Copy full SHA for c080d1e

• usuario

  MonseCuevas

  committed
  cbc3114

  Copy full SHA for cbc3114

• historia

  MonseCuevas

  committed
  16deb77

  Copy full SHA for 16deb77

• Merge pull request #12 from MonseCuevas/monse

  Show description for 1e5befa
  IamPixelMx

  authored
  1e5befa

  Copy full SHA for 1e5befa

• Merge pull request #13 from MonseCuevas/master

  Show description for fd1b9cc
  IamPixelMx

  authored
  fd1b9cc

  Copy full SHA for fd1b9cc

• se acomodo README para entrega de segundo sprint

  IamPixelMx

  committed
  d1adec5

  Copy full SHA for d1adec5

• Merge pull request #14 from eriika19/Itzel

  Show description for 96804c3
  IamPixelMx

  authored
  96804c3

  Copy full SHA for 96804c3

Commits on Jul 9, 2019

• se empezo funcion de fiktrado y ahi que ver como hacer que funcione el dropdown

  IamPixelMx

  committed
  1e00d37

  Copy full SHA for 1e00d37

Commits on Jul 10, 2019

• se agrego responsive para varios equipos. Se limipio y organizo adecuadamente el codigo del estilo. Existen fallas con la barra de navegacion

  IamPixelMx

  committed
  b841009

  Copy full SHA for b841009

• Merge pull request #15 from eriika19/Itzel

  Show description for e62a0f5
  IamPixelMx

  authored
  e62a0f5

  Copy full SHA for e62a0f5

• se arreglo y dio mas formato a la barra de busqueda y se cambiaron iconos

  IamPixelMx

  committed
  1d2a5db

  Copy full SHA for 1d2a5db

• cambios

  MonseCuevas

  committed
  3aed763

  Copy full SHA for 3aed763

• se modifico

  MonseCuevas

  committed
  a07a8c5

  Copy full SHA for a07a8c5

• mas responsive

  IamPixelMx

  committed
  9d9a485

  Copy full SHA for 9d9a485

• se quiere rehacer codigo

  MonseCuevas

  committed
  3476f69

  Copy full SHA for 3476f69

Commits on Jul 11, 2019

• Merge pull request #17 from eriika19/Itzel

  Show description for b0a1ab5
  IamPixelMx

  authored
  b0a1ab5

  Copy full SHA for b0a1ab5

Commits on Jul 12, 2019

• se metio mucho codigo responsive, falta acomodar links de navegacion horizontal cuando se desplega

  IamPixelMx

  committed
  a775a91

  Copy full SHA for a775a91

Commits on Jul 13, 2019

• mas responsive, falta menu despegable horizontal de links

  IamPixelMx

  committed
  62cadd2

  Copy full SHA for 62cadd2

• Merge pull request #18 from eriika19/Itzel

  Show description for a66a01c
  IamPixelMx

  authored
  a66a01c

  Copy full SHA for a66a01c

• se realizo la funcion para ordenar. Falta manejar el estilo para el video y no funciona el dropdown

  IamPixelMx

  committed
  09e10e1

  Copy full SHA for 09e10e1

Commits on Jul 14, 2019

• se arreglo menu despegable y se completo funcion de ordenado en barra lateral y boton de noticias

  IamPixelMx

  committed
  5c8526a

  Copy full SHA for 5c8526a

• se completo funcion para obtener porcentaje

  IamPixelMx

  committed
  99e4331

  Copy full SHA for 99e4331

• Merge pull request #19 from eriika19/Itzel

  Show description for 876e49c
  IamPixelMx

  authored
  876e49c

  Copy full SHA for 876e49c

• div extra

  MonseCuevas

  committed
  a44564b

  Copy full SHA for a44564b

• .

  MonseCuevas

  committed
  22e3236

  Copy full SHA for 22e3236

• mas responsive

  IamPixelMx

  committed
  c150f3a

  Copy full SHA for c150f3a

• se arreglo barra de navegacion

  IamPixelMx

  committed
  af37130

  Copy full SHA for af37130

• mejor responsive

  IamPixelMx

  committed
  f1c5b67

  Copy full SHA for f1c5b67

• Merge pull request #21 from eriika19/3rdSprint

  Show description for f8b2b12
  IamPixelMx

  authored
  f8b2b12

  Copy full SHA for f8b2b12

• se arreglo barra horizontal

  MonseCuevas

  committed
  ff7a571

  Copy full SHA for ff7a571

• se agrelo barra horizontal y this

  MonseCuevas

  committed
  2021c81

  Copy full SHA for 2021c81

• Merge branch 'master' into monse

  IamPixelMx

  authored
  7c3e3b0

  Copy full SHA for 7c3e3b0

• Merge pull request #22 from MonseCuevas/monse

  Show description for 3c2fb29
  IamPixelMx

  authored
  3c2fb29

  Copy full SHA for 3c2fb29

Commits on Jul 15, 2019

• ñse completo README

  IamPixelMx

  committed
  dde1b72

  Copy full SHA for dde1b72

• Merge branch 'master' into 3rdSprint

  IamPixelMx

  authored
  720a69d

  Copy full SHA for 720a69d

• Merge pull request #23 from eriika19/3rdSprint

  Show description for 72f2b94
  IamPixelMx

  authored
  72f2b94

  Copy full SHA for 72f2b94

• README

  IamPixelMx

  committed
  c632480

  Copy full SHA for c632480

• se escribieron pruebas

  IamPixelMx

  committed
  be2124c

  Copy full SHA for be2124c

• se resolvio y escribieron pruebas unitarias, se aumento responsive de lupa y agrego imagenes al readme

  IamPixelMx

  committed
  fcc4ad1

  Copy full SHA for fcc4ad1