Commit Graph

7255 Commits

Author SHA1 Message Date
Joan Sanchez 1f2dee9c12 Merge pull request 'update structure and fix test' (#252) from 2241-production_export into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-05-18 06:23:09 +00:00
Bernat Exposito Domenech 5ceb26c6da update structure and fix test
gitea/salix/pipeline/head This commit looks good Details
2020-05-15 13:11:23 +02:00
Joan Sanchez 6692ac2e02 Merge pull request '2223 Added pickup checkbox' (#251) from 2223-claim_action_pickup into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-05-14 15:41:30 +00:00
Joan Sanchez 9b085d13e1 Updated back unit test
gitea/salix/pipeline/head This commit looks good Details
2020-05-14 17:32:52 +02:00
Joan Sanchez 2bb17f4a00 Requested changes
gitea/salix/pipeline/head This commit has test failures Details
2020-05-14 17:15:54 +02:00
Joan Sanchez e51341102b Updated e2e
gitea/salix/pipeline/head This commit looks good Details
2020-05-14 14:30:43 +02:00
Joan Sanchez 62d27e45e2 Updated unit tests
gitea/salix/pipeline/head This commit has test failures Details
2020-05-14 14:01:34 +02:00
Joan Sanchez 94a219760c 2223 Added pickup checkbox
gitea/salix/pipeline/head There was a failure building this commit Details
2020-05-13 15:04:57 +02:00
Juan Ferrer 58be5ef78e Merge branch '#2224-item.diary-directiva-$anchorScroll' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-05-08 10:16:31 +00:00
Javi Gallego 9f339c6a11 Merge branch 'refactor-test-front-filters' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-05-07 09:28:11 +00:00
Javi Gallego 8453d25852 #2224item.diary provar directiva $anchorScroll
gitea/salix/pipeline/head This commit looks good Details
2020-05-06 18:42:50 +02:00
Joan Sanchez 71b0f38b53 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit has test failures Details
2020-05-03 14:56:04 +02:00
Joan Sanchez 134b4be136 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2020-05-03 14:47:51 +02:00
Joan Sanchez d960ac7d84 Removed max auth attempts
gitea/salix/pipeline/head This commit looks good Details
2020-05-03 14:30:19 +02:00
Javi Gallego 7e895749eb sin use strict
gitea/salix/pipeline/head This commit looks good Details
2020-04-30 08:18:40 +02:00
Javi Gallego 7da7e6cfaf test
gitea/salix/pipeline/head This commit looks good Details
2020-04-30 08:13:25 +02:00
Javi Gallego ceb3d1f4cf all filters tested 2020-04-30 07:20:43 +02:00
Javi Gallego bb66e578d7 Merge branch '#2222-ticket.index-modificar-orden-de-las-secciones' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-04-27 12:24:11 +00:00
Javi Gallego 6dacf20bd9 ticket.index modificar orden de las secciones
gitea/salix/pipeline/head This commit looks good Details
2020-04-23 17:59:46 +02:00
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