21081 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	22006ea3fb	Merge pull request '#6938 add scope & acls' (!2301) from 6938-hideWorkerPhone into dev ... Reviewed-on: #2301 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-16 06:38:46 +00:00
Sergio De la torre	d24de61213	refs #6921 feat: addFromDelivery	2024-04-16 08:29:39 +02:00
Javier Segarra	f0b0f3cee7	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-04-16 06:24:34 +00:00
Guillermo Bonet	0c24e67af1	Merge branch 'dev' into 7173-Restricción-eliminar/modificar-vn.invoiceIn	2024-04-16 05:42:59 +00:00
Ivan Mas	5bb3dccd19	Merge branch 'dev' into 7161DeleteitemTrash	2024-04-15 14:03:42 +00:00
Ivan Mas	6e183b7426	refs #7161 change vAddress to vAddressShortage	2024-04-15 15:59:05 +02:00
Jorge Penadés	adb2249d2f	fix: refs #6938 e2e tests	2024-04-15 15:09:41 +02:00
Jorge Penadés	3c9ac9634b	fix: refs #6938 front tests	2024-04-15 15:02:45 +02:00
Jorge Penadés	3e1218463c	fix: refs #6938 filters & scope	2024-04-15 14:44:18 +02:00
Guillermo Bonet	339c349ed0	feat: refs #6724 Added admon acl to vn-check	2024-04-15 14:00:54 +02:00
Guillermo Bonet	0f26fb46b6	feat: refs #6724 Grant changes	2024-04-15 13:16:36 +02:00
Guillermo Bonet	5c524ecc7d	rollback: refs #6724 entry.js	2024-04-15 13:13:40 +02:00
Guillermo Bonet	78bd561122	Merge branch 'dev' into 6724-permisos-vn.entry.isBooked	2024-04-15 11:11:55 +00:00
Sergio De la torre	4cb79956a6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery	2024-04-15 13:03:47 +02:00
Jorge Penadés	d7b06fe637	fix: refs #6938 scope	2024-04-15 12:47:27 +02:00
Juan Ferrer	63ec12cba0	Merge pull request 'feat(binlog): refs #4409 Disable order recalc from triggers' (!2302) from 4409-disableOrderRecalc into master ... Reviewed-on: #2302 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-15 10:16:29 +00:00
Robert Ferrús	a41aa46c3a	Merge branch 'dev' into 6500-procRefactor8	2024-04-15 09:35:52 +00:00
Juan Ferrer	42fe7fb1e2	feat(binlog): refs #4409 Disable order recalc from triggers	2024-04-15 11:32:44 +02:00
Jorge Penadés	200cbd8d74	fix: refs #6938 acls & scope	2024-04-15 11:03:57 +02:00
Jorge Penadés	0219fa105e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6938-hideWorkerPhone	2024-04-15 10:22:44 +02:00
Juan Ferrer	133d45eecf	Merge branch 'dev' into 4409-binlog	2024-04-15 10:22:04 +02:00
Jorge Penadés	a68b8431c5	feat: refs #6938 add scope & acls	2024-04-15 10:21:59 +02:00
Juan Ferrer	ba94bcdb19	Merge pull request 'feat(binlog): refs #4409 New function for binlog queue monitoring' (!2299) from 4409-binlogQueueFn into dev ... Reviewed-on: #2299 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-15 08:20:09 +00:00
Juan Ferrer	31e27f1926	Merge branch '4409-binlogQueueFn' of https://gitea.verdnatura.es/verdnatura/salix into 4409-binlogQueueFn	2024-04-15 10:18:07 +02:00
Juan Ferrer	5414aaa1b4	fix(binlog): refs #4409 Fixtures for binlogQueue	2024-04-15 10:18:06 +02:00
Juan Ferrer	ba9e1d9233	Merge branch 'dev' into 4409-binlogQueueFn	2024-04-15 08:16:56 +00:00
Javier Casado	e0fca2cf6c	Merge pull request 'refs #6641 add button my team' (!2254) from 6641-checkboxMyTeam into dev ... Reviewed-on: #2254 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-15 08:11:36 +00:00
jcasado	dc8a6d1274	Merge branch 'dev' into 6641-checkboxMyTeam	2024-04-15 10:11:36 +02:00
Juan Ferrer	50d6c234be	feat(binlog): refs #4409 New function for binlog queue monitoring	2024-04-15 09:31:24 +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
Robert Ferrús	36b3a92ca3	Merge branch 'dev' into 6500-procRefactor8	2024-04-15 05:18:54 +00:00
Pablo Natek	40473d0cc9	Merge pull request 'test: refs #null commit' (!2297) from testHusky_deleteme into dev ... Reviewed-on: #2297 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-04-12 11:30:07 +00:00
Alex Moreno	cc57fa72fd	fix: remove logs	2024-04-12 13:24:24 +02:00
Alex Moreno	827f152783	fix: husky	2024-04-12 13:23:36 +02:00
Alex Moreno	f0604bedd0	test: refs #null asd	2024-04-12 13:22:32 +02:00
Alex Moreno	bb52b1bae2	test: refs #null test	2024-04-12 13:21:37 +02:00
Alex Moreno	85e6f30697	test: refs #null commit	2024-04-12 13:18:34 +02:00
Pablo Natek	5c4d2dda97	Merge pull request '6130-commitLint' (!1792) from 6130-commitLint into dev ... Reviewed-on: #1792 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-04-12 11:01:59 +00:00
Pablo Natek	4633079255	Merge branch '6130-commitLint' of https://gitea.verdnatura.es/verdnatura/salix into 6130-commitLint	2024-04-12 12:37:46 +02:00
Pablo Natek	8887550713	fix: refs #6130 test	2024-04-12 12:22:00 +02:00
Pablo Natek	0db4cd7a12	feat: refs #6130 handle branch without task	2024-04-12 12:20:18 +02:00
Robert Ferrús	f30f907d8e	feat: refs #6500 cambios solicitados	2024-04-12 12:13:07 +02:00
Pablo Natek	fa1e679b48	feat: refs #12 peter	2024-04-12 12:04:05 +02:00
Pablo Natek	1a71be38a3	feat: test	2024-04-12 12:03:34 +02:00
Alex Moreno	476b82cf87	Merge pull request 'hotFix(claimBegginingModel): enable claimIsEditable' (!2296) from hotFix_claimBeginningRestrictions into master ... Reviewed-on: #2296 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-04-12 09:38:59 +00:00
Alex Moreno	85c4778aa9	Merge branch 'master' into hotFix_claimBeginningRestrictions	2024-04-12 09:36:04 +00:00
Alex Moreno	b4862a8ce9	hotFix(claimBegginingModel): enable claimIsEditable and &&	2024-04-12 11:35:21 +02:00
Pablo Natek	68f142e560	Merge branch 'dev' into 6130-commitLint	2024-04-12 09:31:52 +00:00