Commit Graph

7287 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz fc00b3af47 Merge branch 'refactor-ticketLot-con-campo-zone' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-04-21 10:03:51 +00:00
Javi Gallego dbb2257430 test de zone_getLanded y zone_getFromGeo
gitea/salix/pipeline/head This commit looks good Details
2020-04-20 13:49:33 +02:00
Ainki 219519dc26 test, fitxures and changes
gitea/salix/pipeline/head This commit looks good Details
2020-04-17 15:28:02 +02:00
Bernat Exposito Domenech 1c757a1104 structure DB 2020-04-17 15:27:57 +02:00
Ainki ec630d6a7b cherry-pick 2020-04-17 14:49:35 +02:00
Ainki fceee0a9d6 spec 2020-04-17 14:47:50 +02:00
Ainki 07d952646a change some names an methods 2020-04-17 14:47:40 +02:00
Ainki 1063db3a2f print 2020-04-17 14:47:27 +02:00
Ainki 4927ea4ca7 sacadores 2020-04-17 14:47:19 +02:00
Ainki 6829adc897 faults 2020-04-17 14:47:10 +02:00
Ainki 60d80502d1 collection update sale 2020-04-17 14:47:01 +02:00
Ainki e893576591 first commit 2020-04-17 14:46:53 +02:00
Joan Sanchez 202ddd552f Merge branch 'app_voz' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-04-17 12:38:16 +00:00
Joan Sanchez 2ad14230b3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into app_voz
gitea/salix/pipeline/head This commit looks good Details
2020-04-17 14:22:46 +02:00
Joan Sanchez 139fb786d6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-04-09 20:06:17 +02:00
Joan Sanchez ad861c2db3 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2020-04-09 20:05:12 +02:00
Joan Sanchez 87f0a7e417 delivery-note get ticket address fix
gitea/salix/pipeline/head This commit looks good Details
2020-04-09 20:03:45 +02:00
Javi Gallego 7f6cca8094 Merge branch '2026-itemDescriptorPopoverRelocate' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-04-09 15:58:18 +00:00
Juan Ferrer 04eb9945f8 Merge, itemDiary skipped again because of crash
gitea/salix/pipeline/head This commit looks good Details
2020-04-09 16:50:41 +02:00
Juan Ferrer e3b7f81c69 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2026-itemDescriptorPopoverRelocate 2020-04-09 16:24:19 +02:00
Juan Ferrer 99813888ea Merge branch '#2174-ticket.weekly-añadir-campo-agencyModeFk' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-04-09 14:19:54 +00:00
Javi Gallego ab9e640b44 Merge branch 'dev' into #2174-ticket.weekly-añadir-campo-agencyModeFk
gitea/salix/pipeline/head This commit looks good Details
2020-04-08 13:15:17 +02:00
Javi Gallego 397872ee19 mejoradas las descripciones de los test 2020-04-08 13:15:07 +02:00
Javi Gallego 09e425c33c 2174 ticket.weekly con campo agencyModeFk con E2E
gitea/salix/pipeline/head This commit looks good Details
2020-04-08 12:33:36 +02:00
Juan Ferrer a1a460d049 gulp-jamine@4.0.0, waitForSnackbar()
gitea/salix/pipeline/head This commit looks good Details
2020-04-08 11:24:40 +02:00
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