8929 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Padawan	7408d22b66	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date	2021-02-01 09:05:06 +01:00
Joan Sanchez	3ec55426ae	Removed params due a docker error	2021-02-01 07:21:36 +01:00
Carlos Jimenez Ruiz	de5984cf0d	Merge pull request '2748 - Added module keybinds' (#529) from 2748-keybinds into dev ... Reviewed-on: #529 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-01-29 13:39:20 +00:00
Carlos Jimenez Ruiz	47e2319dfc	Merge branch 'dev' into 2748-keybinds	2021-01-29 13:33:45 +00:00
Joan Sanchez	57c124b936	Updated config params	2021-01-29 10:03:18 +01:00
Joan Sanchez	f66a5ecfdc	2748 - Added module keybinds	2021-01-29 09:46:57 +01:00
Carlos Jimenez Ruiz	0c8d2997e1	Merge pull request '2580-fetched_tags_refactor' (#527) from 2580-fetched_tags_refactor into dev ... Reviewed-on: #527 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-01-28 16:11:19 +00:00
Carlos Jimenez Ruiz	5d82d469a7	Merge branch 'dev' into 2580-fetched_tags_refactor	2021-01-28 16:04:37 +00:00
Carlos Jimenez Ruiz	5384c2b217	Merge pull request '2476 - downloadImages() method refactor' (#528) from 2476-floramondo_refactor into dev ... Reviewed-on: #528 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-01-28 16:03:28 +00:00
Joan Sanchez	7bcbf5303e	Fix where	2021-01-28 16:08:57 +01:00
Joan Sanchez	ade2d9f4a2	Removed catch	2021-01-28 16:01:49 +01:00
Joan Sanchez	9d5d2e9177	Added method prune again	2021-01-28 15:57:33 +01:00
Carlos Jimenez Ruiz	4ab42e5850	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2580-fetched_tags_refactor	2021-01-28 15:10:54 +01:00
Carlos Jimenez Ruiz	5c466e1163	vn-fetched-tags visual refactor	2021-01-28 15:10:47 +01:00
Joan Sanchez	ca47fe6827	2476 - downloadImages() method refactor	2021-01-28 12:23:18 +01:00
Joan Sanchez	7b85b968f2	Merge pull request 'fix test updateVolume' (#525) from 2735-test_route_updateVolume into dev ... Reviewed-on: #525 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-01-27 06:25:12 +00:00
Joan Sanchez	e86deee03c	Merge branch 'dev' into 2735-test_route_updateVolume	2021-01-27 06:10:21 +00:00
Joan Sanchez	30e8d7291e	Merge pull request 'export production' (#526) from 2756-export_production into dev ... Reviewed-on: #526 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-01-27 06:08:25 +00:00
Bernat Exposito	01c96272bd	export production	2021-01-26 10:55:30 +01:00
Bernat Exposito	df073094f8	fix test updateVolume	2021-01-26 09:07:00 +01:00
Joan Sanchez	5e0f594234	Merge pull request '2745-ticket_descriptor_regenerate_invoice_e2e' (#522) from 2745-ticket_descriptor_regenerate_invoice_e2e into dev ... Reviewed-on: #522 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-01-25 09:54:34 +00:00
Carlos Jimenez Ruiz	3f12bfe8ae	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2745-ticket_descriptor_regenerate_invoice_e2e	2021-01-25 09:28:07 +01:00
Carlos Jimenez Ruiz	fb798f4300	regenerate invoice added to descriptor path	2021-01-25 09:28:01 +01:00
Joan Sanchez	7bd89009cb	Requested changes	2021-01-25 07:26:35 +01:00
Joan Sanchez	257b61d256	Requested changes	2021-01-25 07:25:02 +01:00
Javi Gallego	e48f4cb417	Merge pull request '2479-factura-ticket' (#521) from 2479-factura-ticket into dev ... Reviewed-on: #521 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-01-22 15:15:46 +00:00
Javi Gallego	e1711af265	sin keep	2021-01-22 14:32:35 +01:00
Javi Gallego	228a642634	Merge branch 'dev' into 2479-factura-ticket	2021-01-22 14:31:28 +01:00
Javi Gallego	7bdfb36f25	minor refactor	2021-01-22 14:30:46 +01:00
Joan Sanchez	4d1c2ff8ee	Requested changed	2021-01-22 12:57:21 +01:00
Joan Sanchez	d26505d25e	Requested changed	2021-01-22 12:56:46 +01:00
Joan Sanchez	51d1a826a5	Merge pull request '2677 - Added rating component to order catalog' (#520) from 2677-rating_component into dev ... Reviewed-on: #520 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-01-22 11:41:42 +00:00
Carlos Jimenez Ruiz	9a349e789c	added missin icon property to fixedPrice route	2021-01-22 12:15:03 +01:00
Carlos Jimenez Ruiz	293dbb3948	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2677-rating_component	2021-01-22 12:14:19 +01:00
Joan Sanchez	ad7be8f9b4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-01-22 07:27:51 +01:00
Joan Sanchez	1c7325c1c0	2739 - Invoice fix	2021-01-22 07:26:29 +01:00
Bernat Exposito	030c87217a	Merge pull request 'order index changes' (#517) from 2717-order_index into dev ... Reviewed-on: #517 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-01-21 20:21:25 +00:00
Bernat Exposito	b25ef7016a	cr changes	2021-01-21 18:42:40 +01:00
Javi Gallego	aab9797d3f	Merge branch 'dev' into 2479-factura-ticket	2021-01-21 13:40:55 +01:00
Javi Gallego	3dc50e8a16	test ok	2021-01-21 13:39:40 +01:00
Joan Sanchez	5e4c320310	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2677-rating_component	2021-01-21 09:26:02 +01:00
Joan Sanchez	db95f136a8	Updated selector	2021-01-21 09:04:53 +01:00
Bernat Exposito	eda65c14c1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2717-order_index	2021-01-21 08:48:24 +01:00
Carlos Jimenez Ruiz	f983edf77e	Merge pull request '2609-travel_index_addEntry + e2e' (#499) from 2609-travel_index_addEntry into dev ... Reviewed-on: #499 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-01-20 20:04:10 +00:00
Carlos Jimenez Ruiz	e917955404	e2e tests for travel add entry	2021-01-20 20:28:22 +01:00
Carlos Jimenez Ruiz	17b7ffeec3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2609-travel_index_addEntry	2021-01-20 16:04:13 +01:00
Carlos Jimenez Ruiz	4fa4119424	Merge pull request '2564-item_priceFixed + e2e' (#513) from 2564-item_priceFixed into dev ... Reviewed-on: #513 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-01-20 14:34:04 +00:00
Joan Sanchez	c8ecdfe380	Worker photo max width and height	2021-01-20 15:00:44 +01:00
Carlos Jimenez Ruiz	2f5eaf7318	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed	2021-01-20 14:51:37 +01:00
Carlos Jimenez Ruiz	01191b3f0f	excluded faling tests for future fixing	2021-01-20 14:43:20 +01:00