Commit Graph

7217 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz 6bcda6a8b0 Merge branch '2203-ticket_sale' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 10:18:58 +00:00
Bernat Exposito Domenech 74b27778ab add phones in ticket summary
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 11:10:20 +01:00
Joan Sanchez 598ebe96d1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2203-ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 11:06:35 +01:00
Carlos Jimenez Ruiz 1f0e8b2584 Merge branch '2206-zone_delivery_days' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 10:05:16 +00:00
Joan Sanchez ef960f6e0f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2206-zone_delivery_days
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 10:55:10 +01:00
Joan Sanchez 0b168fa7ee Merge branch '2178_ticket_index_payout' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 09:50:51 +00:00
Joan Sanchez 6a66f47cc1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2178_ticket_index_payout
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 10:19:47 +01:00
Carlos Jimenez Ruiz eb6c3596b8 Merge branch '2139-oder_catalog_searchbar' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 09:17:53 +00:00
Joan Sanchez 64718b5977 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2139-oder_catalog_searchbar
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 10:01:03 +01:00
Carlos Jimenez Ruiz 4691f5e916 Merge branch '2195-setDeleted_itemShelving' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 08:57:37 +00:00
Joan Sanchez d4ca58edad Updated back unit test
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 09:10:30 +01:00
Javi Gallego 0a8272a730 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into zone-deliveryDays-quita
gitea/salix/pipeline/head This commit looks good Details
2020-03-26 17:52:41 +01:00
Javi Gallego d53cedd5d4 preparado para PR
gitea/salix/pipeline/head This commit looks good Details
2020-03-26 17:41:40 +01:00
Joan Sanchez 835c415ba7 1934 - Moved procedure logic to method
gitea/salix/pipeline/head This commit has test failures Details
2020-03-26 14:45:38 +01:00
Bernat Exposito Domenech 6928092594 fix ticket.sale state autocomplete
gitea/salix/pipeline/head This commit looks good Details
2020-03-26 12:00:07 +01:00
Joan Sanchez 92ffccc9a2 2206 - Refactor popover table
gitea/salix/pipeline/head This commit looks good Details
2020-03-26 09:07:17 +01:00
Juan Ferrer 0bd09492d1 #2026 Implemented & tests passed
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 20:44:59 +01:00
Joan Sanchez f231fabef1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2195-setDeleted_itemShelving
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 16:14:13 +01:00
Carlos Jimenez Ruiz efcecd0995 Merge branch '2132-extend_from_section' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 15:12:48 +00:00
Joan Sanchez 81d0f5bf07 Removed focus
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 16:08:18 +01:00
Joan Sanchez e71ace6da7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 15:59:41 +01:00
Carlos Jimenez Ruiz f06c7d3d47 front test
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 15:17:43 +01:00
Carlos Jimenez Ruiz 9b4546edad minor refactor plus path fix after merge
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-25 14:18:51 +01:00
Joan Sanchez 2b7ff6fec0 Removed state vars
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 14:08:45 +01:00
Joan Sanchez e94cb7fecd Removed commented lines
gitea/salix/pipeline/head Build queued... Details
2020-03-25 14:07:35 +01:00
Joan Sanchez 90b437c7ad Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 14:06:13 +01:00
Joan Sanchez c8b6c3f7f3 Fixed conflicts
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-25 13:44:51 +01:00
Joan Sanchez 5b5d7787ee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2139-oder_catalog_searchbar 2020-03-25 09:25:26 +01:00
Joan Sanchez 61c85cfb9e Updated tests
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 09:20:26 +01:00
Carlos Jimenez Ruiz e6c5ea8cb9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2178_ticket_index_payout 2020-03-25 09:08:33 +01:00
Bernat Exposito 77e8bbc2ce Merge branch '2182_worker_log' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 07:53:23 +00:00
Bernat Exposito Domenech dcdae825d2 fixex pull request
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 08:43:49 +01:00
Carlos Jimenez Ruiz fdca44325a Merge branch 'e2eFixes' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-24 16:46:42 +00:00
Javi Gallego 0561f19313 version 1
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-24 17:34:23 +01:00
Javi Gallego a30a4bf961 quitado el campo provincia
gitea/salix/pipeline/head This commit looks good Details
2020-03-24 17:32:30 +01:00
Juan Ferrer 2ec1a5d450 Merge branch 'e2eFixes' of https://gitea.verdnatura.es/verdnatura/salix into e2eFixes
gitea/salix/pipeline/head This commit looks good Details
2020-03-24 17:27:55 +01:00
Juan Ferrer 8eb6590285 E2E fixes 2020-03-24 17:27:21 +01:00
Carlos Jimenez Ruiz 12c2b577e6 minor refactor
gitea/salix/pipeline/head This commit looks good Details
2020-03-24 17:01:11 +01:00
Carlos Jimenez Ruiz 3283f957ba corrected a typo
gitea/salix/pipeline/head This commit looks good Details
2020-03-24 16:51:21 +01:00
Carlos Jimenez Ruiz 4f7e56788e replaced expectURL for waitForState in most cases
gitea/salix/pipeline/head This commit looks good Details
2020-03-24 16:49:36 +01:00
Joan Sanchez 2ed9cbd402 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2139-oder_catalog_searchbar 2020-03-24 16:02:58 +01:00
Juan Ferrer a52fcb587a drop-down e2e fix
gitea/salix/pipeline/head This commit looks good Details
2020-03-24 14:10:07 +01:00
Bernat Exposito Domenech 423f59dfb0 worker log
gitea/salix/pipeline/head This commit looks good Details
2020-03-24 12:20:53 +01:00
Juan Ferrer 68a4ed0f10 Some E2E timeouts removed
gitea/salix/pipeline/head This commit looks good Details
2020-03-24 11:12:59 +01:00
Carlos Jimenez Ruiz acf8c117b0 small spec fixes
gitea/salix/pipeline/head This commit looks good Details
2020-03-24 10:48:16 +01:00
Juan Ferrer c254604572 E2E fixes
gitea/salix/pipeline/head This commit has test failures Details
2020-03-24 00:54:12 +01:00
Juan Ferrer 84bf240e71 All tests passed, but some intermittence in e2e
gitea/salix/pipeline/head This commit has test failures Details
2020-03-23 23:57:11 +01:00
Juan Ferrer efbda0d5c0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into e2eFixes 2020-03-23 21:09:40 +01:00
Joan Sanchez 9bae89a672 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-03-23 16:03:27 +01:00
Joan Sanchez 0793588ef3 Merge branch 'Desplegar-unicamente-agencias-disponibles' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-23 14:21:50 +00:00