1064 Commits

Author	SHA1	Message	Date
Javier Segarra	4d40d825a2	feat(salix): refs #6427 recoveryPhone security	2024-05-23 15:35:15 +02:00
Javier Segarra	187f7f1cdb	Merge branch 'dev' into 6427_sms_resetPassword	2024-05-23 14:36:40 +02:00
Carlos Andrés	35a583d6d8	Merge pull request 'test' (!2504) from test into dev ... Reviewed-on: #2504 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-05-23 11:42:23 +00:00
Pablo Natek	2142b78deb	feat: refs #7187 Add support for multiple PDAs per user	2024-05-21 19:25:18 +02:00
Alex Moreno	28279b0782	Merge branch 'dev' into 7421-fix_checking_NODE_ENV	2024-05-21 13:12:30 +00:00
Alex Moreno	ff33c926af	fix: move to boot	2024-05-21 15:11:32 +02:00
Alex Moreno	1f2017c272	fix: simplify	2024-05-21 14:03:13 +02:00
Alex Moreno	18bb8a4ea5	fix: checking process.env.NODE_ENV	2024-05-21 13:50:45 +02:00
Guillermo Bonet	9d98ae4a03	Merge branch 'test' into dev	2024-05-20 07:02:00 +02:00
Guillermo Bonet	18ce388944	Merge branch 'test' into dev	2024-05-20 06:59:42 +02:00
Jorge Penadés	2694f277d2	fix: refs #6744 add es locale	2024-05-17 13:03:24 +02:00
Pablo Natek	bcb3ea4837	feat: refs #7187 new method available pda	2024-05-16 10:23:33 +02:00
Carlos Satorres	8a7d124066	refs #6882 fix traductions	2024-05-08 12:17:44 +02:00
Javier Segarra	9cf4ef04c5	feat(salix): refs #6427 #6427 Use UserSecurity instead validation	2024-05-06 14:53:41 +02:00
Javier Segarra	036be54f97	Merge branch 'dev' into 6427_sms_resetPassword	2024-05-06 14:27:23 +02:00
Carlos Satorres	fe300f0f24	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6682-notHolidays	2024-05-06 09:26:14 +02:00
Sergio De la torre	c3b9e76cd6	Merge branch 'dev' into 6799_translations	2024-05-03 09:28:28 +00:00
Sergio De la torre	d994a682f9	refs #6799 feat: french and portuguese	2024-05-02 16:48:58 +02:00
Carlos Satorres	a43593f63b	Merge branch 'dev' into 6870-modifyDefaulterNotification	2024-05-02 10:42:00 +00:00
Carlos Satorres	def1521131	refs #6870 defaulter id	2024-05-02 12:42:17 +02:00
Carlos Satorres	ae15f4b5d1	refs #6870 markdown	2024-05-02 12:14:39 +02:00
Jon Elias	2b9bfb5d85	Merge pull request 'fix: refs #6731 fix ticketRequest' (!2364) from 6731-fixTicketRequestLog into dev ... Reviewed-on: #2364 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-30 10:19:29 +00:00
Carlos Satorres	ace39b92ac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6870-modifyDefaulterNotification	2024-04-29 12:14:38 +02:00
Carlos Satorres	f3c7b1e89c	refs #6870 add observationEmail	2024-04-29 11:59:51 +02:00
Javier Segarra	741ccf411e	Merge branch 'dev' into 6427_sms_resetPassword	2024-04-27 20:10:16 +02:00
Pablo Natek	4693ba13fa	Merge branch 'dev' of https: refs #4988//gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency	2024-04-26 08:37:51 +02:00
Pablo Natek	d25c5eb327	fix: refs #4988 translates	2024-04-25 17:22:22 +02:00
Pablo Natek	af1abe934f	fix: refs #4988 translates	2024-04-25 17:21:59 +02:00
Jorge Penadés	931c2c4f5e	feat: refs #7211 error & locale	2024-04-25 13:12:06 +02:00
Pablo Natek	48d3ee373e	fix: refs #4988 yml	2024-04-25 12:47:52 +02:00
Pablo Natek	00359a0a6b	fix: refs #4988 traduction	2024-04-25 12:44:27 +02:00
Pablo Natek	c2888e4f97	fix: refs #4988 correct yml	2024-04-25 12:43:47 +02:00
Pablo Natek	4e11e46fff	feat: refs #4988 capture error on duplicate	2024-04-25 12:40:54 +02:00
Jorge Penadés	6749722634	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7019_fix_createManualInvoice	2024-04-25 10:10:06 +02:00
Jon Elias	6706974784	fix: refs #6731 fix ticketRequest	2024-04-24 10:31:26 +02:00
Javier Segarra	30d0db163e	feat(salix): refs #6930 minor updates	2024-04-19 10:50:14 +02:00
Javier Segarra	383433766e	Merge branch 'dev' into 6427_sms_resetPassword	2024-04-18 09:48:47 +02:00
Guillermo Bonet	bc2b6ff97e	feat: refs #7173 Added traduction	2024-04-17 07:25:46 +02:00
Javier Segarra	a1a6e483cf	refs #6427 feat: not update phone when is not owner	2024-04-10 15:06:03 +02:00
Javier Segarra	6edbada581	Merge branch 'dev' into 6427_sms_resetPassword	2024-04-10 11:34:13 +02:00
Carlos Satorres	de75d811c3	refs #6682 absence	2024-04-09 12:30:25 +02:00
Guillermo Bonet	449a06c85c	feat: refs #6636 Added tests	2024-04-09 09:43:30 +02:00
Guillermo Bonet	6c1e44638e	feat: refs #6636 Added getEnumValue method	2024-04-05 11:01:00 +02:00
Guillermo Bonet	ac658fb6af	Merge branch 'dev' into 6636-pickup	2024-04-05 05:29:26 +00:00
Sergio De la torre	2ed5237568	Merge branch 'dev' into 6964_itemOlder	2024-04-04 13:45:20 +00:00
Guillermo Bonet	fcb4fe92e8	Merge branch 'dev' into 6636-pickup	2024-04-04 12:14:23 +00:00
Guillermo Bonet	f44e19cae3	feat: refs #6636 Modified updateClaim, model and tests	2024-04-04 14:15:20 +02:00
Jon Elias	3e044a8efe	fix: refs #7152 add supplier storage	2024-04-04 08:16:37 +02:00
Alex Moreno	ed46ad03d2	refs #7152 warmFix	2024-03-28 09:33:57 +01:00
Sergio De la torre	c265896224	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder	2024-03-26 10:24:27 +01:00