Code

Reg dev calc ag#34

Code

Open

Regieslu wants to merge 54 commits intoLaboratoria:mainLaboratoria/DEV010-data-lovers:mainfrom danapineiro:RegDevCalcAgdanapineiro/DEV010-data-lovers:RegDevCalcAgCopy head branch name to clipboard

+8,052-23

Commits

Commits on Aug 7, 2023

• prueba2

  Regieslu

  committed
  10a5494

  Copy full SHA for 10a5494

• prueba3

  Regieslu

  committed
  f9bf72c

  Copy full SHA for f9bf72c

• cree mi branch

  danapineiro

  committed
  20f321b

  Copy full SHA for 20f321b

• prueba3

  danapineiro

  committed
  f69d62a

  Copy full SHA for f69d62a

• prueba4

  Regieslu

  committed
  76e046b

  Copy full SHA for 76e046b

• resolvi conflictos de merge

  Regieslu

  committed
  ac92af7

  Copy full SHA for ac92af7

• prueba5

  danapineiro

  committed
  4600eac

  Copy full SHA for 4600eac

• cambio

  danapineiro

  committed
  53be7cf

  Copy full SHA for 53be7cf

• Merge pull request #1 from danapineiro/DanaDev

  Show description for b12e4e1
  danapineiro

  authored
  b12e4e1

  Copy full SHA for b12e4e1

• Merge pull request #2 from danapineiro/RegDev

  Show description for 544a20c
  Regieslu

  authored
  544a20c

  Copy full SHA for 544a20c

Commits on Aug 8, 2023

• Portada

  danapineiro

  committed
  bb6d1bc

  Copy full SHA for bb6d1bc

• Merge pull request #3 from danapineiro/DanaDev

  Show description for 478455f
  danapineiro

  authored
  478455f

  Copy full SHA for 478455f

Commits on Aug 11, 2023

• Cambios html y css

  danapineiro

  committed
  699be21

  Copy full SHA for 699be21

• Se realiza import y se da

  Show description for 53011f9
  Regieslu

  committed
  53011f9

  Copy full SHA for 53011f9

• Merge pull request #4 from danapineiro/DanaDev

  Show description for cf1aaa0
  danapineiro

  authored
  cf1aaa0

  Copy full SHA for cf1aaa0

• Merge branch 'main' into RegDev

  Regieslu

  authored
  8aac9c7

  Copy full SHA for 8aac9c7

• Merge pull request #6 from danapineiro/RegDev

  Show description for 53e03ee
  Regieslu

  authored
  53e03ee

  Copy full SHA for 53e03ee

• opciones al inicio de la pagina

  Regieslu

  committed
  ce5267f

  Copy full SHA for ce5267f

• Merge pull request #7 from danapineiro/FilterCrds

  Show description for 4edb8b1
  Regieslu

  authored
  4edb8b1

  Copy full SHA for 4edb8b1

• estilos

  danapineiro

  committed
  d1f82d5

  Copy full SHA for d1f82d5

• Merge branch 'main' of https://github.com/danapineiro/DEV010-data-lovers into danafiltercards

  danapineiro

  committed
  8ee3295

  Copy full SHA for 8ee3295

• Cambie nombre de valu

  Show description for bcc385f
  Regieslu

  committed
  bcc385f

  Copy full SHA for bcc385f

• Merge pull request #8 from danapineiro/FilterCrds

  Show description for 8d0bae1
  Regieslu

  authored
  8d0bae1

  Copy full SHA for 8d0bae1

• Merge branch 'main' of https://github.com/danapineiro/DEV010-data-lovers into danafiltercards

  danapineiro

  committed
  0affb8b

  Copy full SHA for 0affb8b

Commits on Aug 14, 2023

• Filtrado de cartas con menu de opciones

  Regieslu

  committed
  22fb0ea

  Copy full SHA for 22fb0ea

• Merge pull request #9 from danapineiro/FilterCrds

  Show description for 2f36a9c
  Regieslu

  authored
  2f36a9c

  Copy full SHA for 2f36a9c

