Code

Susana#13

Code

Open

KellyRoca wants to merge 101 commits intoLaboratoria:masterLaboratoria/LIM011-data-lovers:masterfrom SusanaAtp:susanaSusanaAtp/LIM011-data-lovers:susanaCopy head branch name to clipboard

+1,418-56

Commits

Commits on Oct 23, 2019

• actualiza O.A-Readme

  KellyRoca

  committed
  c1a457f

  Copy full SHA for c1a457f

• actualiza los objetivos de aprendizaje del README.

  SusanaAtp

  committed
  1db3c06

  Copy full SHA for 1db3c06

Commits on Oct 28, 2019

• finaliza HTML, falta interacción

  KellyRoca

  committed
  e9ff1ca

  Copy full SHA for e9ff1ca

• acepta cambios

  KellyRoca

  committed
  76cdc98

  Copy full SHA for 76cdc98

• Merge pull request #1 from krocarondinel/kelly

  Show description for 7f8c5ab
  SusanaAtp

  authored
  7f8c5ab

  Copy full SHA for 7f8c5ab

• pinta todos los personajes

  KellyRoca

  committed
  e61a02d

  Copy full SHA for e61a02d

• Merge pull request #2 from krocarondinel/kelly

  Show description for d98b518
  SusanaAtp

  authored
  d98b518

  Copy full SHA for d98b518

Commits on Oct 29, 2019

• muestra imagenes por casa

  KellyRoca

  committed
  b8534d2

  Copy full SHA for b8534d2

• finaliza pantalla de personajes por casa

  KellyRoca

  committed
  7891959

  Copy full SHA for 7891959

• Merge branch 'susana' of https://github.com/SusanaAtp/LIM011-data-lovers into kelly

  KellyRoca

  committed
  885c6cf

  Copy full SHA for 885c6cf

• Merge pull request #3 from krocarondinel/kelly

  Show description for 0cf3d26
  SusanaAtp

  authored
  0cf3d26

  Copy full SHA for 0cf3d26

• edita html y css

  SusanaAtp

  committed
  6615bc6

  Copy full SHA for 6615bc6

Commits on Oct 30, 2019

• finaliza mostrar casas y filtrado por casas

  KellyRoca

  committed
  1f8555b

  Copy full SHA for 1f8555b

• finaliza filtro por casa

  KellyRoca

  committed
  aa6d73f

  Copy full SHA for aa6d73f

• Merge pull request #4 from krocarondinel/kelly

  Show description for 959e300
  SusanaAtp

  authored
  959e300

  Copy full SHA for 959e300

• realiza responsive, edita html y css

  SusanaAtp

  committed
  1c09797

  Copy full SHA for 1c09797

• avance responsive y filtro finalizado

  SusanaAtp

  committed
  cee2a10

  Copy full SHA for cee2a10

• cambia css no funciona js

  KellyRoca

  committed
  e3c3a68

  Copy full SHA for e3c3a68

• finaliza filtrado, prueba buscar

  KellyRoca

  committed
  816a8c5

  Copy full SHA for 816a8c5

• editar filtros todo para responsive

  SusanaAtp

  committed
  e3c39ba

  Copy full SHA for e3c39ba

• Merge pull request #6 from SusanaAtp/susana

  Show description for dae0b1a
  SusanaAtp

  authored
  dae0b1a

  Copy full SHA for dae0b1a

• prueba no terminada busquedad

  KellyRoca

  committed
  1f28f89

  Copy full SHA for 1f28f89

• Merge branch 'susana' into kelly

  KellyRoca

  authored
  c6d039d

  Copy full SHA for c6d039d

• Merge pull request #5 from krocarondinel/kelly

  Show description for bcf6e6a
  SusanaAtp

  authored
  bcf6e6a

  Copy full SHA for bcf6e6a

• edita responsive de filtros todos

  SusanaAtp

  committed
  1e1d5a1

  Copy full SHA for 1e1d5a1

• prueba busqueda

  KellyRoca

  committed
  d5b535e

  Copy full SHA for d5b535e

Commits on Oct 31, 2019

• fitra casas y todos

  KellyRoca

  committed
  5c369ab

  Copy full SHA for 5c369ab

• Merge branch 'susana' of https://github.com/SusanaAtp/LIM011-data-lovers into kelly

  KellyRoca

  committed
  49be575

  Copy full SHA for 49be575

• actualiza responsive para desktop y mobile

  SusanaAtp

  committed
  eab30b5

  Copy full SHA for eab30b5

• Merge branch 'susana' into kelly

  SusanaAtp

  authored
  a36d62e

  Copy full SHA for a36d62e

• Merge pull request #7 from krocarondinel/kelly

  Show description for 66675b8
  SusanaAtp

  authored
  66675b8

  Copy full SHA for 66675b8

Commits on Nov 4, 2019

• finaliza funcion busqueda no funciones puras

  KellyRoca

  committed
  8e6b88e

  Copy full SHA for 8e6b88e

