18440 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	6d02a8dc0c	refs #5739 feat: try remove duplicate networks	2024-01-12 14:14:21 +01:00
Alex Moreno	ce697f8ba5	refs #5739 feat: try remove duplicate networks	2024-01-12 14:11:59 +01:00
Alex Moreno	5fa1637d84	refs #5739 feat: try remove duplicate networks	2024-01-12 14:09:37 +01:00
Alex Moreno	2c61f21868	refs #5739 feat: try remove duplicate networks	2024-01-12 14:07:28 +01:00
Alex Moreno	22b0e65e35	refs #5739 feat: try remove duplicate networks	2024-01-12 14:05:47 +01:00
Alex Moreno	bfce8a57d4	refs #5739 feat: try remove duplicate networks	2024-01-12 13:55:37 +01:00
Alex Moreno	ccd80eb6e2	refs #5739 feat: try remove duplicate networks	2024-01-12 13:53:58 +01:00
Alex Moreno	112a5f1f3a	refs #5739 feat: try remove duplicate networks	2024-01-12 13:49:32 +01:00
Alex Moreno	0ea9997753	refs #5739 feat: try remove duplicate networks	2024-01-12 13:40:13 +01:00
Alex Moreno	56dc5ebb0e	refs #5739 feat: try remove duplicate networks	2024-01-12 13:37:52 +01:00
Alex Moreno	31fc3c5b35	refs #5739 feat: try remove duplicate networks	2024-01-12 13:36:10 +01:00
Alex Moreno	336c678801	refs #5739 feat: try run test back and front	2024-01-12 11:53:58 +01:00
Alex Moreno	5604423de0	refs #5739 feat: try run test back and front	2024-01-12 11:41:07 +01:00
Alex Moreno	ba247f4767	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5739-dockerRefactor	2024-01-12 11:01:14 +01:00
Alex Moreno	63fa732ba9	refs #5739 feat: try run test back and front	2024-01-12 10:52:00 +01:00
Alex Moreno	d0e64dff2b	refs #5739 feat: try run test back and front	2024-01-12 10:49:02 +01:00
Carlos Satorres	b7a523074f	Merge pull request 'refs #6322 importe' (!1921) from 6322-futureTicketImporte into dev ... Reviewed-on: #1921 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-12 07:55:18 +00:00
Carlos Satorres	d0df880c32	Merge branch 'dev' into 6322-futureTicketImporte	2024-01-12 07:47:23 +00:00
Alex Moreno	1319428085	refs #5739 feat: try run test back	2024-01-12 07:59:16 +01:00
Javi Gallego	887f686767	Merge pull request '3979-abonarTicketsSinAlmacen' (!1910) from 3979-abonarTicketsSinAlmacen into dev ... Reviewed-on: #1910 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-11 12:39:27 +00:00
Alex Moreno	f713ec268f	refs #5739 feat: try run test back	2024-01-11 13:33:58 +01:00
Javi Gallego	c98baf21bf	Merge branch 'dev' into 3979-abonarTicketsSinAlmacen	2024-01-11 12:17:59 +00:00
Juan Ferrer	46fe878f45	Merge pull request 'refs #6660 feat: update mariadb version 10.7.7→10.11.6' (!1926) from 6660-mariadbV10.11.6 into dev ... Reviewed-on: #1926 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-01-11 11:28:13 +00:00
Juan Ferrer	ce5e8c278f	Merge branch 'dev' into 6660-mariadbV10.11.6	2024-01-11 11:22:55 +00:00
Javier Segarra	93f80718d8	Merge pull request 'Send message to comercial by RocketChat' (!1897) from 5499_claim_rocketMessage_comercial into dev ... Reviewed-on: #1897 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-01-11 07:00:12 +00:00
Javier Segarra	b76e269e73	refs #5499 perf: rename variable	2024-01-11 06:18:02 +00:00
Alex Moreno	edde5819e3	refs #6660 feat: update mariadb version 10.7.7→10.11.6	2024-01-10 15:39:35 +01:00
Javier Segarra	de4ddf9392	remove bad comment	2024-01-10 13:47:42 +00:00
Javier Segarra	21566fd7ba	refs #5499 code: remove unused translations	2024-01-10 07:50:29 +01:00
Javier Segarra	7cc454751e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5499_claim_rocketMessage_comercial	2024-01-10 07:48:11 +01:00
Javier Segarra	1bd6751d56	refs #5499 revert	2024-01-10 07:46:11 +01:00
Carlos Satorres	6647649f5e	Merge pull request 'refs #6291 validateTin' (!1836) from 6291-comprobarDNI into dev ... Reviewed-on: #1836 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-09 14:03:17 +00:00
Carlos Satorres	55f9519ebd	Merge branch 'dev' into 6291-comprobarDNI	2024-01-09 13:59:48 +00:00
Guillermo Bonet	510a395ef2	Merge pull request 'refactor: refs #6410 Deleted dmsType.path' (!1919) from 6410-dmsTypePath into dev ... Reviewed-on: #1919 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-01-09 13:53:16 +00:00
Carlos Satorres	16d7a20798	Merge branch 'dev' into 6291-comprobarDNI	2024-01-09 13:49:31 +00:00
Guillermo Bonet	08aaf660e2	Merge branch 'dev' into 6410-dmsTypePath	2024-01-09 13:33:01 +00:00
Guillermo Bonet	81ffc122fc	Merge branch 'test' into dev	2024-01-09 14:09:47 +01:00
Guillermo Bonet	9a82fbea05	Merge branch 'master' into test	2024-01-09 14:07:32 +01:00
Guillermo Bonet	5d4c106825	fix: refs #5848 Added flag DONT_EXPIRE_PASSWD	2024-01-09 13:59:11 +01:00
Carlos Satorres	bf44f82f4f	refs #6322 fix code	2024-01-09 13:16:14 +01:00
Carlos Satorres	676d95563b	refs #6322 importe	2024-01-09 12:53:58 +01:00
Guillermo Bonet	d5ca47ea2a	refactor: refs #6410 Deleted dmsType.path	2024-01-09 09:51:12 +01:00
Carlos Satorres	a22de3ab25	Merge branch 'dev' into 6291-comprobarDNI	2024-01-09 08:46:01 +00:00
Pablo Natek	dffb212722	Merge pull request 'refactor(ticketTracking.create): refs #6366 unify Ticket.state ticketTracking.create i vn.ticket_setState' (!1838) from 6366-unifyTicketChangeState into dev ... Reviewed-on: #1838 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-09 07:00:15 +00:00
Alex Moreno	61fa3a62db	refs #5739 feat: start docker test front and e2e	2024-01-08 15:47:47 +01:00
Alex Moreno	3b38482221	Merge pull request 'refs #6067 fix(Mailer): await send email' (!1917) from 6067-mailer-await-email-send into master ... Reviewed-on: #1917 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-01-08 14:03:58 +00:00
Alex Moreno	593b58134e	refs #5739 feat: docker test back	2024-01-08 14:45:29 +01:00
Alex Moreno	4e823593b5	refs #6067 fix(Mailer): await send email	2024-01-08 14:35:01 +01:00
Pablo Natek	0e29db3b1e	Merge branch 'dev' into 6366-unifyTicketChangeState	2024-01-08 13:17:24 +00:00
Alex Moreno	06f1781b43	refs #5739 try jenkins	2024-01-08 13:42:51 +01:00