21216 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Javi Gallego	e8001b72e4	feat: minor changes	2024-04-13 09:05:54 +02:00
Carlos Satorres	b706d1c1c6	refs #6976 changes back supplier consumption	2024-04-12 14:26:28 +02: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
Pablo Natek	f2fc9d09d5	Merge pull request 'fix(sql): refs #6005 fix fk formation' (!2294) from 6005-fixsql into dev ... Reviewed-on: #2294 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-12 09:01:30 +00:00
Javi Gallego	bb6ea31bf7	feat: funcional a falta de test	2024-04-12 10:26:32 +02:00
Pablo Natek	e43f7d9f28	Merge branch 'dev' into 6005-fixsql	2024-04-12 08:21:42 +00:00
Pablo Natek	0d03cf76b4	fix(sql): refs #6005 fix fk formation	2024-04-12 10:17:04 +02:00
Sergio De la torre	6014db75ea	Merge pull request '6497_redirect_firewall' (!2239) from 6497_redirect_firewall into dev ... Reviewed-on: #2239 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-04-12 07:44:05 +00:00
Sergio De la torre	0af4c6ee2b	Merge branch 'dev' into 6497_redirect_firewall	2024-04-12 07:42:20 +00:00
Juan Ferrer	98ed2d0d37	Merge pull request 'fix(util): refs #7205 fix util.slowLog_prune' (!2293) from 7205-fixSlowLogPrune into master ... Reviewed-on: #2293 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-12 07:26:42 +00:00
Juan Ferrer	ccf77ed356	fix(util): refs #7205 util.slowLog_prune code clean	2024-04-12 09:24:48 +02:00
Juan Ferrer	622075a9aa	fix(util): refs #7205 fix util.slowLog_prune	2024-04-12 09:21:34 +02:00
Pablo Natek	3547299c70	Merge pull request '6005-backupLabeler' (!2276) from 6005-backupLabeler into dev ... Reviewed-on: #2276 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-04-12 07:12:53 +00:00
Guillermo Bonet	e516f90a0b	Merge branch 'test' into dev	2024-04-12 08:56:58 +02:00
Guillermo Bonet	d503018d5c	Fixtures Jorge	2024-04-12 08:56:38 +02:00
Robert Ferrús	adadf70f1e	feat: refs #6500	2024-04-12 08:44:06 +02:00
Robert Ferrús	800fa36d04	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6500-procRefactor8	2024-04-12 08:40:50 +02:00
Guillermo Bonet	b5f3b5ebee	Fix version	2024-04-12 08:19:57 +02:00
Guillermo Bonet	c0cabc894b	refactor: refs #7181 Added grant	2024-04-12 08:08:49 +02:00
Guillermo Bonet	f0472b7ace	Merge branch 'test' into dev	2024-04-12 08:03:32 +02:00
Guillermo Bonet	69280c63b4	Merge branch 'master' into test	2024-04-12 08:03:12 +02:00
Robert Ferrús	f545a57c9f	feat: refs #6500	2024-04-12 07:58:18 +02:00
Guillermo Bonet	d86bb6b004	Merge pull request 'refactor: refs #7181 vn2008.Deleted risk_vs_client_list' (!2283) from 7181-risk_vs_client_list into dev ... Reviewed-on: #2283 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-12 05:18:06 +00:00
Pablo Natek	726b1ddc07	Merge branch 'dev' into 6005-backupLabeler	2024-04-12 05:14:29 +00:00
Juan Ferrer	cb1bb4ebc4	Merge pull request 'feat(pbx): refs #7198 country prefix, schedule' (!2284) from 7198-pbxPrefixSchedule into master ... Reviewed-on: #2284 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-11 14:58:54 +00:00
Juan Ferrer	3f1941293e	Merge branch 'master' into 7198-pbxPrefixSchedule	2024-04-11 14:56:31 +00:00
Guillermo Bonet	ec481b4141	Merge branch 'test' into dev	2024-04-11 14:52:42 +02:00
Guillermo Bonet	2226922366	Merge branch 'master' into test	2024-04-11 14:52:16 +02:00
Guillermo Bonet	4449441cbf	Merge pull request 'hotfix: ticket168996 Now ticket_doCmr ignore deliveryMethod' (!2279) from ticket168996-hotfix into master ... Reviewed-on: #2279 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-11 12:42:44 +00:00
Guillermo Bonet	f69acf3a05	Merge branch 'dev' into 7181-risk_vs_client_list	2024-04-11 12:41:37 +00:00