Commits · 8316c0e8d10201102c806ba8e66fc1b0d19d02c4 · Santiago Martin Vaiga Cousillas / TProg · GitLab

Snippets Groups Projects

Aug 18, 2022
- Merge branch 'main' of https://gitlab.fing.edu.uy/santiago.vaiga/TProg.git into main · 8316c0e8
  Tobias Iroa Otero authored 2 years ago
  
  8316c0e8
- Const de act y oper en continsc · 343a8487
  Tobias Iroa Otero authored 2 years ago
  
  343a8487
- Actualizacion Proveedor y Turista · 39ae14f8
  Agustin Emanuel De Leon Perdomo authored 2 years ago
  
  39ae14f8
- Merge branch 'main' of https://gitlab.fing.edu.uy/santiago.vaiga/TProg.git into main · b29d4d02
  Tobias Iroa Otero authored 2 years ago
  
  b29d4d02
- depart con getters y setters completo, falta agregar la coleccion de · 877b2535
  Tobias Iroa Otero authored 2 years ago
```
actividades
```
  877b2535
- Actualizacion Proveedor y Turista · 21fd9188
  Agustin Emanuel De Leon Perdomo authored 2 years ago
  
  21fd9188
- Merge branch 'main' of · 1af16a73
  Tobias Iroa Otero authored 2 years ago
```
https://gitlab.fing.edu.uy/santiago.vaiga/TProg.git into main
```
  1af16a73
- Merge branch 'main' of https://gitlab.fing.edu.uy/santiago.vaiga/TProg.git into main · 0e79d642
  Tobias Iroa Otero authored 2 years ago
  
  0e79d642
- departmento, Agrego COntroladorInsc, que era el que faltaba · 4218ab7a
  Tobias Iroa Otero authored 2 years ago
  
  4218ab7a
- Merge branch 'main' of https://gitlab.fing.edu.uy/santiago.vaiga/TProg.git into main · b8c039ca
  Agustin Emanuel De Leon Perdomo authored 2 years ago
  
  b8c039ca
- Actualizacion Usuario, ManejadorUsuario · fcd3ffad
  Agustin Emanuel De Leon Perdomo authored 2 years ago
  
  fcd3ffad
- Merge branch 'main' of · 5a0ff319
  Tobias Iroa Otero authored 2 years ago
```
https://gitlab.fing.edu.uy/santiago.vaiga/TProg.git into main
```
  5a0ff319
- Merge branch 'main' of https://gitlab.fing.edu.uy/santiago.vaiga/TProg.git into main · fb4542a8
  Tobias Iroa Otero authored 2 years ago
  
  fb4542a8
- cosas · 2c149355
  Tobias Iroa Otero authored 2 years ago
  
  2c149355
- man getact · f5a40228
  Tobias Iroa Otero authored 2 years ago
  
  f5a40228
- getact en manejadorAct · 2dea8553
  Tobias Iroa Otero authored 2 years ago
  
  2dea8553
- Delete ManejadorUsuario.java · c2ac265a
  Agustin Emanuel De Leon Perdomo authored 2 years ago
  
  c2ac265a
- Merge branch 'main' of https://gitlab.fing.edu.uy/santiago.vaiga/TProg.git into main · c5dd42d6
  Agustin Emanuel De Leon Perdomo authored 2 years ago
  
  c5dd42d6
- DataTurista, DataProveedor · 30aaf379
  Agustin Emanuel De Leon Perdomo authored 2 years ago
  
  30aaf379
Aug 17, 2022
- act · 1b552ee6
  Tobias Iroa Otero authored 2 years ago
  
  1b552ee6
- Merge branch 'main' of https://gitlab.fing.edu.uy/santiago.vaiga/TProg.git into main · eefe4f71
  Tobias Iroa Otero authored 2 years ago
  
  eefe4f71
- act · df65763a
  Tobias Iroa Otero authored 2 years ago
  
  df65763a
- Prueba Actualizacion Alta · 03a2d19f
  Agustin Emanuel De Leon Perdomo authored 2 years ago
  
  03a2d19f
- Prueba ControladorAlta · 43cb4395
  Agustin Emanuel De Leon Perdomo authored 2 years ago
  
  43cb4395
- base de actividad · 866981b4
  Tobias Iroa Otero authored 2 years ago
  
  866981b4
- Turista y Proveedor añadido (solo get/setters) · 3d5715ce
  Lucas Podesta authored 2 years ago
  
  3d5715ce
- Usuario get/setters · 9d7f733b
  Lucas Podesta Ceschi authored 2 years ago
  
  9d7f733b
- salida · 68b07cec
  FranLepGill authored 2 years ago
  
  68b07cec
- Manjador Departamentos && Departamentos · cab31c89
  FranLepGill authored 2 years ago
  
  cab31c89
- Merge branch 'main' of · b6b0b941
  FranLepGill authored 2 years ago
```
https://gitlab.fing.edu.uy/santiago.vaiga/TProg.git into main
```
  b6b0b941
- Merge branch 'main' of https://gitlab.fing.edu.uy/santiago.vaiga/TProg.git into main · fbfb0cde
  FranLepGill authored 2 years ago
  
  fbfb0cde
- salida and DataSalida completos (Falta implementar) · 3a92d2c2
  FranLepGill authored 2 years ago
  
  3a92d2c2
- Salida / marco · a75ea503
  FranLepGill authored 2 years ago
  
  a75ea503
- Merge branch 'main' of · 028da6d4
  Tobias Iroa Otero authored 2 years ago
```
https://gitlab.fing.edu.uy/santiago.vaiga/TProg.git into main

Conflicts:
	src/Manejadores/ManejadorActividad.java
```
  028da6d4
- e · a5569970
  Tobias Iroa Otero authored 2 years ago
  
  a5569970
- l · 62cfd461
  Tobias Iroa Otero authored 2 years ago
  
  62cfd461
- add act · 46407f3c
  Tobias Iroa Otero authored 2 years ago
  
  46407f3c
- Upload New File · 4ff216ad
  Tobias Iroa Otero authored 2 years ago
  
  4ff216ad
- ' · 3d075463
  Tobias Iroa Otero authored 2 years ago
  
  3d075463
- // · 8119a562
  Tobias Iroa Otero authored 2 years ago
  
  8119a562