Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reg dev calc ag #34

Open
wants to merge 54 commits into
base: main
Choose a base branch
from
Open

Reg dev calc ag #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
10a5494
prueba2
Regieslu Aug 7, 2023
f9bf72c
prueba3
Regieslu Aug 7, 2023
20f321b
cree mi branch
danapineiro Aug 7, 2023
f69d62a
prueba3
danapineiro Aug 7, 2023
76e046b
prueba4
Regieslu Aug 7, 2023
ac92af7
resolvi conflictos de merge
Regieslu Aug 7, 2023
4600eac
prueba5
danapineiro Aug 7, 2023
53be7cf
cambio
danapineiro Aug 7, 2023
b12e4e1
Merge pull request #1 from danapineiro/DanaDev
danapineiro Aug 7, 2023
544a20c
Merge pull request #2 from danapineiro/RegDev
Regieslu Aug 7, 2023
bb6d1bc
Portada
danapineiro Aug 8, 2023
478455f
Merge pull request #3 from danapineiro/DanaDev
danapineiro Aug 8, 2023
699be21
Cambios html y css
danapineiro Aug 11, 2023
53011f9
Se realiza import y se da
Regieslu Aug 11, 2023
cf1aaa0
Merge pull request #4 from danapineiro/DanaDev
danapineiro Aug 11, 2023
8aac9c7
Merge branch 'main' into RegDev
Regieslu Aug 11, 2023
53e03ee
Merge pull request #6 from danapineiro/RegDev
Regieslu Aug 11, 2023
ce5267f
opciones al inicio de la pagina
Regieslu Aug 11, 2023
4edb8b1
Merge pull request #7 from danapineiro/FilterCrds
Regieslu Aug 11, 2023
d1f82d5
estilos
danapineiro Aug 11, 2023
8ee3295
Merge branch 'main' of https://github.com/danapineiro/DEV010-data-lov…
danapineiro Aug 11, 2023
bcc385f
Cambie nombre de valu
Regieslu Aug 11, 2023
8d0bae1
Merge pull request #8 from danapineiro/FilterCrds
Regieslu Aug 11, 2023
0affb8b
Merge branch 'main' of https://github.com/danapineiro/DEV010-data-lov…
danapineiro Aug 11, 2023
22fb0ea
Filtrado de cartas con menu de opciones
Regieslu Aug 14, 2023
2f36a9c
Merge pull request #9 from danapineiro/FilterCrds
Regieslu Aug 14, 2023
0f18827
estilos botones y cartas css
danapineiro Aug 14, 2023
7a3fa37
Merge branch 'main' into danafiltercards
danapineiro Aug 14, 2023
a652098
Merge pull request #10 from danapineiro/danafiltercards
danapineiro Aug 14, 2023
6d6c906
Se habilita la barra de busqueda
Regieslu Aug 14, 2023
601dd8d
Merge pull request #11 from danapineiro/RegSerchInfo
Regieslu Aug 14, 2023
419bcba
cambio en main.js y estilos
danapineiro Aug 14, 2023
bf5c161
Merge branch 'main' into danasearchinfo
danapineiro Aug 14, 2023
29f5c07
Merge pull request #12 from danapineiro/danasearchinfo
danapineiro Aug 14, 2023
3423cc0
Se corrige
Regieslu Aug 14, 2023
3e36917
Merge pull request #13 from danapineiro/RegSerchInfo
Regieslu Aug 14, 2023
bfdc12e
se arregla error en css
danapineiro Aug 14, 2023
8fc54e0
Merge branch 'main' into danasearchinfo
danapineiro Aug 14, 2023
81e6c89
Merge pull request #14 from danapineiro/danasearchinfo
danapineiro Aug 14, 2023
23f0d10
Filtrado de informacion de la carta
Regieslu Aug 16, 2023
1f3dfe1
Se corrige error en CSS
Regieslu Aug 16, 2023
409ba33
Merge pull request #15 from danapineiro/RegDevCalculo
Regieslu Aug 16, 2023
bdc15ee
cambios html y css
danapineiro Aug 16, 2023
3d42f45
Merge branch 'main' into danacalculoagregado
danapineiro Aug 16, 2023
d62b376
Merge pull request #16 from danapineiro/danacalculoagregado
danapineiro Aug 16, 2023
2517b9c
test 1 y 2 y prueba de calculo
danapineiro Aug 18, 2023
8ee95f5
cambio minimo en js
Regieslu Aug 18, 2023
751f072
Merge pull request #17 from danapineiro/danacalculo2
danapineiro Aug 18, 2023
aea198b
Merge branch 'main' into RegCalculo2
Regieslu Aug 18, 2023
56bbe2c
Merge pull request #18 from danapineiro/RegCalculo2
Regieslu Aug 18, 2023
1cab57c
calculo agregado y test
Regieslu Aug 21, 2023
ee17ce4
calculoag y test
danapineiro Aug 21, 2023
4e6caf9
Merge pull request #19 from danapineiro/danadevCalcAg
danapineiro Aug 21, 2023
694ffab
Merge branch 'main' into RegDevCalcAg
Regieslu Aug 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* [8. Pistas, tips y lecturas complementarias](#8-pistas-tips-y-lecturas-complementarias)
* [9. Checklist](#9-checklist)

***
****

## 1. Preámbulo

Expand Down
Loading