9936 Commits

All Branches

Search

Author	SHA1	Message	Date
jorgebl	868a0dbff7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys	2021-03-23 09:43:34 +01:00
Joan Sanchez	241ef6d467	Merge pull request '2843-claim_pickup_order' (#579) from 2843-claim_pickup_order into dev ... Reviewed-on: #579 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-03-22 16:38:56 +00:00
Joan Sanchez	e4685bb4e4	Merge branch 'dev' into 2843-claim_pickup_order	2021-03-22 16:36:45 +00:00
Joan Sanchez	321fe07742	Merge pull request 'Changed message' (#580) from 2794-ticket_descriptor into dev ... Reviewed-on: #580 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-03-22 16:35:21 +00:00
Carlos Jimenez Ruiz	84378fd607	tickets already in route are no longer shown + tests	2021-03-22 16:13:12 +01:00
jorgebl	e96fd3d1f7	Changed message	2021-03-22 16:11:52 +01:00
Carlos Jimenez Ruiz	0023a88bfc	restored the auto state to its previous version	2021-03-22 11:32:57 +01:00
jorgebl	fb5af479e3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2843-claim_pickup_order	2021-03-22 10:58:13 +01:00
jorgebl	7e903f91a5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys	2021-03-22 10:32:33 +01:00
Carlos Jimenez Ruiz	1e247e63a9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor	2021-03-22 10:32:07 +01:00
Joan Sanchez	eb12126603	Rollback test changes	2021-03-22 10:27:07 +01:00
Carlos Jimenez Ruiz	584947c52c	Merge pull request '2669 - Changes to the translate values function' (#577) from 2669-loggable_refactor into dev ... Reviewed-on: #577 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-03-22 09:24:50 +00:00
jorgebl	322a12e65c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys	2021-03-22 10:24:01 +01:00
jorgebl	5f95bf4e15	Removed vn-horizontal and styles in the spans	2021-03-22 10:23:52 +01:00
Joan Sanchez	6da84e46c1	Added throw error	2021-03-22 10:20:04 +01:00
jorgebl	b7b86cd719	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys	2021-03-22 09:39:06 +01:00
Joan Sanchez	985bcc61b1	Rollback	2021-03-22 09:11:02 +01:00
Joan Sanchez	59bf458ca5	Removed xdescribe	2021-03-22 09:10:45 +01:00
Joan Sanchez	29979d5367	Rollback	2021-03-22 09:10:12 +01:00
Joan Sanchez	7ac4d67f97	Empty value not being logged in	2021-03-22 09:08:27 +01:00
Joan Sanchez	6210e60896	2669 - Changes to the translate values function	2021-03-19 19:20:19 +01:00
Carlos Jimenez Ruiz	674d5df96c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor	2021-03-18 15:03:00 +01:00
Carlos Jimenez Ruiz	447eec9289	Merge pull request '2817 Change message on ticket request and show url of item' (#573) from 2817-translate_ticket_request_message into dev ... Reviewed-on: #573 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-03-18 14:02:21 +00:00
jorgebl	18a9d0c786	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys	2021-03-18 13:48:37 +01:00
jorgebl	7dcaa88674	Merge branch '2817-translate_ticket_request_message' of https://gitea.verdnatura.es/verdnatura/salix into 2817-translate_ticket_request_message	2021-03-18 13:42:12 +01:00
jorgebl	e12be7bf0d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2817-translate_ticket_request_message	2021-03-18 13:40:56 +01:00
Joan Sanchez	d40da2a630	Merge branch 'dev' into 2817-translate_ticket_request_message	2021-03-17 06:39:24 +00:00
Carlos Jimenez Ruiz	f461781343	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor	2021-03-16 14:47:40 +01:00
Joan Sanchez	54bc1aef96	Reenabled .gitignore storage folder	2021-03-16 14:46:12 +01:00
Joan Sanchez	4ba4aba45a	Added new pdf folder	2021-03-16 14:45:46 +01:00
Carlos Jimenez Ruiz	af7f885d2b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor	2021-03-16 14:36:14 +01:00
Carlos Jimenez Ruiz	acae6fb60d	Merge pull request '2734-invoice_report' (#557) from 2734-invoice_report into dev ... Reviewed-on: #557 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-03-16 13:35:11 +00:00
Joan Sanchez	41ce834264	Removed unused require	2021-03-16 14:00:15 +01:00
Joan Sanchez	a2165b6bfc	Updated E2E	2021-03-16 13:59:39 +01:00
Joan Sanchez	db9d1c84e0	Requested changes	2021-03-16 13:37:59 +01:00
Carlos Jimenez Ruiz	117ea137c1	ticket index auto-state false for single results	2021-03-16 12:08:48 +01:00
jorgebl	1585974e4e	update	2021-03-16 11:30:44 +01:00
jorgebl	37c29584af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2843-claim_pickup_order	2021-03-16 11:23:49 +01:00
jorgebl	7da8f21777	Put new email	2021-03-16 11:23:44 +01:00
Carlos Jimenez Ruiz	1d521fa9a8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor	2021-03-16 10:57:24 +01:00
jorgebl	684705e3ec	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys	2021-03-16 08:44:09 +01:00
jorgebl	1fc53f5565	QA removed styles in the html and put the translate	2021-03-16 08:44:05 +01:00
Joan Sanchez	565162740a	Updated unit tests	2021-03-15 16:35:55 +01:00
Joan Sanchez	0ec6d273e6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2734-invoice_report	2021-03-15 13:49:16 +01:00
Joan Sanchez	bd081f9fd6	2734 - Make invoice PDF refactor	2021-03-15 13:43:22 +01:00
Carlos Jimenez Ruiz	ef0b72c621	Merge pull request '2842-npm_maintenance' (#574) from 2842-npm_maintenance into dev ... Reviewed-on: #574 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-03-15 11:49:16 +00:00
Carlos Jimenez Ruiz	0aaf7b32ab	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2842-npm_maintenance	2021-03-15 12:32:08 +01:00
Carlos Jimenez Ruiz	139861785e	Merge branch '2842-npm_maintenance' of https://gitea.verdnatura.es/verdnatura/salix into 2842-npm_maintenance	2021-03-15 12:27:37 +01:00
Carlos Jimenez Ruiz	0870a902af	chat.send tests fixed + small refactor	2021-03-15 12:26:11 +01:00
Joan Sanchez	d2b4e0b39f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-03-15 12:15:29 +01:00