• estilos botones y cartas css

  danapineiro

  committed
  0f18827

  Copy full SHA for 0f18827

• Merge branch 'main' into danafiltercards

  danapineiro

  authored
  7a3fa37

  Copy full SHA for 7a3fa37

• Merge pull request #10 from danapineiro/danafiltercards

  Show description for a652098
  danapineiro

  authored
  a652098

  Copy full SHA for a652098

• Se habilita la barra de busqueda

  Regieslu

  committed
  6d6c906

  Copy full SHA for 6d6c906

• Merge pull request #11 from danapineiro/RegSerchInfo

  Show description for 601dd8d
  Regieslu

  authored
  601dd8d

  Copy full SHA for 601dd8d

• cambio en main.js y estilos

  danapineiro

  committed
  419bcba

  Copy full SHA for 419bcba

• Merge branch 'main' into danasearchinfo

  danapineiro

  authored
  bf5c161

  Copy full SHA for bf5c161

• Merge pull request #12 from danapineiro/danasearchinfo

  Show description for 29f5c07
  danapineiro

  authored
  29f5c07

  Copy full SHA for 29f5c07

• Se corrige

  Show description for 3423cc0
  Regieslu

  committed
  3423cc0

  Copy full SHA for 3423cc0

• Merge pull request #13 from danapineiro/RegSerchInfo

  Show description for 3e36917
  Regieslu

  authored
  3e36917

  Copy full SHA for 3e36917

• se arregla error en css

  danapineiro

  committed
  bfdc12e

  Copy full SHA for bfdc12e

• Merge branch 'main' into danasearchinfo

  danapineiro

  authored
  8fc54e0

  Copy full SHA for 8fc54e0

• Merge pull request #14 from danapineiro/danasearchinfo

  Show description for 81e6c89
  danapineiro

  authored
  81e6c89

  Copy full SHA for 81e6c89

Commits on Aug 16, 2023

• Filtrado de informacion de la carta

  Regieslu

  committed
  23f0d10

  Copy full SHA for 23f0d10

• Se corrige error en CSS

  Regieslu

  committed
  1f3dfe1

  Copy full SHA for 1f3dfe1

• Merge pull request #15 from danapineiro/RegDevCalculo

  Show description for 409ba33
  Regieslu

  authored
  409ba33

  Copy full SHA for 409ba33

• cambios html y css

  danapineiro

  committed
  bdc15ee

  Copy full SHA for bdc15ee

• Merge branch 'main' into danacalculoagregado

  danapineiro

  authored
  3d42f45

  Copy full SHA for 3d42f45

• Merge pull request #16 from danapineiro/danacalculoagregado

  Show description for d62b376
  danapineiro

  authored
  d62b376

  Copy full SHA for d62b376

Commits on Aug 18, 2023

• test 1 y 2 y prueba de calculo

  danapineiro

  committed
  2517b9c

  Copy full SHA for 2517b9c

• cambio minimo en js

  Regieslu

  committed
  8ee95f5

  Copy full SHA for 8ee95f5

• Merge pull request #17 from danapineiro/danacalculo2

  Show description for 751f072
  danapineiro

  authored
  751f072

  Copy full SHA for 751f072

• Merge branch 'main' into RegCalculo2

  Regieslu

  authored
  aea198b

  Copy full SHA for aea198b

• Merge pull request #18 from danapineiro/RegCalculo2

  Show description for 56bbe2c
  Regieslu

  authored
  56bbe2c

  Copy full SHA for 56bbe2c

Commits on Aug 21, 2023

• calculo agregado y test

  Regieslu

  committed
  1cab57c

  Copy full SHA for 1cab57c

• calculoag y test

  danapineiro

  committed
  ee17ce4

  Copy full SHA for ee17ce4

• Merge pull request #19 from danapineiro/danadevCalcAg

  Show description for 4e6caf9
  danapineiro

  authored
  4e6caf9

  Copy full SHA for 4e6caf9

• Merge branch 'main' into RegDevCalcAg

  Regieslu

  authored
  694ffab

  Copy full SHA for 694ffab