15315 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	1842a5c464	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 231401_master_to_test	2023-04-21 12:31:05 +02:00
Vicent Llopis	3fd145b9d0	Merge pull request 'hotfix_ticketSmsChanges' (!1471) from hotfix_ticketSmsChanges into master ... Reviewed-on: #1471 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-04-21 10:29:10 +00:00
Vicent Llopis	a725ee90cf	update backTest timeout	2023-04-21 11:50:07 +02:00
Vicent Llopis	83f71cdd36	refactor: mostrar en columnas visibles 'Frágil'	2023-04-21 10:31:23 +02:00
Vicent Llopis	4c6b4ea6c8	refactor: eliminada la doble paginación en los logs	2023-04-21 10:15:00 +02:00
Alex Moreno	9766008ca9	fix: upload jasmine.DEFAULT_TIMEOUT_INTERVAL to 90000	2023-04-21 10:04:14 +02:00
Vicent Llopis	5af961ac69	fix: maneja si se elimina la sale	2023-04-21 09:53:21 +02:00
Alex Moreno	3103e60d4b	fix: upload jasmine.DEFAULT_TIMEOUT_INTERVAL to 60000	2023-04-21 09:14:06 +02:00
Alex Moreno	df3f2f3b62	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 231401_master_to_test	2023-04-21 09:12:56 +02:00
Alex Moreno	239685b43f	(231401) master to test	2023-04-20 08:52:48 +02:00
Juan Ferrer	6f35eb0ce3	Merge pull request '231401_test_to_production' (!1464) from 231401_test_to_production into master ... Reviewed-on: #1464 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-04-20 06:45:45 +00:00
Alex Moreno	7df4a2b15d	fix(231401): fix tests and fixtures	2023-04-20 08:25:15 +02:00
Alex Moreno	63e0031bc6	deploy(231401): test to master	2023-04-20 08:24:43 +02:00
Juan Ferrer	a85135b1c8	refs #5553 New parameter to skip lock	2023-04-18 21:27:09 +02:00
Juan Ferrer	5dd7c7e3bd	refs #5553 Improve error handling	2023-04-18 20:53:49 +02:00
Juan Ferrer	dc853213b8	refs #5553 Allow to skip default transaction timeout	2023-04-18 20:33:39 +02:00
Juan Ferrer	8763dc32c4	refs #5553 Code syntax refactor	2023-04-18 17:25:37 +02:00
Juan Ferrer	26faab6a84	refs #5553 Exclusive lock fix, don't stop when unlink fails	2023-04-18 17:23:38 +02:00
Joan Sanchez	8f100c6021	Merge pull request 'hotfix paginate negative bases' (!1444) from hotfix-paginate-negativeBases into test ... Reviewed-on: #1444 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-18 12:46:42 +00:00
Alexandre Riera	bf335a0447	Merge branch 'test' into hotfix-paginate-negativeBases	2023-04-18 11:55:50 +00:00
Joan Sanchez	90b38d02a0	Default username property	2023-04-18 13:16:25 +02:00
Joan Sanchez	1d7c1f8d41	Merge pull request 'hotfix expedition-pallet template' (!1458) from hotfix_arcRfid2 into master ... Reviewed-on: #1458 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-04-18 11:00:00 +00:00
Vicent Llopis	6b72d88256	test	2023-04-18 12:55:18 +02:00
Joan Sanchez	a5f6991511	continue	2023-04-18 10:18:44 +02:00
Joan Sanchez	aabc4ec58d	fix(consumption): continue queue if client mailing fails	2023-04-18 10:08:04 +02:00
Joan Sanchez	cebab42b47	Merge pull request 'hotfix delivery' (!1457) from hotfix-delivery-231401 into test ... Reviewed-on: #1457 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-18 07:35:16 +00:00
Alexandre Riera	4eb7e19c43	Merge branch 'test' into hotfix-delivery-231401	2023-04-18 07:30:27 +00:00
Alexandre Riera	89f6f0fbdb	hotfix delivery	2023-04-18 09:29:36 +02:00
Vicent Llopis	fef9387782	Merge pull request 'fix intermintent test' (!1456) from fix_intermitentTest into test ... Reviewed-on: #1456 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-04-18 07:18:28 +00:00
Joan Sanchez	6c71bda814	Merge pull request 'masterHotfix_arcRfid' (!1455) from masterHotfix_arcRfid into master ... Reviewed-on: #1455 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-18 07:00:09 +00:00
Vicent Llopis	edc49ab5b3	refactor code	2023-04-18 08:26:26 +02:00
Vicent Llopis	ce3e299d09	fix intermintent test	2023-04-18 08:20:50 +02:00
Vicent Llopis	d99815356a	refs #5144 manejado que el usuario sea NULL	2023-04-18 07:26:35 +02:00
Joan Sanchez	2192cd4066	Merge pull request 'hotfix minor version delivery' (!1454) from hotfix-applyChanges-delivery into test ... Reviewed-on: #1454 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-18 05:20:09 +00:00
Alexandre Riera	18b859ae71	Merge branch 'hotfix-applyChanges-delivery' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-applyChanges-delivery	2023-04-18 07:19:35 +02:00
Alexandre Riera	5a2dbbabfd	template string	2023-04-18 07:19:33 +02:00
Alexandre Riera	095135807d	Merge branch 'test' into hotfix-applyChanges-delivery	2023-04-18 05:18:29 +00:00
Alexandre Riera	b3fb661f12	hotfix minor version delivery	2023-04-18 07:17:36 +02:00
Joan Sanchez	a41cf2f3f9	Merge pull request 'refs #5553 Don't save image extension' (!1453) from 5553-dontSaveImageExtension into master ... Reviewed-on: #1453 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-18 05:05:12 +00:00
Juan Ferrer	1c4f919e89	refs #5553 Don't save image extension	2023-04-17 22:24:19 +02:00
Juan Ferrer	378400c6d2	refs #5553 Image scrubing method improved ... Remove & dryRun options, check that collection exists, performance improved, exclusive lock	2023-04-17 18:19:25 +02:00
Juan Ferrer	0423fac88c	refs #5553 Image clean method Image/scrub	2023-04-17 14:33:07 +02:00
Joan Sanchez	f53ebb7641	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-04-17 08:59:34 +02:00
Joan Sanchez	9e4c261a87	Merge pull request 'hotfix saveSign one sign for every ticket' (!1440) from hotfix-saveSign-oneSignForEveryTicket into test ... Reviewed-on: #1440 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-17 05:39:57 +00:00
Joan Sanchez	f4e696675d	Merge pull request 'reafactor(image): upload image using gm library' (!1445) from 5558-image_refactor into master ... Reviewed-on: #1445 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-04-15 11:07:44 +00:00
Joan Sanchez	6e7b452792	Max quality	2023-04-14 13:19:17 +02:00
Joan Sanchez	35f94c58b7	reafactor(image): upload image using gm library	2023-04-14 13:04:40 +02:00
Alexandre Riera	b364564e4d	Merge branch 'test' into hotfix-paginate-negativeBases	2023-04-14 07:51:08 +00:00
Alexandre Riera	e6355e3232	hotfix paginate negative bases	2023-04-14 09:50:07 +02:00
Alexandre Riera	8ade602563	hotfix one sign for every ticket	2023-04-13 14:18:01 +02:00