Commits · main · julio moreno / Carricoche

21 Nov, 2024 17 commits
- Merge branch 'omarlerma-main-patch-31729' into 'main' · b7e31af2
  Omar Lerma authored 4 months ago
```
Update README.md

See merge request !15
```
  b7e31af2
- Update README.md · 2f9dfdd8
  Omar Lerma authored 4 months ago
  
  2f9dfdd8
- Merge branch 'omarlerma-main-patch-38975' into 'main' · c258274a
  Omar Lerma authored 4 months ago
```
fix movimientos router

See merge request !14
```
  c258274a
- fix movimientos router · c145ad54
  Omar Lerma authored 4 months ago
  
  c145ad54
- Merge branch 'julio-final' into 'main' · 550a84ea
  julio moreno authored 4 months ago
```
Julio final terminado

See merge request !13
```
  550a84ea
- Merge branch 'main' into 'julio-final' · 28ae439d
  julio moreno authored 4 months ago
```
# Conflicts:
#   README.md
```
  28ae439d
- Merge branch 'julio-final' of https://gitlab.iesvirgendelcarmen.com/jmormad0109/carricoche into dev · e88c9fb8
  julio moreno authored 4 months ago
  
  e88c9fb8
- Julio-final terminado · f2b3ce2b
  julio moreno authored 4 months ago
  
  f2b3ce2b
- Merge branch 'omar' into 'main' · 97e5b094
  Omar Lerma authored 4 months ago
```
finalizado omar

See merge request !10
```
  97e5b094
- Delete docker-compose.yml · c3f50015
  julio moreno authored 4 months ago
  
  c3f50015
- Delete docker-compose.yml · 172478d9
  Omar Lerma authored 4 months ago
  
  172478d9
- readme completo v2 + docker compose fuera · 1e0ae346
  omarlerma authored 4 months ago
  
  1e0ae346
- readme completo · 37282ab2
  omarlerma authored 4 months ago
  
  37282ab2
- Codigo comentado, Vistas de Login con estilo · e47905dc
  julio moreno authored 4 months ago
  
  e47905dc
- Merge branch 'julio-final' into 'main' · 63dafb5f
  julio moreno authored 4 months ago
```
Solucionados errores en los controllers, clientesRouters parte de ventas

See merge request !9
```
  63dafb5f
- Solucionados errores en los controllers, clientesRouters parte de ventas · 1f891599
  julio moreno authored 4 months ago
  
  1f891599
- Merge branch 'julio-final' into 'main' · ead80d0b
  Omar Lerma authored 4 months ago
```
merge final

See merge request !8
```
  ead80d0b
19 Nov, 2024 1 commit
- Arreglado movimientosController parte de ventas, ventas funcionando · 4f164f9f
  julio moreno authored 4 months ago
  
  4f164f9f
18 Nov, 2024 3 commits
- Vistas de ventas, clientesController de ventas · be1d0b07
  julio moreno authored 4 months ago
  
  be1d0b07
- Merge branch 'omar' into 'main' · 0317f2b1
  Omar Lerma authored 4 months ago
```
acceso exclusivo de un usuario loggeado + recuperación de contraseña +...

See merge request !7
```
  0317f2b1
- fix acentos bbdd · 338a246d
  omarlerma authored 4 months ago
  
  338a246d
17 Nov, 2024 2 commits
- acceso exclusivo de un usuario loggeado + recuperación de contraseña +... · 32d4d524
  omarlerma authored 4 months ago
```
acceso exclusivo de un usuario loggeado + recuperación de contraseña + necesidad de activación y activación de usuario
```
  32d4d524
- fix docker + iniciar sesión / registrarse / cerrar sesión resetear contraseña funcionales · eef88bc5
  omarlerma authored 4 months ago
  
  eef88bc5
15 Nov, 2024 1 commit
- Merge branch 'omar' into 'main' · c3eb0a14
  julio moreno authored 4 months ago
```
Omar

See merge request !5
```
  c3eb0a14
13 Nov, 2024 3 commits
- compras entero + vistas con estilos + rutas no especificada · aae07e2c
  omarlerma authored 5 months ago
  
  aae07e2c
- Merge branch 'omar' of https://gitlab.iesvirgendelcarmen.com/jmormad0109/carricoche into dev · 29552add
  omarlerma authored 5 months ago
  
  29552add
- Merge branch 'main' of https://gitlab.iesvirgendelcarmen.com/jmormad0109/carricoche into dev · 9d662b8b
  omarlerma authored 5 months ago
  
  9d662b8b
12 Nov, 2024 8 commits
- comprobacion resto de funcionalidades · a3d9351a
  Omar Lerma authored 5 months ago
  
  a3d9351a
- maestro detalle casi · 85848d96
  Omar Lerma authored 5 months ago
  
  85848d96
- Ventas Controller 2.0 y vista Edit · 99177391
  julio moreno authored 5 months ago
  
  99177391
- CRUD compras · 3a233e61
  omarlerma authored 5 months ago
  
  3a233e61
- Vistas ventas, ventasControllerActualizado_1.0 · 8765fafc
  julio moreno authored 5 months ago
  
  8765fafc
- Router y Controladores de compras y movimientos · 981b2347
  omarlerma authored 5 months ago
  
  981b2347
- Merge branch 'omar' into 'main' · 5a06809f
  Omar Lerma authored 5 months ago
```
Router y Controladores de compras y movimientos

See merge request !4
```
  5a06809f
- Merge branch 'main' of https://gitlab.iesvirgendelcarmen.com/jmormad0109/carricoche into dev · d2edd32d
  julio moreno authored 5 months ago
  
  d2edd32d
11 Nov, 2024 3 commits
- ventasController · ea63aea4
  julio moreno authored 5 months ago
  
  ea63aea4
- servidor iniciado y login casi · 76139d6a
  omarlerma authored 5 months ago
  
  76139d6a
- Merge branch 'omar' into 'main' · f459c09d
  Omar Lerma authored 5 months ago
```
servidor iniciado y login casi

See merge request !3
```
  f459c09d
08 Nov, 2024 2 commits
- Merge branch 'omar' into 'main' · 166d425e
  julio moreno authored 5 months ago
```
app.js

See merge request !2
```
  166d425e
- Merge branch 'julio' into 'main' · 7f9520d5
  julio moreno authored 5 months ago
```
docker-compose

See merge request !1
```
  7f9520d5