20772 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	d85562b090	refs #7188 fix: bug tokenMultimedia	2024-04-09 15:06:05 +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
Pablo Natek	4a8adf4155	Merge branch 'dev' into 6005-backupLabeler	2024-04-09 13:03:40 +00:00
Pablo Natek	ac9732606c	remove(focus): refs #6005 from spec	2024-04-09 14:55:29 +02:00
Ivan Mas	f02c4354ba	Merge branch 'dev' into 6827-check-usernames-special-characters	2024-04-09 14:45:29 +02:00
Ivan Mas	521033edd2	Merge branch 'dev' into 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal	2024-04-09 11:54:41 +00: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	43111f8192	Merge branch 'master' into test	2024-04-09 13:08:31 +02:00
Guillermo Bonet	743dc2144e	hotfix: refs #6276 Fix send chat msg getSales	2024-04-09 13:05:01 +02:00
Jorge Penadés	9a28a59d00	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008	2024-04-09 11:11:30 +02:00
Alex Moreno	c69a4e1c98	Merge pull request 'refactor(workerDms): adapat to lilium' (!2269) from 6551-workerDms_refactor into dev ... Reviewed-on: #2269 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-04-09 08:21:20 +00:00
Guillermo Bonet	f8be6be7a3	feat: refs #6636 Minor change	2024-04-09 10:10:11 +02:00
Guillermo Bonet	9ab71318a9	Merge pull request 'feat: refs #6636 Modified updateClaim, model and tests' (!2256) from 6636-pickup into dev ... Reviewed-on: #2256 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-09 08:01:27 +00:00
Guillermo Bonet	c42e00f11e	Merge branch 'dev' into 6636-pickup	2024-04-09 07:43:51 +00:00
Guillermo Bonet	449a06c85c	feat: refs #6636 Added tests	2024-04-09 09:43:30 +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
Pablo Natek	638b715ee5	fix: refs #6005 move logic to hook	2024-04-09 09:30:28 +02:00
Alex Moreno	500244dbed	fix id	2024-04-09 07:51:57 +02:00
Sergio De la torre	47c33c1648	Merge pull request 'refs #6276 hotFix:itemShelving_add' (!2270) from 6276_hotfix_itemShelving_add into master ... Reviewed-on: #2270 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-09 05:50:06 +00:00
Robert Ferrús	4a31fe29b8	Merge branch 'dev' into 7150-greuge_dif_porte_add	2024-04-09 05:40:01 +00:00
Sergio De la torre	75293fbb9a	refs #6276 hotFix:itemShelving_add	2024-04-09 07:38:28 +02:00
Pako Natek	90b7d2c3d8	Merge pull request 'catalogue fixed' (!2267) from 6021-floranet_RedMoon into dev ... Reviewed-on: #2267 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-04-09 05:34:45 +00:00
Pablo Natek	1c064c7bfc	Merge branch 'dev' into 6021-floranet_RedMoon	2024-04-09 05:23:34 +00:00
Sergio De la torre	45e4e07df0	Merge branch 'dev' into 6497_redirect_firewall	2024-04-08 13:33:39 +00:00
Alex Moreno	0ecc09fcc4	Merge branch 'dev' into 6551-workerDms_refactor	2024-04-08 12:50:05 +00:00
Alex Moreno	9134216332	refactor(workerDms): adapat to lilium	2024-04-08 14:46:35 +02:00
Pako Natek	2eb229adf7	catalogue fixed	2024-04-08 14:30:46 +02:00
Robert Ferrús	6ba43a3c6d	Merge branch 'dev' into 7150-greuge_dif_porte_add	2024-04-08 11:29:09 +00:00
Juan Ferrer	75bed03ab7	Merge pull request 'test' (!2266) from test into dev ... Reviewed-on: #2266	2024-04-08 11:09:05 +00:00
Juan Ferrer	366f1997eb	Merge pull request 'fix: refs #6021 dump, floranet schema added' (!2265) from master into test ... Reviewed-on: #2265	2024-04-08 11:08:50 +00:00
Juan Ferrer	ccc644c298	fix: refs #6021 dump, floranet schema added	2024-04-08 13:07:04 +02:00
jcasado	26c74a3e71	refs #6641 fix test	2024-04-08 13:03:15 +02:00
Carlos Andrés	5558e92b1e	Merge pull request 'fix: closeTicket idem salix refs #6549' (!2163) from 6549-ticket_close into dev ... Reviewed-on: #2163 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-08 10:36:21 +00:00
Robert Ferrús	0c5b9e3544	Merge branch 'dev' into 7150-greuge_dif_porte_add	2024-04-08 10:28:02 +00:00
Guillermo Bonet	d442ed64c4	Merge pull request 'feat: refs #6714 Added businessType zone_getAddresses' (!2263) from 6714-zone_getAddresses into dev ... Reviewed-on: #2263 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-04-08 08:42:15 +00:00
Guillermo Bonet	0b96471c7d	feat: refs #6714 Added businessType zone_getAddresses	2024-04-08 09:27:07 +02:00
Robert Ferrús	657150a9a7	feat: refs #7150 greuge_dif_porte_add	2024-04-08 08:57:56 +02:00
Pablo Natek	1728ed955b	fix: refs #6130 code remove console.log	2024-04-08 08:51:13 +02:00
Robert Ferrús	1e8e6a67a3	Merge branch 'dev' into 7150-greuge_dif_porte_add	2024-04-08 06:39:22 +00:00
Robert Ferrús	5517c29c1c	fet: refs #7150 greuge_dif_porte_add	2024-04-08 08:37:37 +02:00
Pablo Natek	f7170309d2	test: refs #6130 89 add commit	2024-04-08 08:09:21 +02:00
Pablo Natek	30db151da7	Merge branch '6130-commitLint' of https://gitea.verdnatura.es/verdnatura/salix into 6130-commitLint	2024-04-08 08:08:41 +02:00
Pablo Natek	0dcd1518b9	feat: refs #6130 add commit	2024-04-08 08:08:17 +02:00
Pablo Natek	6a090eaef3	Merge branch 'dev' into 6130-commitLint	2024-04-08 06:02:58 +00:00
Alex Moreno	5df285d469	feat: refs #6130 test commitLint	2024-04-08 07:43:57 +02:00
Guillermo Bonet	e27279e20e	Merge branch 'dev' into 6636-pickup	2024-04-08 05:18:36 +00:00
Pablo Natek	7acb4ee523	fix: refs #6130 code	2024-04-05 15:01:29 +02:00
Pablo Natek	2084d047b2	fix: refs #6130 code	2024-04-05 15:01:12 +02:00