20770 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
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
Jorge Penadés	d7b06fe637	fix: refs #6938 scope	2024-04-15 12:47:27 +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
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
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
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
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
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
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
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
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
Alex Moreno	ec095161c8	Merge pull request 'hotFix(closeAll): continue loop' (!2290) from hotFix_closeAll_continueLoop into master ... Reviewed-on: #2290 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-11 11:57:09 +00:00
Alex Moreno	99d80d4d30	hotFix(closeAll): continue loop	2024-04-11 13:51:33 +02:00