1955 Commits

Author	SHA1	Message	Date
Bernat Exposito Domenech	546272cc3f	zone delete	2020-06-02 08:59:04 +02:00
Juan Ferrer	3e5bab41d3	Merge branch 'test' into dev	2020-06-01 13:47:33 +02:00
Juan Ferrer	3fcb76246d	Merge branch 'master' into test	2020-06-01 13:38:59 +02:00
Joan Sanchez	3d8bc3b7b4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-06-01 13:32:35 +02:00
Joan Sanchez	c188da88e8	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2020-06-01 13:31:08 +02:00
Carlos Jimenez Ruiz	9deb518064	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2057_e2e_address_create_custom_agent	2020-05-28 09:55:05 +02:00
Carlos Jimenez Ruiz	9bf509cd5d	customs agent e2e path + small fixes	2020-05-28 09:54:31 +02:00
Joan Sanchez	a3e7771295	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2205-loggable_relations_fix	2020-05-28 08:08:00 +02:00
Carlos Jimenez Ruiz	a858e51aee	removed unused code	2020-05-27 14:54:54 +02:00
Carlos Jimenez Ruiz	296967ab4b	fixed a front unit test with jest.fn() as spy	2020-05-27 14:54:29 +02:00
Carlos Jimenez Ruiz	dfa74221dd	added crud model to preload autocompletes on demand + e2e path done	2020-05-27 14:34:34 +02:00
Carlos Jimenez Ruiz	2345a922c8	now we can create thermographs for travelThermograph	2020-05-27 13:11:41 +02:00
Carlos Jimenez Ruiz	98157fc45a	Merge pull request '2141-print_reply_to' (#272) from 2141-print_reply_to into dev ... Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-05-27 07:10:27 +00:00
Joan Sanchez	6d94894b73	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2234-getVisibleAvailable	2020-05-27 07:24:33 +02:00
Joan Sanchez	d24f04912e	2205 - Prevent relations to being logged in	2020-05-26 14:37:34 +02:00
Joan Sanchez	14251e5a0c	Merge pull request '2262-catalog_remove_tag' (#276) from 2262-catalog_remove_tag into dev ... Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-05-26 09:39:47 +00:00
Javi Gallego	5188f80da5	Merge branch 'dev' into 2234-getVisibleAvailable	2020-05-26 10:47:48 +02:00
Javi Gallego	d8871c0bce	cr	2020-05-26 10:37:52 +02:00
Bernat Exposito	17ef761ba4	Merge pull request '2226-item_last_entries' (#271) from 2226-item_last_entries into dev ... Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-05-26 07:59:17 +00:00
Carlos Jimenez Ruiz	d02655d4d3	Merge pull request '2273 - Fixed transfer sales' (#273) from 2273-transfer_sales_fix into dev ... Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-05-25 12:58:08 +00:00
Joan Sanchez	73a6148a77	2273 - Fixed transfer sales	2020-05-25 14:45:26 +02:00
Joan Sanchez	d60f8721f1	1490 - Don't update with empty value	2020-05-25 13:49:24 +02:00
Joan Sanchez	2af39d4b67	Updated unit tests	2020-05-25 07:43:24 +02:00
Joan Sanchez	4878c0dc46	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2141-print_reply_to	2020-05-25 07:25:21 +02:00
Joan Sanchez	e9e7ae08f2	Locale refactor	2020-05-22 15:20:55 +02:00
Javi Gallego	0f718ad065	Merge branch 'dev' into 2242-test	2020-05-22 07:56:00 +02:00
Bernat Exposito Domenech	8c2f57e380	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2226-item_last_entries	2020-05-21 15:26:04 +02:00
Bernat Exposito Domenech	52241e6f2c	update itemLastENtries	2020-05-21 15:26:00 +02:00
Joan Sanchez	ce43c1f2d9	Merge pull request '2264-travel_summary' (#265) from 2264-travel_summary into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-05-21 12:27:14 +00:00
Joan Sanchez	9a43dff1fd	Removed console.log()	2020-05-21 14:22:22 +02:00
Joan Sanchez	9a0c9d3da2	2262 Remove filter by id from searchbar	2020-05-21 14:18:24 +02:00
Joan Sanchez	aa95a9f984	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-05-21 12:33:01 +02:00
Joan Sanchez	d082f5d6c2	2225 Prevent location override	2020-05-21 11:14:34 +02:00
Carlos Jimenez Ruiz	245827e8d5	corrected a typo	2020-05-21 09:28:50 +02:00
Joan Sanchez	f6efa7160e	2141 ReplyTo param	2020-05-20 16:23:53 +02:00
Bernat Exposito Domenech	8ca12d9fdd	fix bugs in travel summary	2020-05-20 13:19:02 +02:00
Carlos Jimenez Ruiz	55c4ccdb29	Merge pull request 'searchbar translates' (#261) from 2247-refactor_searchBar into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es> Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-05-20 08:40:02 +00:00
Bernat Exposito Domenech	a0f5f073a5	fix order traduction	2020-05-20 10:26:29 +02:00
Bernat Exposito Domenech	4133021e5c	fix translate on plural	2020-05-20 08:52:20 +02:00
Javi Gallego	670c5936ce	test2	2020-05-19 13:11:22 +02:00
Javi Gallego	529bd5673c	test	2020-05-19 13:06:59 +02:00
Juan Ferrer	ad1c677280	Test focus removed & fixes	2020-05-19 12:50:43 +02:00
Juan Ferrer	c998097ba1	Merge branch 'dev' into 1882-descriptorRefactor	2020-05-19 12:30:00 +02:00
Javi Gallego	3774d1dd1f	Merge branch 'dev' into 2242-test	2020-05-19 12:22:47 +02:00
Javi Gallego	692af6078c	Merge pull request 'Tarea-#2242-zone-upcomingDeliveries' (#260) from Tarea-#2242-zone-upcomingDeliveries into dev ... Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2020-05-19 10:21:33 +00:00
Javi Gallego	ff03133277	test	2020-05-19 12:21:02 +02:00
Juan Ferrer	e7cf060e12	Merge fixes	2020-05-19 10:51:50 +02:00
Bernat Exposito Domenech	d289c17530	searchbar translates	2020-05-19 10:27:22 +02:00
Juan Ferrer	d7f2e686b1	Merge branch 'dev' into 1882-descriptorRefactor	2020-05-19 09:28:50 +02:00
Javi Gallego	a7e6e3d4b7	cr juan	2020-05-19 08:46:42 +02:00