20924 Commits

All Branches

Search

Author	SHA1	Message	Date
Sergio De la torre	75293fbb9a	refs #6276 hotFix:itemShelving_add	2024-04-09 07:38:28 +02:00
Robert Ferrús	1743f7501a	Merge branch 'dev' into 6500-procRefactor8	2024-04-09 05:37:18 +00: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
Robert Ferrús	2c0c346a7b	feat: refs #6500	2024-04-09 07:34:43 +02: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
Robert Ferrús	d595a7b2fa	feat: refs #6500	2024-04-08 12:22:15 +02:00
Robert Ferrús	2d18f01a15	feat: refs #6500	2024-04-08 12:18:13 +02:00
Robert Ferrús	dddcacee7a	feat: refs #6500	2024-04-08 12:01:27 +02:00
Robert Ferrús	2037b17f4e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6500-procRefactor8	2024-04-08 11:57:00 +02: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
Pablo Natek	29f952308f	#code: refs #6130 code@	2024-04-05 14:58:43 +02:00
Pablo Natek	1e669e99f8	fix: refs #6130 code:code	2024-04-05 14:58:20 +02:00
Pablo Natek	70bdb52371	fix: refs #6130 code	2024-04-05 14:57:52 +02:00
Pablo Natek	11dea43da2	fix:refs #6130 code	2024-04-05 14:53:06 +02:00
Alex Moreno	93000aaecf	Merge branch 'dev' into 6549-ticket_close	2024-04-05 12:20:09 +00:00
Pablo Natek	021280c53c	fix commit code	2024-04-05 14:14:10 +02:00
Pablo Natek	42e21eb602	feat(githook) add reference	2024-04-05 14:13:17 +02:00
Robert Ferrús	9af87f5cf2	Merge pull request 'feat: refs #6738 crear las Fk de la tabla flight' (!2054) from 6738-cleanTables2008Part2to2 into dev ... Reviewed-on: #2054 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-05 11:51:21 +00:00
Carlos Andrés	cedfdbb421	fix: closeTicket idem salix Refs: #6549	2024-04-05 13:22:54 +02:00
Robert Ferrús	cf5113c5a6	Merge branch 'dev' into 6738-cleanTables2008Part2to2	2024-04-05 10:23:55 +00:00
Guillermo Bonet	6c1e44638e	feat: refs #6636 Added getEnumValue method	2024-04-05 11:01:00 +02:00
Alex Moreno	0af3713a07	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-04-05 10:33:47 +02:00
Alex Moreno	03fb52bf6f	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-04-05 10:33:26 +02:00
Alex Moreno	273507d3b7	Merge pull request 'refs #7167 deploy: dump' (!2260) from 7167-dump into master ... Reviewed-on: #2260 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-04-05 08:32:07 +00:00
Alex Moreno	2f4cd2bc7b	refs #7167 fix: acl mailAlias	2024-04-05 10:05:51 +02:00
Alex Moreno	ed95545de6	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7167-dump	2024-04-05 10:00:34 +02:00