• finaliza funcion busqueda no funciones puras

  KellyRoca

  committed
  495986f

  Copy full SHA for 495986f

• Merge pull request #8 from krocarondinel/kelly

  Show description for 3335de8
  SusanaAtp

  authored
  3335de8

  Copy full SHA for 3335de8

• finaliza vistas y ocultar

  SusanaAtp

  committed
  a82ecc2

  Copy full SHA for a82ecc2

• finaliza select, busqueda y vistas. Falta realizar test.

  SusanaAtp

  committed
  9d7c3c2

  Copy full SHA for 9d7c3c2

• empieza a llorar

  KellyRoca

  committed
  fa90334

  Copy full SHA for fa90334

• empieza a llorar

  KellyRoca

  committed
  8874895

  Copy full SHA for 8874895

• empieza testeo, separacion de funciones, llora

  KellyRoca

  committed
  eed3f61

  Copy full SHA for eed3f61

Commits on Nov 5, 2019

• Merge pull request #9 from krocarondinel/kelly

  Show description for 5eb9b0c
  SusanaAtp

  authored
  5eb9b0c

  Copy full SHA for 5eb9b0c

• prueba test unitarios

  KellyRoca

  committed
  b83358c

  Copy full SHA for b83358c

• Merge pull request #10 from krocarondinel/kelly

  Show description for f0d5627
  SusanaAtp

  authored
  f0d5627

  Copy full SHA for f0d5627

• pruebas unitarias

  SusanaAtp

  committed
  cf0c362

  Copy full SHA for cf0c362

• pruebas unitarias

  SusanaAtp

  committed
  f3dccbb

  Copy full SHA for f3dccbb

• intenta test

  KellyRoca

  committed
  e52f698

  Copy full SHA for e52f698

• intenta test

  KellyRoca

  committed
  783d4de

  Copy full SHA for 783d4de

• testea test unitarios

  SusanaAtp

  committed
  fb4a412

  Copy full SHA for fb4a412

• Merge pull request #11 from krocarondinel/kelly

  Show description for c5c40b5
  SusanaAtp

  authored
  c5c40b5

  Copy full SHA for c5c40b5

• realiza prueba de test unitarios

  SusanaAtp

  committed
  7aee332

  Copy full SHA for 7aee332

• realiza prueba de test unitarios

  SusanaAtp

  committed
  3ad47e8

  Copy full SHA for 3ad47e8

• prueba ahora

  KellyRoca

  committed
  56e47b5

  Copy full SHA for 56e47b5

• acepta prruebas

  KellyRoca

  committed
  f9c9289

  Copy full SHA for f9c9289

Commits on Nov 6, 2019

• realiza función ordenado.

  SusanaAtp

  committed
  1e942d3

  Copy full SHA for 1e942d3

• es ejemplo

  KellyRoca

  committed
  97fb4f9

  Copy full SHA for 97fb4f9

Commits on Nov 10, 2019

• pueba con otros javascripts y html

  KellyRoca

  committed
  0ddd9b3

  Copy full SHA for 0ddd9b3

• cambia busqueda.

  SusanaAtp

  committed
  8c11349

  Copy full SHA for 8c11349

• Merge pull request #12 from krocarondinel/kelly

  Show description for 29623a6
  SusanaAtp

  authored
  29623a6

  Copy full SHA for 29623a6

Commits on Nov 11, 2019

• agrega funcion busqueda

  KellyRoca

  committed
  7ac3097

  Copy full SHA for 7ac3097

• prueba y cambia funcion busqueda.

  SusanaAtp

  committed
  81246c0

  Copy full SHA for 81246c0

• Merge pull request #13 from krocarondinel/kelly

  Show description for 16bc418
  SusanaAtp

  authored
  16bc418

  Copy full SHA for 16bc418

Commits on Nov 12, 2019

• agrega input busqueda creada, no tiene problemas encontrados, falta su test

  KellyRoca

  committed
  34465e5

  Copy full SHA for 34465e5

• agrega busqueda completa y tests

  KellyRoca

  committed
  ce8d7e2

  Copy full SHA for ce8d7e2

Commits on Nov 13, 2019

• realiza funcion busqueda

  SusanaAtp

  committed
  b87cb25

  Copy full SHA for b87cb25

• Merge pull request #15 from krocarondinel/kelly

  Show description for cb9d725
  SusanaAtp

  authored
  cb9d725

  Copy full SHA for cb9d725

• agrega vistas para siguientes historias

  SusanaAtp

  committed
  b4ce3a9

  Copy full SHA for b4ce3a9

• agrega filtro y búsqueda en vista personajes

  KellyRoca

  committed
  e290811

  Copy full SHA for e290811

Commits on Nov 14, 2019

• Merge pull request #16 from krocarondinel/kelly

  Show description for 8d51fe0
  SusanaAtp

  authored
  8d51fe0

  Copy full SHA for 8d51fe0

