20306 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	346557ed69	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-03-14 08:20:15 +01:00
Guillermo Bonet	b4b6b47a9c	hotfix: itemProposal added transaction	2024-03-14 07:53:24 +01:00
Guillermo Bonet	4b83d416b2	Merge pull request 'refactor: refs #7018 Mirated procs to vn' (!2157) from 7018-procMigration into dev ... Reviewed-on: #2157 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-03-14 06:03:32 +00:00
Sergio De la torre	1a2bda7e18	Merge pull request '6078_workerActivty' (!2130) from 6078_workerActivty into dev ... Reviewed-on: #2130 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-14 05:58:13 +00:00
Carlos Satorres	33bd21d40b	refs #6755 fix model	2024-03-13 16:29:05 +01:00
Javier Segarra	f18e90d6f3	Merge branch 'dev' into 5858-zone_Collisions	2024-03-13 14:45:12 +00:00
Javier Segarra	f09283b9c9	refs #5858 perf: html	2024-03-13 15:44:16 +01:00
Javier Segarra	4012b1756d	refs #5858 add comment	2024-03-13 15:00:12 +01:00
Juan Ferrer	07f96a864d	Merge branch 'dev' into 6925-fix_translations	2024-03-13 13:22:41 +00:00
Carlos Satorres	1315bfda88	refs #6755 fix test	2024-03-13 14:18:53 +01:00
Pako Natek	67b55ae845	fixtures local	2024-03-13 14:16:27 +01:00
Pako Natek	25f979156a	nuevo url para catalogue y sliders_get	2024-03-13 14:00:59 +01:00
Guillermo Bonet	11dcb6e79f	refactor: refs #6875 packing not null, negative or zero	2024-03-13 13:45:57 +01:00
Carlos Satorres	41fbae7eec	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6755-restoreRefactor	2024-03-13 13:37:38 +01:00
Sergio De la torre	b4fe00a028	Merge branch 'dev' into 6078_workerActivty	2024-03-13 11:36:59 +00:00
Javier Segarra	172e7566b5	refs #5858 perf: improve insert	2024-03-13 11:58:25 +01:00
Guillermo Bonet	cbaa48a933	Merge branch 'dev' into 6875-packingNotNull	2024-03-13 10:56:17 +00:00
Javier Segarra	8276765225	refs #5858 perf: destinationFk to pepe	2024-03-13 11:54:02 +01:00
Carlos Satorres	92cf8fc5e1	refs #6755 remove console	2024-03-13 11:46:43 +01:00
Carlos Satorres	f79d1320d8	Merge branch 'dev' into 6842-sageMod	2024-03-13 10:29:07 +00:00
Guillermo Bonet	14571ed10f	Merge branch 'dev' into 7018-procMigration	2024-03-13 09:39:55 +00:00
Carlos Satorres	922d8acb75	Merge branch 'dev' into 6913-routeKm	2024-03-13 09:24:26 +00:00
Guillermo Bonet	b5f3753253	Merge branch 'test' into dev	2024-03-13 07:42:51 +01:00
Guillermo Bonet	2a38249131	Merge branch 'master' into test	2024-03-13 07:40:39 +01:00
Guillermo Bonet	319bf314b3	hotfix: itemProposal	2024-03-13 07:38:14 +01:00
Javier Segarra	99f01a1dbd	refs #6930 perf: add accessScopes to account.logout	2024-03-12 13:39:21 +01:00
Javier Segarra	ff6a1a9111	refs #6930 perf: remove logoutMultimedia acl	2024-03-12 13:39:01 +01:00
Carlos Satorres	a6d1c5b6db	refs #6755 remove	2024-03-12 13:33:14 +01:00
Javier Segarra	c84e86270c	refs #6930 perf: remove logoutMultimedia method	2024-03-12 13:30:32 +01:00
Javier Segarra	f2f6e7be0b	refs #6930 perf: parallel calls	2024-03-12 13:29:53 +01:00
Carlos Satorres	106296be7b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6755-restoreRefactor	2024-03-12 12:55:56 +01:00
Carlos Satorres	ed57212618	refs #6755 fix restore	2024-03-12 12:55:14 +01:00
Carlos Satorres	93170dd82f	Merge branch 'dev' into 6913-routeKm	2024-03-12 11:48:49 +00:00
Javier Segarra	486b51bcfa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6930_scopedToken_Multimedia	2024-03-12 12:46:46 +01:00
Alex Moreno	dd69c9fe94	Merge branch 'dev' into 6925-fix_translations	2024-03-12 11:38:43 +00:00
Sergio De la torre	9d94259d67	refs #6078 feat: workerActivity	2024-03-12 12:21:46 +01:00
Javier Segarra	e7f6e61ea1	refs #5858: change notification owner	2024-03-12 10:20:43 +01:00
Sergio De la torre	375b690063	Merge branch 'dev' into 6078_workerActivty	2024-03-12 09:12:45 +00:00
Javier Segarra	c1d0ea7e27	refs #5858: breaklines	2024-03-12 09:40:42 +01:00
Javier Segarra	63a22a50f4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-12 09:37:41 +01:00
Jorge Penadés	5531639027	feat: refs #6951 create procedure	2024-03-12 09:34:12 +01:00
Guillermo Bonet	1d398a0acf	refactor: refs #7018 Added comment and minor changes	2024-03-12 08:40:11 +01:00
Guillermo Bonet	e2eddbaef7	refactor: refs #7018 Added comment	2024-03-12 08:35:13 +01:00
Guillermo Bonet	1bcb61a224	refactor: refs #7018 Mirated procs to vn	2024-03-12 08:25:58 +01:00
Carlos Satorres	6627c7a16a	refs #6913 routeKm	2024-03-12 08:25:01 +01:00
Guillermo Bonet	819bc7a56d	Merge pull request 'refactor: refs #6495 Migrated procs to vn' (!2108) from 6495-procRefactor4 into dev ... Reviewed-on: #2108 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-03-12 06:04:19 +00:00
Guillermo Bonet	516b4b364f	Merge branch 'dev' into 6499-procRefactor6	2024-03-11 13:36:34 +00:00
Alex Moreno	35ef9b53c2	Merge branch 'dev' into 6925-fix_translations	2024-03-11 12:49:34 +00:00
Guillermo Bonet	adafab5847	refactor: refs #6874 item_getSimilar	2024-03-11 13:27:18 +01:00
Guillermo Bonet	552a1a33c2	hotfix: itemProposal	2024-03-11 12:38:52 +01:00