Commit Graph

8013 Commits

Author SHA1 Message Date
Juan Ferrer 4336a303c0 Merge branch 'dev' into 2026-itemDescriptorPopoverRelocate 2020-04-07 13:03:57 +02:00
Juan Ferrer 1ec9aca603 Merge branch '#2219-Añadir-menu-wikipedia' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-04-07 10:54:10 +00:00
Javi Gallego dad77cfa08 Merge branch 'dev' into #2219-Añadir-menu-wikipedia
gitea/salix/pipeline/head This commit looks good Details
2020-04-06 12:41:07 +02:00
Javi Gallego d835dd60ed 2219 Añadir menu wikipedia 2020-04-06 12:40:21 +02:00
Juan Ferrer 7e76ef57bb Merge branch 'worker---Añadir-sección-con-enlace-a-Wikipedia' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-04-03 16:38:58 +00:00
Javi Gallego ea1cc68d29 test passed
gitea/salix/pipeline/head This commit looks good Details
2020-04-03 17:52:47 +02:00
Javi Gallego e16d1761f9 Merge branch '2215-windowsE2EFixes' into worker---Añadir-sección-con-enlace-a-Wikipedia 2020-04-03 17:32:41 +02:00
Juan Ferrer aca687bafc E2Efixes: E2E_DEBUG, client billing data skipped
gitea/salix/pipeline/head This commit looks good Details
2020-04-03 15:14:53 +02:00
Javi Gallego b6aedd2e6d Merge branch '2215-windowsE2EFixes' into worker---Añadir-sección-con-enlace-a-Wikipedia 2020-04-03 12:26:27 +02:00
Javi Gallego 0b966cbb76 Merge branch 'dev' into worker---Añadir-sección-con-enlace-a-Wikipedia 2020-04-03 08:28:49 +02:00
Juan Ferrer a33bbd428f E2E fixes
gitea/salix/pipeline/head This commit looks good Details
2020-04-02 18:55:07 +02:00
Juan Ferrer 81d50c92ae SCSS em to px: Fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-04-02 17:06:07 +02:00
Juan Ferrer d75b975b14 SCSS em to px: last refactor fixes 2020-04-02 16:29:13 +02:00
Juan Ferrer 2249f68d6e SCSS px to em: rem for font-size 2020-04-02 15:11:42 +02:00
Juan Ferrer 559cc5eb8c SCSS em to px: Second step 2020-04-02 14:52:02 +02:00
Juan Ferrer 734c86c5f5 SCSS px to em - First step 2020-04-02 14:20:57 +02:00
Juan Ferrer c43727aef9 Global style fixes px/em 2020-04-02 14:08:38 +02:00
Juan Ferrer bf68d15264 E2E expeditions fixes, scss px/em fixes 2020-04-02 11:39:39 +02:00
Juan Ferrer eb586c510e E2E focus fixes
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-04-01 16:05:43 +02:00
Juan Ferrer 43ba34c7f0 E2E skipped: Client edit billing data
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-31 18:53:25 +02:00
Juan Ferrer 326c92b23f E2E fixes: doSearch extension, item clone intermittence
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-31 18:33:48 +02:00
Juan Ferrer 7cd643c8c7 E2E fixes: waitForContentLoaded() extension
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-31 15:30:57 +02:00
Juan Ferrer 5d1e0ee682 E2E fixes: client billing data, invoiceOut descriptor
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-31 15:15:16 +02:00
Juan Ferrer d6fda676f6 E2E fixes: Client balance
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-31 10:19:01 +02:00
Juan Ferrer 425b54282a fdescribe removed
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-31 10:11:05 +02:00
Juan Ferrer 98ed5e93d5 E2E fixes: client balance, ticket index
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-31 10:02:25 +02:00
Carlos Jimenez Ruiz a7c3a7b7b5 tooltip test enabled but not yet fixed 2020-03-31 09:51:10 +02:00
Joan Sanchez e826cdfee4 Some changes
gitea/salix/pipeline/head This commit looks good Details
2020-03-31 08:18:10 +02:00
Juan Ferrer 1502592818 Focus removed
gitea/salix/pipeline/head This commit looks good Details
2020-03-30 17:32:23 +02:00
Juan Ferrer dfb9d32c2a Client & ticket E2E fixes
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-30 17:30:03 +02:00
Ainki 42f3bfb86d test, fitxures and changes
gitea/salix/pipeline/head This commit looks good Details
2020-03-30 14:28:29 +02:00
Javi Gallego 5909a77587 Merge branch 'zone-deliveryDays-quitar-campo-provincia' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-30 10:34:18 +00:00
Javi Gallego 324261dc74 Merge branch 'dev' into zone-deliveryDays-quitar-campo-provincia
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-30 12:22:09 +02:00
Joan Sanchez 50c6c2d87b Merge branch '2208-ticket_summary' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 11:24:37 +00:00
Javi Gallego 729daf8b34 Merge branch 'dev' into zone-deliveryDays-quitar-campo-provincia
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 12:16:47 +01:00
Javi Gallego 0f977a632f test front arreglados por el cambio de hora
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 12:01:09 +01:00
Joan Sanchez 59fadf410e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2208-ticket_summary
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 11:45:10 +01:00
Carlos Jimenez Ruiz f5399e1d86 Merge branch '1934-ticket_stowaway' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 10:42:33 +00:00
Joan Sanchez d640b66ef5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1934-ticket_stowaway
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 11:22:00 +01:00
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