• agrega filtros de busqueda a todas las vistas y filtrado de personajes, hacer modal y filtrado de rol

  SusanaAtp

  committed
  a05cb41

  Copy full SHA for a05cb41

• finaliza filtrado por busqueda a todas las vistas, filtrado de personajes y test, terminar modal y filtrado de rol

  SusanaAtp

  committed
  9798778

  Copy full SHA for 9798778

• finaliza h1

  KellyRoca

  committed
  7b39c0e

  Copy full SHA for 7b39c0e

• agrega filtrado en rol

  KellyRoca

  committed
  36b1ddd

  Copy full SHA for 36b1ddd

• agrega filtrado rol

  SusanaAtp

  committed
  4ab3da2

  Copy full SHA for 4ab3da2

• Merge pull request #17 from krocarondinel/kelly

  Show description for ae204b5
  SusanaAtp

  authored
  ae204b5

  Copy full SHA for ae204b5

Commits on Nov 18, 2019

• agrega modal sin funcionar

  KellyRoca

  committed
  e811298

  Copy full SHA for e811298

• agrega css modal

  SusanaAtp

  committed
  65f4642

  Copy full SHA for 65f4642

• Merge pull request #18 from krocarondinel/kelly

  Show description for edeefd6
  SusanaAtp

  authored
  edeefd6

  Copy full SHA for edeefd6

• Merge branch 'susana' of https://github.com/SusanaAtp/LIM011-data-lovers into susana

  SusanaAtp

  committed
  08fe4a2

  Copy full SHA for 08fe4a2

• agrega modal pinta un personaje

  KellyRoca

  committed
  41716f8

  Copy full SHA for 41716f8

• agregar css

  SusanaAtp

  committed
  7669917

  Copy full SHA for 7669917

• Merge pull request #19 from krocarondinel/kelly

  Show description for 1bb7392
  SusanaAtp

  authored
  1bb7392

  Copy full SHA for 1bb7392

• Merge branch 'susana' of https://github.com/SusanaAtp/LIM011-data-lovers into susana

  SusanaAtp

  committed
  da3feba

  Copy full SHA for da3feba

Commits on Nov 19, 2019

• agrega modal, falta css

  KellyRoca

  committed
  a4e0c0d

  Copy full SHA for a4e0c0d

• Merge pull request #20 from krocarondinel/kelly

  Show description for 9e0b310
  SusanaAtp

  authored
  9e0b310

  Copy full SHA for 9e0b310

• inicia css modal

  SusanaAtp

  committed
  19d6915

  Copy full SHA for 19d6915

• Merge branch 'master' of https://github.com/SusanaAtp/LIM011-data-lovers into susana

  SusanaAtp

  committed
  a5a291a

  Copy full SHA for a5a291a

• inicia css de modal

  SusanaAtp

  committed
  db79b31

  Copy full SHA for db79b31

Commits on Nov 20, 2019

• agrega pequeños detalles en main.js

  KellyRoca

  committed
  2ed12e7

  Copy full SHA for 2ed12e7

• agrega css modal mobile, falta css modal desktop

  SusanaAtp

  committed
  91e7dc3

  Copy full SHA for 91e7dc3

• agrega detalles

  KellyRoca

  committed
  a81d782

  Copy full SHA for a81d782

• Merge pull request #21 from krocarondinel/kelly

  Show description for 047f6a3
  SusanaAtp

  authored
  047f6a3

  Copy full SHA for 047f6a3

• finaliza css modal

  SusanaAtp

  committed
  dcc07e0

  Copy full SHA for dcc07e0

• agrega fechad de cumpleaños

  KellyRoca

  committed
  e954de2

  Copy full SHA for e954de2

• Merge branch 'susana' into kelly

  KellyRoca

  authored
  821a9ab

  Copy full SHA for 821a9ab

• Merge pull request #22 from krocarondinel/kelly

  Show description for 6b9de37
  SusanaAtp

  authored
  6b9de37

  Copy full SHA for 6b9de37

• css modal cumpleaños

  SusanaAtp

  committed
  a03533f

  Copy full SHA for a03533f

• arregla carpeta de fuentes

  SusanaAtp

  committed
  51cae6f

  Copy full SHA for 51cae6f

Commits on Nov 21, 2019

• realiza css modal y correcciones

  SusanaAtp

  committed
  80eda52

  Copy full SHA for 80eda52

• arregla css modal responsive

  SusanaAtp

  committed
  be3b83c

  Copy full SHA for be3b83c

• finaliza css responsive

  SusanaAtp

  committed
  836909b

  Copy full SHA for 836909b

• elimina archivos extras

  SusanaAtp

  committed
  e945634

  Copy full SHA for e945634

Commits on Nov 22, 2019

• finaliza readme.

  SusanaAtp

  committed
  544a6de

  Copy full SHA for 544a6de