Antonio Vidal
|
33c1ad74f1
|
Merge pull request #43 from cheapy-ispp/008-verOfertasActivas
Solo Ofertas activas y Mis ofertas
|
2021-03-30 18:49:52 +02:00 |
|
Antonio Vidal
|
0ba60d4ab9
|
Solo Ofertas activas y Mis ofertas
|
2021-03-30 18:47:55 +02:00 |
|
abemorcardc
|
8f59d2d2a3
|
Merge pull request #41 from cheapy-ispp/011-pruebas-unitarias-publicar-ofertas-abel
Arreglos de los tests
|
2021-03-28 18:09:25 +02:00 |
|
Thiloparn
|
f0a8d27d63
|
Arreglos de los tests
|
2021-03-28 18:07:35 +02:00 |
|
abemorcardc
|
f7f9e000f1
|
Merge pull request #40 from cheapy-ispp/011-pruebas-unitarias-publicar-ofertas-abel
011 pruebas unitarias publicar ofertas
|
2021-03-28 17:50:23 +02:00 |
|
abemorcardc
|
3ccf48acfc
|
Merge branch 'develop' into 011-pruebas-unitarias-publicar-ofertas-abel
# Conflicts:
# src/main/java/org/springframework/cheapy/configuration/SecurityConfiguration.java
# src/main/java/org/springframework/cheapy/model/SpeedOffer.java
# src/main/java/org/springframework/cheapy/web/FoodOfferController.java
# src/main/java/org/springframework/cheapy/web/NuOfferController.java
# src/main/java/org/springframework/cheapy/web/SpeedOfferController.java
# src/main/java/org/springframework/cheapy/web/TimeOfferController.java
# src/main/resources/db/mysql/data.sql
# src/main/webapp/WEB-INF/jsp/offers/food/foodOffersDisable.jsp
# src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersDisable.jsp
# src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersDisable.jsp
# src/main/webapp/WEB-INF/jsp/offers/time/timeOffersDisable.jsp
|
2021-03-28 17:18:45 +02:00 |
|
davsotpon
|
6ec82b4e2c
|
Merge pull request #37 from cheapy-ispp/hotfix-fecha
Arreglos de la rama develop
|
2021-03-28 01:04:52 +01:00 |
|
David
|
10344bc0cc
|
Arreglos de la rama develop
|
2021-03-28 01:03:55 +01:00 |
|
abemorcardc
|
f92e4f171c
|
Merge pull request #36 from cheapy-ispp/011-pruebas-unitarias-publicar-ofertas-tibo
Arreglos para user, cambio de urls y organizacion de jsp , y test de controladores de speed y food Offers
|
2021-03-28 00:55:19 +01:00 |
|
abemorcardc
|
aa13d055f1
|
Merge branch '011-pruebas-unitarias-publicar-ofertas-abel' into 011-pruebas-unitarias-publicar-ofertas-tibo
|
2021-03-28 00:54:39 +01:00 |
|
abemorcardc
|
2d251f9bcd
|
Tests de TimeOffer y NuOffer, y arreglos en data.sql y urls
Además, cambios en las urls
|
2021-03-28 00:49:12 +01:00 |
|
davsotpon
|
a96818adae
|
Merge pull request #35 from cheapy-ispp/009-cambiarVistas
Cambiado el logout y algunos cambios visuales más
|
2021-03-27 23:33:46 +01:00 |
|
davsotpon
|
9ab1bf2ccf
|
Merge branch 'develop' into 009-cambiarVistas
|
2021-03-27 23:32:57 +01:00 |
|
David
|
702664f615
|
Logout y algunos cambios más de estilos
|
2021-03-27 23:15:30 +01:00 |
|
Thiloparn
|
205c9d9a71
|
Arreglos para user, cambio de urls y organizacion de jsp , y test de
controladores de speed y food Offers
|
2021-03-27 21:39:13 +01:00 |
|
javgranar
|
2e876d3a43
|
Merge pull request #34 from cheapy-ispp/hotfix-entidades
Actualizacion de entidades
|
2021-03-27 20:47:37 +01:00 |
|
Javier
|
aef8ddf302
|
Actualizacion de entidades
|
2021-03-27 20:45:16 +01:00 |
|
javgranar
|
1a3474d04c
|
Merge pull request #33 from cheapy-ispp/010-modf-seguridad
010 modf seguridad
|
2021-03-27 19:56:58 +01:00 |
|
Javier
|
1b211c32d5
|
Modificar y eliminar ofertas con seguridad
|
2021-03-27 19:47:45 +01:00 |
|
Angel Caballero Dominguez
|
8ccda96390
|
Decoradas vistas de funciones de oferta creadas
Se han decorado las vistas de mostrar ofertas y las vistas de mostrar detalles de oferta de cada uno de los tipos de oferta actuales
|
2021-03-26 21:11:12 +01:00 |
|
gabgutpri
|
fe623f2c6f
|
Modf Gabo a Modf Seg
Error corregido
|
2021-03-26 19:51:18 +01:00 |
|
gabgutpri
|
0917da055b
|
Merge branch '010-modf-seguridad' into 010-modf-Gabo
|
2021-03-26 19:49:17 +01:00 |
|
gabgutpri@alum.us.es
|
14585f778a
|
Error corregido
|
2021-03-26 19:28:11 +01:00 |
|
javgranar
|
e83d68bbfb
|
Merge pull request #30 from cheapy-ispp/010-modificar-eliminar-ofertas
010 modificar eliminar ofertas
|
2021-03-26 19:27:14 +01:00 |
|
javgranar
|
6602500a1a
|
Merge branch '010-modf-seguridad' into 010-modificar-eliminar-ofertas
|
2021-03-26 19:27:04 +01:00 |
|
Javier
|
dbf0b01744
|
Añadir jsp
|
2021-03-26 19:20:31 +01:00 |
|
Angel Caballero Dominguez
|
455d29b39c
|
Merge pull request #29 from cheapy-ispp/develop
Actualizacion de la rama de vistas con develop
|
2021-03-26 16:59:30 +01:00 |
|
MartínAGR
|
bd58ac2abb
|
Merge pull request #28 from cheapy-ispp/publicarFixed
Publicar ofertas arreglado
|
2021-03-25 23:56:56 +01:00 |
|
Martinagr32
|
457cba860d
|
Publicar ofertas arreglado
|
2021-03-25 23:51:59 +01:00 |
|
abemorcardc
|
9f247ac0c1
|
Merge pull request #27 from cheapy-ispp/007-publicarOfertas-Abel
007 publicar ofertas abel
|
2021-03-25 22:20:23 +01:00 |
|
abemorcardc
|
f9866c3c6e
|
Merge branch 'develop' into 007-publicarOfertas-Abel
|
2021-03-25 22:19:25 +01:00 |
|
abemorcardc
|
20792da435
|
Merge pull request #26 from cheapy-ispp/007-publicarOfertas-Tibo
007 publicar ofertas tibo
|
2021-03-25 21:33:06 +01:00 |
|
abemorcardc
|
6b47157d2f
|
Merge branch '007-publicarOfertas-Abel' into 007-publicarOfertas-Tibo
|
2021-03-25 21:32:56 +01:00 |
|
abemorcardc
|
226833aa4d
|
Añadidas y arregladas ofertas de franja horaria y de numero de
comensales
|
2021-03-25 21:25:27 +01:00 |
|
davsotpon
|
c5d2e00503
|
Merge pull request #25 from cheapy-ispp/009-cambiarVistas
009 cambiar vistas
|
2021-03-25 21:18:04 +01:00 |
|
davsotpon
|
bc787b8dd4
|
Merge branch 'develop' into 009-cambiarVistas
|
2021-03-25 21:17:52 +01:00 |
|
Abraham Garcia
|
55af776550
|
Merge pull request #24 from cheapy-ispp/008-verOfertas
008 ver ofertas
|
2021-03-25 21:14:43 +01:00 |
|
Abraham Garcia
|
f4a43c06c8
|
Merge pull request #23 from cheapy-ispp/loginfixed
loginfixed
|
2021-03-25 21:13:09 +01:00 |
|
Abraham Garcia
|
49dd2a76f0
|
Merge branch '008-verOfertas' into loginfixed
|
2021-03-25 21:12:43 +01:00 |
|
Abraham
|
48afa96a07
|
loginfixed
|
2021-03-25 21:08:41 +01:00 |
|
Antonio Vidal
|
9de23998b9
|
Arreglos con los login y el authority
|
2021-03-25 20:59:24 +01:00 |
|
David
|
fbd5813f86
|
Vista de login
|
2021-03-25 20:15:34 +01:00 |
|
Thiloparn
|
e80e782d13
|
Update data.sql
|
2021-03-25 19:43:28 +01:00 |
|
Thiloparn
|
042f8f2731
|
Update SpeedOfferController.java
|
2021-03-25 19:42:41 +01:00 |
|
Thiloparn
|
f2324efb9f
|
Update FoodOfferController.java
|
2021-03-25 19:42:18 +01:00 |
|
Javier
|
a75a5adc70
|
Modificar y eliminar ofertas de nuOffers y speedOffers, queda revisarlo
|
2021-03-25 19:17:52 +01:00 |
|
Thiloparn
|
f9452671bb
|
Corrercion de errores
|
2021-03-25 19:12:46 +01:00 |
|
Antonio Vidal
|
a041e31a50
|
Actualizado el listar. El show de TimeOffer no le gusta los LocalTime
|
2021-03-25 18:30:33 +01:00 |
|
Antonio Vidal
|
88b304f72a
|
Los shows funcionan pero hay un error con las TimeOffer, parece que los
jsp no reconocen el tipo LocalTime
|
2021-03-25 18:00:19 +01:00 |
|
abemorcardc
|
83897d84d5
|
Añadidas ofertas de numero de clientes y de franja horaria
|
2021-03-24 21:58:46 +01:00 |
|