Commit graph

  • bc787b8dd4
    Merge branch 'develop' into 009-cambiarVistas davsotpon 2021-03-25 21:17:52 +0100
  • 55af776550
    Merge pull request #24 from cheapy-ispp/008-verOfertas Abraham Garcia 2021-03-25 21:14:43 +0100
  • f4a43c06c8
    Merge pull request #23 from cheapy-ispp/loginfixed Abraham Garcia 2021-03-25 21:13:09 +0100
  • 49dd2a76f0
    Merge branch '008-verOfertas' into loginfixed Abraham Garcia 2021-03-25 21:12:43 +0100
  • 48afa96a07 loginfixed Abraham 2021-03-25 21:08:41 +0100
  • 9de23998b9 Arreglos con los login y el authority Antonio Vidal 2021-03-25 20:59:24 +0100
  • fbd5813f86 Vista de login David 2021-03-25 20:15:34 +0100
  • e80e782d13
    Update data.sql Thiloparn 2021-03-25 19:43:28 +0100
  • 042f8f2731
    Update SpeedOfferController.java Thiloparn 2021-03-25 19:42:41 +0100
  • f2324efb9f
    Update FoodOfferController.java Thiloparn 2021-03-25 19:42:18 +0100
  • a75a5adc70 Modificar y eliminar ofertas de nuOffers y speedOffers, queda revisarlo Javier 2021-03-25 19:17:52 +0100
  • f9452671bb Corrercion de errores Thiloparn 2021-03-25 19:12:46 +0100
  • a041e31a50 Actualizado el listar. El show de TimeOffer no le gusta los LocalTime Antonio Vidal 2021-03-25 18:30:33 +0100
  • 88b304f72a Los shows funcionan pero hay un error con las TimeOffer, parece que los jsp no reconocen el tipo LocalTime Antonio Vidal 2021-03-25 18:00:19 +0100
  • d0d9084c79 Arreglos travis Pablo Franco Sánchez 2021-03-25 17:13:21 +0100
  • d6c31ae90d Arreglos travis Pablo Franco Sánchez 2021-03-25 17:03:25 +0100
  • ff9ced2fdd Arreglos para travis Pablo Franco Sánchez 2021-03-25 16:58:41 +0100
  • bec8a51b81 Arreglos travis Pablo Franco Sánchez 2021-03-25 16:53:20 +0100
  • a282e2a506 Arreglo de las dependencias Pablo Franco Sánchez 2021-03-25 16:36:53 +0100
  • 712e8b6481 Update to new version machih 2021-03-25 17:02:45 +0900
  • ff60b6747a merging latest build concourse 2021-03-25 06:59:43 +0000
  • 83897d84d5 Añadidas ofertas de numero de clientes y de franja horaria abemorcardc 2021-03-24 21:58:46 +0100
  • bb86bbc6ba Cambio de vista del login David 2021-03-24 21:03:28 +0100
  • 5a55aa8084 shows de noOffer y speedOffer completados y funcionales Abraham 2021-03-24 19:36:56 +0100
  • bf08d78e1a funciona el list de ofertas Abraham 2021-03-24 18:16:36 +0100
  • 65253a15c8 codigo casi completo pero no funcional Abraham 2021-03-24 17:38:56 +0100
  • 346a049fe2 Pubicaciones de speedOffer y foodOffer hechas. Falta comprobar que funcionan correctamente. Thiloparn 2021-03-24 14:42:38 +0100
  • 5bfc714444
    Merge pull request #21 from cheapy-ispp/Cambio davsotpon 2021-03-24 13:00:35 +0100
  • ecaf01100a Arreglada la vista de error David 2021-03-24 12:56:46 +0100
  • 6dd845a365 Improved execution of grouped assertions Elvys Soares 2021-03-23 22:27:21 -0300
  • 14070f0305 Improved execution of grouped assertions Elvys Soares 2021-03-23 22:12:35 -0300
  • a10a0c2476
    Merge pull request #20 from cheapy-ispp/005-iniciosesion Abraham Garcia 2021-03-23 19:14:58 +0100
  • e67d404669 funcionaaaaa Abraham 2021-03-23 19:13:46 +0100
  • 5b924de49d Cambios Antonio Vidal 2021-03-23 18:46:20 +0100
  • ea546e458c Cuidado David 2021-03-23 18:35:19 +0100
  • 619f3e66e2
    Merge pull request #19 from cheapy-issp/005-iniciosesion Antonio Vidal 2021-03-23 16:58:13 +0100
  • ce05bea9c0 Arreglo de fallos en el despliegue Antonio Vidal 2021-03-23 16:56:21 +0100
  • 91a0c235c1
    Merge pull request #18 from cheapy-issp/develop Antonio Vidal 2021-03-23 16:16:54 +0100
  • c85a24259e
    Merge pull request #17 from cheapy-issp/005-iniciosesion Antonio Vidal 2021-03-23 16:15:43 +0100
  • 2c46cba4d4
    Merge branch 'develop' into 005-iniciosesion Antonio Vidal 2021-03-23 16:15:24 +0100
  • 652ca51d7e Arreglo de las clases respecto develop Antonio Vidal 2021-03-23 15:49:28 +0100
  • 93ca48e624
    Merge pull request #16 from cheapy-issp/009-cambiarVistas davsotpon 2021-03-23 14:16:27 +0100
  • 36b07bc4dd Algunos cambios de diseño David 2021-03-23 14:08:35 +0100
  • 8b41f69f02
    Merge pull request #15 from cheapy-issp/009-cambiarVistas davsotpon 2021-03-23 12:59:31 +0100
  • 0f933acd52 Primeros cambios en las vistas David 2021-03-23 12:55:11 +0100
  • 817273d732
    Merge pull request #14 from cheapy-issp/006-entidades javgranar 2021-03-22 20:34:35 +0100
  • 98a78f15bd Arreglo de entidades y de la configuracion mysql Javier 2021-03-22 20:32:04 +0100
  • 454bd1160b
    Delete sonar–project.properties greenel-DCU 2021-03-22 18:54:58 +0000
  • 018195af62 Entidades creadas Javier 2021-03-22 19:21:44 +0100
  • 1e548bdcad
    Create sonar–project.properties greenel-DCU 2021-03-22 17:17:38 +0000
  • 8b13d4b2a5 Entidades con error OneToOne en Users y Authorities Javier 2021-03-21 21:11:08 +0100
  • 6a63b08705 Entidades inicio Javier 2021-03-21 18:36:29 +0100
  • 3420933e82 incluir el security en el pom y crear el package configuration Abraham 2021-03-21 11:34:39 +0100
  • aa068be971 Merge branch 'travis' into develop Pablo Franco Sánchez 2021-03-20 18:44:26 +0100
  • 8bf33eb52a Update pom.xml Pablo Franco Sánchez 2021-03-20 17:33:23 +0100
  • 7e3bc6550e
    Merge pull request #8 from cheapy-issp/branch-004 Thiloparn 2021-03-20 17:28:33 +0100
  • 6dcdd4b6cd Limpieza de los archivos .sql Thiloparn 2021-03-20 17:27:31 +0100
  • cdb705c3bc Cambios en .travis.yml Pablo Franco Sánchez 2021-03-20 16:40:01 +0100
  • ec0ecfdbf4 Added: test txt file James Flynn 2021-03-20 14:03:07 +0000
  • 2a1e10dffc
    Merge pull request #6 from cheapy-issp/branch-003 abemorcardc 2021-03-18 19:45:44 +0100
  • f110d7d204 Configurado usando jsp Thiloparn 2021-03-18 19:42:04 +0100
  • fc172600be
    Merge pull request #5 from cheapy-issp/branch-001 abemorcardc 2021-03-18 18:35:31 +0100
  • a54355e7a8
    Merge pull request #3 from cheapy-issp/branch-002 abemorcardc 2021-03-18 18:33:46 +0100
  • 5317a2a58d Añadido servicio de Owner y modificados los tests abemorcardc 2021-03-18 18:32:21 +0100
  • 48ae594b90 Reorganizadas las clases y renombradas a cheapy abemorcardc 2021-03-18 00:35:57 +0100
  • 6fe1d6b1fb Eliminadas clases a excepción de Owner y las básicas abemorcardc 2021-03-17 20:39:03 +0100
  • acfba7c43b Configuracion para el funcionamiento con MySql Thiloparn 2021-03-17 20:37:28 +0100
  • 5d5b15184e
    Update readme.md Yevhenii Pokhvalii 2021-03-16 10:10:41 +0200
  • c02ddd83d1
    Jenkinsfile samgithubadmin 2021-03-16 13:03:04 +0530
  • 3640b64882 Update to Spring Boot 2.4.3 Marten Deinum 2021-03-16 08:16:09 +0100
  • e60c28e8f3
    Update maven-publish.yml Yevhenii Pokhvalii 2021-03-16 08:15:53 +0200
  • 9f96068f59
    Update maven-publish.yml Yevhenii Pokhvalii 2021-03-16 07:56:02 +0200
  • 366d8b60ea
    Update readme.md Yevhenii Pokhvalii 2021-03-16 07:45:17 +0200
  • ff08e84a12
    Create Jenkinsfile samgithubadmin 2021-03-16 10:27:04 +0530
  • 189f03e458
    Create Jenkinsfile samgithubadmin 2021-03-16 10:25:05 +0530
  • 686c2701ab
    Update maven-publish.yml Yevhenii Pokhvalii 2021-03-13 15:11:17 +0200
  • 35889a2f06
    Update maven-publish.yml Yevhenii Pokhvalii 2021-03-13 09:44:56 +0200
  • 56da004b19
    Update maven-publish.yml Yevhenii Pokhvalii 2021-03-13 08:14:28 +0200
  • a02cdce5a4
    Update maven-publish.yml Yevhenii Pokhvalii 2021-03-13 07:54:08 +0200
  • 0eac0234fb
    Update maven-publish.yml Yevhenii Pokhvalii 2021-03-13 07:53:50 +0200
  • 9c12206a4d
    Update maven-publish.yml Yevhenii Pokhvalii 2021-03-13 07:53:10 +0200
  • 44404ec886
    Update maven-publish.yml Yevhenii Pokhvalii 2021-03-13 07:51:47 +0200
  • c9aff4c00c
    Update maven-publish.yml Yevhenii Pokhvalii 2021-03-12 21:53:11 +0200
  • 65d5e16467
    Update maven-publish.yml Yevhenii Pokhvalii 2021-03-12 21:38:43 +0200
  • dac8665fa6
    Update maven-publish.yml Yevhenii Pokhvalii 2021-03-12 21:37:27 +0200
  • 348a833035
    Update maven-publish.yml Yevhenii Pokhvalii 2021-03-12 21:35:28 +0200
  • 5e19eabc85
    Update maven-publish.yml Yevhenii Pokhvalii 2021-03-12 21:28:23 +0200
  • 9328514bc5
    Update maven-publish.yml Yevhenii Pokhvalii 2021-03-12 21:28:00 +0200
  • 8650ce2b1d
    Update maven-publish.yml Yevhenii Pokhvalii 2021-03-12 20:33:34 +0200
  • ab1a6f7efe
    Update maven-publish.yml Yevhenii Pokhvalii 2021-03-12 19:37:36 +0200
  • 6aa8e65825
    Update maven-publish.yml Yevhenii Pokhvalii 2021-03-12 19:17:03 +0200
  • 2894229f08
    Update maven-publish.yml Yevhenii Pokhvalii 2021-03-12 18:34:15 +0200
  • 55dcd6fe76
    Update maven-publish.yml Yevhenii Pokhvalii 2021-03-12 18:28:56 +0200
  • 5cefb6759b
    Update maven-publish.yml Yevhenii Pokhvalii 2021-03-12 18:22:35 +0200
  • 8d624e7e8f
    Update maven-publish.yml Yevhenii Pokhvalii 2021-03-12 18:08:14 +0200
  • aad222e322
    Update maven-publish.yml Yevhenii Pokhvalii 2021-03-12 17:54:26 +0200
  • 5aeaa09487
    Update maven-publish.yml Yevhenii Pokhvalii 2021-03-12 17:51:26 +0200
  • 15bf315c2c
    Update readme.md mastanav 2021-03-12 15:54:46 +0530
  • 849bfe0f69
    Update readme.md mastanav 2021-03-12 15:44:53 +0530
  • 7e67bb9477
    Update readme.md mastanav 2021-03-12 15:39:02 +0530