13837 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	77edbcbf39	Merge branch 'dev' into hotFix-dev_updateDiscount	2022-11-07 10:39:53 +00:00
Joan Sanchez	92a2367db2	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-11-07 10:52:53 +01:00
Joan	be1fbc4d68	Added version 10502	2022-11-07 10:49:17 +01:00
Joan	17d6308126	Already on prod	2022-11-07 10:48:38 +01:00
Joan Sanchez	f65a90927f	Merge pull request 'MASTER_hotFix: force apply changes' (!1127) from hotFix_applyChangesInMaster into master ... Reviewed-on: #1127	2022-11-07 09:44:03 +00:00
Alex Moreno	c3ee9da6c6	hotFix: force apply changes	2022-11-07 10:18:32 +01:00
Vicent Llopis	b1eb7d469f	fix: error duplicated key	2022-11-07 09:51:33 +01:00
Alex Moreno	2165ca0f34	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-07 09:34:24 +01:00
Alex Moreno	03ec8e27e6	feat(ticket_isEditable): use ticketWeekly	2022-11-07 09:19:20 +01:00
Alex Moreno	5051f8b590	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-11-07 07:24:44 +01:00
Vicent Llopis	6858de83a3	feat: backTest	2022-11-04 14:55:47 +01:00
Vicent Llopis	892094f85c	feat: add backTest	2022-11-04 13:41:45 +01:00
Vicent Llopis	98cc2b5866	refactor: endpoint	2022-11-04 13:41:38 +01:00
Joan Sanchez	2f22753a65	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-11-04 13:06:55 +01:00
Joan Sanchez	785e7aa9fa	Enabled puppeteer cluster	2022-11-04 12:52:25 +01:00
Vicent Llopis	626355d251	fix: sustituido insert por insert ignore	2022-11-04 12:37:07 +01:00
Joan Sanchez	104eea2e4f	Downgraded puppeteer	2022-11-04 12:22:03 +01:00
Joan Sanchez	fc14949c6d	Node version rollback	2022-11-04 11:48:18 +01:00
Joan Sanchez	1bcde47ab1	Merge pull request '3951-invoiceOut.index_downloadPdfs' (!1110) from 3951-invoiceOut.index_downloadPdfs into dev ... Reviewed-on: #1110 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-04 10:42:32 +00:00
Joan Sanchez	4d2003c714	Cluster rollback	2022-11-04 11:27:20 +01:00
Joan Sanchez	f5d24b9a9e	Changed param	2022-11-04 11:21:35 +01:00
Joan Sanchez	95528850f4	Updated version	2022-11-04 10:02:59 +01:00
Joan Sanchez	2afb47fe14	Added version 10501 - November	2022-11-04 10:01:23 +01:00
Vicent Llopis	ae513fb2b3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing	2022-11-04 09:12:16 +01:00
Vicent Llopis	158fc56555	Merge branch 'dev' into 3951-invoiceOut.index_downloadPdfs	2022-11-04 08:03:55 +00:00
Joan Sanchez	f53b74c04c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-11-04 09:02:33 +01:00
Joan Sanchez	16554c23a8	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-11-04 09:02:18 +01:00
Pau	6a5ba6a929	Merge branch 'dev' into 4157-send-sms-to-routes	2022-11-04 07:36:46 +00:00
Pau	7ff4c4d33c	Merge branch 'dev' into 4507-greuge-add-userFk	2022-11-04 07:35:01 +00:00
Pau	a975f37fc3	Merge branch 'dev' into 4490-transfer-tickets-between-clients	2022-11-04 07:27:15 +00:00
Pau	ae95b5d3ef	Merge branch 'dev' into 4492-item.create-same-as-item.isLaid	2022-11-04 07:22:37 +00:00
Alexandre Riera	98dd5963bf	refs #4547 traduccion añadida	2022-11-04 08:15:12 +01:00
Pau	37292cee89	remove comments	2022-11-04 08:12:46 +01:00
Alex Moreno	28edb2e53a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-11-04 08:09:15 +01:00
Vicent Llopis	e1d187ef68	Merge branch 'dev' into 3951-invoiceOut.index_downloadPdfs	2022-11-04 07:01:45 +00:00
Alexandre Riera	524069f8e3	Merge pull request 'refs #4753 texto y fecha sms cambiados' (!1124) from 4753-ticket.sale-sms into dev ... Reviewed-on: #1124 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2022-11-04 07:00:33 +00:00
Pau	11cf1ba414	fix back test error	2022-11-04 07:50:54 +01:00
Pau	42dd56a78c	Merge branch 'dev' into 4490-transfer-tickets-between-clients	2022-11-04 06:46:23 +00:00
Pau	7d7af6eb49	Modified model to allow modifications to isLaid	2022-11-04 07:42:21 +01:00
Alexandre Riera	07b2ac99ce	refs #2596 css corregido	2022-11-03 15:45:36 +01:00
Alexandre Riera	f3085bef66	refs #2596 css actualizado	2022-11-03 15:28:52 +01:00
Vicent Llopis	ab739f412f	feat: add test	2022-11-03 15:00:55 +01:00
Alex Moreno	5c9bc47235	user model	2022-11-03 14:59:12 +01:00
Alexandre Riera	8e5f518eb6	refs #4753 texto y fecha sms cambiados	2022-11-03 14:16:11 +01:00
Vicent Llopis	b6d3a08871	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3951-invoiceOut.index_downloadPdfs	2022-11-03 10:17:46 +01:00
Alex Moreno	dd1198ac27	Merge pull request 'MASTER-updateNode12->14' (!1123) from 4699-MASTER_updateNode into master	2022-11-03 09:06:02 +00:00
Alex Moreno	c9cb1503dc	update node	2022-11-03 10:03:16 +01:00
Alex Moreno	e6e8f15d64	Merge branch 'dev' into 3569-refactor_isEditable-canEdit	2022-11-03 08:39:10 +00:00
Alex Moreno	36894c31de	Merge branch 'dev' into 4077-login_recover-password	2022-11-03 08:39:04 +00:00
Alex Moreno	d03504814e	Merge pull request 'MASTER-delete package-lock' (!1122) from 4699-MASTER_fix-checkInbox2 into master	2022-11-03 08:30:09 +00:00