7802 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	519580161e	Merge pull request '2387-zone_delete_fix' (#355) from 2387-zone_delete_fix into dev ... Reviewed-on: #355 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-08-20 10:52:19 +00:00
Joan Sanchez	80e1577d4f	Updated e2e	2020-08-20 09:50:22 +02:00
Joan Sanchez	4d8a84e774	Fixed back unit tests	2020-08-20 08:45:03 +02:00
Joan Sanchez	7fdfd92a1c	Removed sql	2020-08-19 13:13:16 +02:00
Joan Sanchez	f0818acf32	2387 - Fixed error when deleting a zone	2020-08-19 13:04:12 +02:00
Joan Sanchez	904db8e2f8	Merge pull request '1361 - Añadir filtro por año' (#348) from 1361-calendar_date_filter into dev ... Reviewed-on: #348	2020-08-18 12:18:27 +00:00
Joan Sanchez	a3d3ed4aba	Fixed unit test	2020-08-18 14:14:34 +02:00
Joan Sanchez	55b3e962a4	Merge branch 'dev' into 1361-calendar_date_filter	2020-08-18 12:03:31 +00:00
Joan Sanchez	cacf562954	Audit fix	2020-08-18 14:01:43 +02:00
Joan Sanchez	1990f5172c	Removed focus	2020-08-18 13:57:34 +02:00
Joan Sanchez	1bcf4ff8a6	Descomentado test	2020-08-18 13:55:38 +02:00
Joan Sanchez	540d5e9e71	Fixed errors	2020-08-18 13:50:08 +02:00
Joan Sanchez	911ef3f11a	Merge pull request '2324-ticket_problems' (#354) from 2324-ticket_problems into dev ... Reviewed-on: #354 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-08-18 08:34:15 +00:00
Joan Sanchez	10aed9d40d	Merge branch 'dev' into 2324-ticket_problems	2020-08-17 12:33:05 +00:00
Joan Sanchez	f13c47ce6d	Ticket problems filter fix	2020-08-17 14:31:26 +02:00
Joan Sanchez	b382e765a0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-08-17 10:10:17 +02:00
Joan Sanchez	dd5e71c9fc	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2020-08-17 09:42:29 +02:00
Carlos Jimenez Ruiz	dd94b35a25	Merge pull request '2330-Implement_print_service_testing' (#351) from 2330-Implement_print_service_testing into dev ... Reviewed-on: #351 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-08-14 17:09:21 +00:00
Carlos Jimenez Ruiz	0e4fc7e2bd	removed unused code.	2020-08-14 18:43:57 +02:00
Carlos Jimenez Ruiz	69cc18be12	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2330-Implement_print_service_testing	2020-08-14 18:42:51 +02:00
Carlos Jimenez Ruiz	a679ebfce8	quick fix for updateClaim from other branch	2020-08-14 18:42:45 +02:00
Carlos Jimenez Ruiz	eb5772e869	Merge pull request 'section no longer nukes salesPerson-user relation' (#353) from 2365-claim_descriptor_bug into dev ... Reviewed-on: #353 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-08-14 16:30:23 +00:00
Carlos Jimenez Ruiz	8141815fe1	upgraded babel preset env due to a deprecation	2020-08-14 18:20:54 +02:00
Carlos Jimenez Ruiz	b711728999	ultimate edition deluxe	2020-08-14 17:47:13 +02:00
Carlos Jimenez Ruiz	3df9ae2946	section no longer nukes salesPerson-user relation	2020-08-14 17:10:59 +02:00
Javi Gallego	3e143495b4	Merge pull request '2263_e2e_zone_descriptor' (#352) from 2263_e2e_zone_descriptor into dev ... Reviewed-on: #352 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-08-14 13:57:46 +00:00
Carlos Jimenez Ruiz	3a723a2e3d	zone descriptor e2e	2020-08-14 15:35:50 +02:00
Carlos Jimenez Ruiz	3cfca5690f	minor refactor	2020-08-14 12:02:27 +02:00
Carlos Jimenez Ruiz	caf5ad7a63	the fdescribe wasn't needed at all XD	2020-08-14 11:57:53 +02:00
Carlos Jimenez Ruiz	69ddf3a615	e2e path nearly as completed	2020-08-14 11:57:16 +02:00
Carlos Jimenez Ruiz	3010dace1a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2263_e2e_zone_descriptor	2020-08-14 09:28:17 +02:00
Carlos Jimenez Ruiz	9a9ef5c03f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1361-calendar_date_filter	2020-08-14 09:23:33 +02:00
Carlos Jimenez Ruiz	f7089f3806	#2390-calendar_date_filter e2e	2020-08-14 09:23:23 +02:00
Joan Sanchez	a10e091b62	Added limit	2020-08-13 16:26:35 +02:00
Joan Sanchez	7a3de746cc	Added limit	2020-08-13 14:00:40 +02:00
Joan Sanchez	49af185976	updated path	2020-08-13 13:47:11 +02:00
Joan Sanchez	bbf15da16f	Changed tmp uri	2020-08-13 13:38:52 +02:00
Joan Sanchez	c0794808f0	Updated tmp directory	2020-08-13 13:09:53 +02:00
Joan Sanchez	c9ed17d981	Changes to dowload item photos endpoint	2020-08-13 12:16:25 +02:00
Carlos Jimenez Ruiz	a9beb20469	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2330-Implement_print_service_testing	2020-08-13 10:10:47 +02:00
Carlos Jimenez Ruiz	f38701bb43	unit testing filter	2020-08-13 10:03:50 +02:00
Joan Sanchez	88c5b6f8a6	Changed ticket problems min date	2020-08-13 08:23:55 +02:00
Carlos Jimenez Ruiz	0e4927d2ba	Merge pull request '2388_export-structure' (#350) from 2388_export-structure into dev ... Reviewed-on: #350 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-08-12 23:07:51 +00:00
Bernat Exposito Domenech	689245c27d	fix test	2020-08-12 14:23:13 +02:00
Bernat Exposito Domenech	a523030c54	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2388_export-structure	2020-08-12 14:22:55 +02:00
Bernat Exposito Domenech	f180b73656	delete deprecated sql	2020-08-12 13:18:55 +02:00
Bernat Exposito Domenech	1e56619c33	export structure and fix test	2020-08-12 13:07:58 +02:00
Joan Sanchez	de1a70aee7	Merge pull request '2384 - Searchbar filters fixed' (#349) from 2384-client_consumption into dev ... Reviewed-on: #349 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-08-12 10:06:55 +00:00
Joan Sanchez	1486cbb4e7	Updated unit test	2020-08-12 12:00:46 +02:00
Joan Sanchez	de9d1268b7	Updated unit test	2020-08-12 11:38:39 +02:00