1255 Commits

Author	SHA1	Message	Date
Javier Segarra	ef8a711ed6	feat(salix): refs #6427 updates	2024-04-22 07:57:23 +02:00
Javier Segarra	383433766e	Merge branch 'dev' into 6427_sms_resetPassword	2024-04-18 09:48:47 +02:00
Javier Segarra	6214da2c42	feat(salix): refs #6930 Undo rollback salix-back	2024-04-17 09:52:53 +02:00
Javier Segarra	6db0eba72c	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-04-15 06:51:03 +00:00
Javier Segarra	25b5c35dc6	refs #6835 fix: issue	2024-04-15 08:47:49 +02:00
Javier Segarra	253465cf13	refs #7190 feat: renewToken for multimedia	2024-04-15 08:47:27 +02:00
Pablo Natek	726b1ddc07	Merge branch 'dev' into 6005-backupLabeler	2024-04-12 05:14:29 +00:00
Javier Segarra	f0eeb2e28b	update WorkerBasicData layout	2024-04-10 14:32:26 +02:00
Pablo Natek	c581deef66	refactor: refs #6005 refactor spec	2024-04-10 13:09:31 +02:00
Javier Segarra	6edbada581	Merge branch 'dev' into 6427_sms_resetPassword	2024-04-10 11:34:13 +02:00
Pablo Natek	ed517399dc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler	2024-04-09 15:04:04 +02:00
Ivan Mas	f02c4354ba	Merge branch 'dev' into 6827-check-usernames-special-characters	2024-04-09 14:45:29 +02:00
Pablo Natek	aff73a179e	remove: refs #6005 remove delay from notification model	2024-04-09 13:36:50 +02:00
Pablo Natek	da037c5235	refactor: refs #6005 delay on productionConfig	2024-04-09 13:34:33 +02:00
Guillermo Bonet	0e2e68488d	Merge branch 'test' into dev	2024-04-09 13:08:54 +02:00
Guillermo Bonet	743dc2144e	hotfix: refs #6276 Fix send chat msg getSales	2024-04-09 13:05:01 +02:00
Pablo Natek	7cb40f5d89	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler	2024-04-09 09:42:39 +02:00
Alex Moreno	9134216332	refactor(workerDms): adapat to lilium	2024-04-08 14:46:35 +02:00
Pablo Natek	4b4aaa9e10	feat: refs #6005 move logic from report to hook	2024-04-05 08:04:53 +02:00
Alex Moreno	dd9c7283c3	hotFix: handle mail error	2024-04-04 13:32:39 +02:00
Guillermo Bonet	c685000b47	hotfix: refs #6930 Rollback tokenMultimedia	2024-04-04 10:13:56 +02:00
Javier Segarra	928b2f5807	refs #6427 revert vn-user changes	2024-03-26 09:44:50 +01:00
Alex Moreno	2212899400	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-26 08:35:38 +01:00
Javier Segarra	fbd2c28a81	refs #6427 perf: minor descriptions changes	2024-03-26 08:28:57 +01:00
Javier Segarra	fe3a97cd38	refs #6427 perf: minor changes	2024-03-26 08:27:44 +01:00
Javier Segarra	06ed466953	refs #6427 perf: minor changes	2024-03-26 08:26:44 +01:00
Javier Segarra	7ddf0ad1a5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6427_sms_resetPassword	2024-03-26 08:20:33 +01:00
Javier Segarra	2ae298cd9e	refs #6427 feat: move authCode method to file	2024-03-26 08:19:01 +01:00
Alex Moreno	dce0155c00	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-26 08:18:47 +01:00
Javier Segarra	f70b663ac0	refs #6427 feat: use authCode and validateCode	2024-03-26 08:18:20 +01:00
Sergio De la torre	2a1204a00a	refs #6276 hotFix: setUserError and return	2024-03-25 13:27:52 +01:00
Sergio De la torre	386bc1c934	refs #6276 hotFix: setUserError and return	2024-03-25 13:00:55 +01:00
Jon Elias	c49b8bf954	refactor: refs #6556 minor changes	2024-03-22 09:35:09 +01:00
Jon Elias	eadd8f750d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6556-ChangeImages	2024-03-22 08:22:49 +01:00
Ivan Mas	db71e69317	Merge branch 'dev' into 6827-check-usernames-special-characters	2024-03-21 09:21:32 +00:00
Sergio De la torre	9eee26cbe9	refs #6276 feat:newWarehouse	2024-03-21 10:18:54 +01:00
Javier Segarra	f75bd04736	refs #6427 perf: restorePasswordSMS	2024-03-20 14:11:05 +01:00
Javier Segarra	1089dfcbb0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6427_sms_resetPassword	2024-03-20 13:51:00 +01:00
Javier Segarra	bfc8cda8a2	refs #6427 feat restorePassWordSMS	2024-03-20 13:49:49 +01:00
Javier Segarra	01f23abec9	refs #6427 perf: restore method	2024-03-20 13:48:54 +01:00
Guillermo Bonet	8a96327d97	Merge branch 'dev' into 6232-refactorConfigTables	2024-03-20 06:17:06 +00:00
Javier Segarra	633f6c41e9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6427_sms_resetPassword	2024-03-18 12:12:56 +01:00
Jon Elias	6d4f07adc3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6556-ChangeImages	2024-03-15 14:13:24 +01:00
Guillermo Bonet	5b546079b0	Merge branch '6232-refactorConfigTables' of https://gitea.verdnatura.es/verdnatura/salix into 6232-refactorConfigTables	2024-03-15 12:38:34 +01:00
Guillermo Bonet	0867211573	refs #6403 Fix model mrwConfig	2024-03-15 12:38:33 +01:00
Javier Segarra	bfdbbc0fdf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-15 12:22:57 +01:00
Jon Elias	67c572f187	fixed dropped test	2024-03-15 10:48:24 +01:00
Javier Segarra	6989299593	Merge branch 'dev' into 6930_scopedToken_Multimedia	2024-03-15 08:26:45 +00:00
Jon Elias	c6f7a8bdb0	refactor: #6556 drop useless test	2024-03-14 15:49:36 +01:00
Pablo Natek	e3b7c7bb60	Merge branch 'dev' into 6005-backupLabeler	2024-03-14 09:39:13 +00:00