7457 Commits

All Branches

Search

Author	SHA1	Message	Date
Bernat Exposito Domenech	aac47e52e9	update log	2020-06-02 11:15:07 +02:00
Joan Sanchez	a0767a6ea2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2265-item_request_filters	2020-06-02 10:56:40 +02:00
Bernat Exposito	0fe2212f64	Merge pull request '2282-setDeleted_stowaway' (#287) from 2282-setDeleted_stowaway into dev ... Reviewed-by: Bernat Exposito <bernat@verdnatura.es>	2020-06-02 08:24:59 +00:00
Bernat Exposito Domenech	3bfee6d0fd	fix zone descriptor	2020-06-02 10:17:46 +02:00
Joan Sanchez	21bb4a778c	Merge pull request '2278-ticket_summary_invoiceOut' (#286) from 2278-ticket_summary_invoiceOut into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-02 08:11:44 +00:00
Joan Sanchez	1926f90f4b	Merge pull request 'add column in ticket split' (#279) from 2236-ticket_sale_split into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-02 07:47:50 +00:00
Joan Sanchez	1e4f36b775	Updated back unit test	2020-06-02 09:34:42 +02:00
Bernat Exposito Domenech	0251ff9bc9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2278-ticket_summary_invoiceOut	2020-06-02 09:04:09 +02:00
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	c5d9f1bbe9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test	2020-06-01 13:39:24 +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
Joan Sanchez	afa8aad96b	Changed closure procedure	2020-06-01 13:19:08 +02:00
Joan Sanchez	554619093c	Changed closure procedure	2020-06-01 12:50:50 +02:00
Joan Sanchez	052c51cee5	2282 - Change stowaway state to FIXING	2020-06-01 12:47:04 +02:00
Bernat Exposito Domenech	c4be76977d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2278-ticket_summary_invoiceOut	2020-06-01 08:24:27 +02:00
Joan Sanchez	b411f49805	Updated to node LTS version	2020-05-30 16:51:41 +02:00
Joan Sanchez	2e2e8cf957	Updated node LTS version	2020-05-30 16:32:05 +02:00
Joan Sanchez	3f1109aee3	Test changes	2020-05-29 12:10:04 +02:00
Joan Sanchez	90ae1562dd	Added filters	2020-05-29 11:10:58 +02:00
Joan Sanchez	d9080be7c8	Merge pull request '2057_e2e_address_create_custom_agent' (#284) from 2057_e2e_address_create_custom_agent into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-05-28 09:04:42 +00: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	e6c813b63a	Merge pull request '2205 - Prevent relations to being logged in' (#281) from 2205-loggable_relations_fix into dev ... Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-05-28 06:30:28 +00:00
Joan Sanchez	5c3e8e9465	Added insert ignore	2020-05-28 08:09:12 +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
Joan Sanchez	0fe78a2b8f	2176 - Added contextmenu	2020-05-28 08:07:26 +02:00
Joan Sanchez	dfa6472fcf	Merge pull request 'now we can create thermographs for travelThermograph' (#283) from 2269_thermograph_create into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-05-27 13:11:21 +00: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
Bernat Exposito Domenech	f28f88a100	ticket summary invoiceOut popover	2020-05-27 12:29:01 +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
Bernat Exposito Domenech	89ce963a4c	update db	2020-05-27 08:35:24 +02:00
Bernat Exposito Domenech	8be929c1da	log tiquet request	2020-05-27 08:07:14 +02:00
Joan Sanchez	8b9b65138c	Merge pull request 'Change visible & available methods' (#278) from 2234-getVisibleAvailable into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-05-27 05:44:08 +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	3cd4ab086d	Fix	2020-05-26 15:49:20 +02:00
Joan Sanchez	8384918d9e	Removed line	2020-05-26 14:42:45 +02:00
Joan Sanchez	d24f04912e	2205 - Prevent relations to being logged in	2020-05-26 14:37:34 +02:00
Bernat Exposito Domenech	60d50afb2e	fix traduction	2020-05-26 12:20:06 +02:00
Joan Sanchez	731e411cf8	Merge pull request '2204-dbtest_zone_getEvents' (#280) from 2204-dbtest_zone_getEvents into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-05-26 10:16:05 +00:00
Bernat Exposito Domenech	e515e5df7a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2204-dbtest_zone_getEvents	2020-05-26 12:08:01 +02:00
Bernat Exposito Domenech	41bf237289	dbtest zone_getEvent	2020-05-26 12:07:52 +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
Joan Sanchez	193a104552	Merge pull request '2274 - Added english translation' (#275) from 2274-delivery_note_translation into dev ... Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-05-26 09:38:59 +00:00
Javi Gallego	5188f80da5	Merge branch 'dev' into 2234-getVisibleAvailable	2020-05-26 10:47:48 +02:00