18021 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	866ad7a9f9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail	2023-12-11 08:20:19 +01:00
Sergio De la torre	f774297321	Merge pull request 'refs #5867 fix: tickets sql' (!1800) from 5867-Driver-Route-Pdf into dev ... Reviewed-on: #1800 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-12-11 06:05:07 +00:00
Sergio De la torre	64ecf2e229	Merge branch 'dev' into 5867-Driver-Route-Pdf	2023-12-11 05:48:21 +00:00
Carlos Satorres	f5ef6c66a4	Merge pull request 'refs #6010 remove pending' (!1876) from 6010-testBackPending into dev ... Reviewed-on: #1876 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-12-07 08:41:03 +00:00
Carlos Satorres	3abbae7612	Merge branch 'dev' into 6010-testBackPending	2023-12-07 07:16:17 +00:00
Javi Gallego	be5df940bf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-12-07 08:01:20 +01:00
Javi Gallego	58ba1c10d0	ci: dev-test	2023-12-07 08:01:16 +01:00
Carlos Satorres	3c9c221220	Merge branch 'dev' into 6010-testBackPending	2023-12-07 06:59:38 +00:00
Carlos Satorres	c75ee22345	Merge pull request 'refs #6318 quantity' (!1875) from 6318-negativeQuantity into dev ... Reviewed-on: #1875 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-12-07 06:59:24 +00:00
Carlos Satorres	c7d960229d	Merge branch 'dev' into 6010-testBackPending	2023-12-07 06:34:32 +00:00
Carlos Satorres	acfa0fd857	Merge branch 'dev' into 6318-negativeQuantity	2023-12-07 06:31:21 +00:00
Javi Gallego	7ff8ec93ff	Merge pull request 'test' (!1879) from test into dev ... Reviewed-on: #1879	2023-12-06 07:54:13 +00:00
Carlos Satorres	f55e85a189	refs #6010 remove pending	2023-12-05 10:35:48 +01:00
Carlos Satorres	af07a531ed	refs #6318 quantity	2023-12-05 08:49:55 +01:00
Carlos Satorres	051c93a42c	remove fdescribe	2023-12-04 09:41:24 +01:00
Carlos Satorres	c0ce7e542f	refs #6085 solve testback	2023-12-04 09:40:57 +01:00
Carlos Satorres	6d486fbec9	refs #6085 trad, remove front, back test	2023-12-01 13:58:45 +01:00
Jorge Penadés	0b1bbbaaa6	Merge pull request 'refs #5835 rate added' (!1865) from 5835-summaryRate into dev ... Reviewed-on: #1865 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-12-01 07:22:26 +00:00
Jorge Penadés	611b45bae0	Merge branch 'dev' into 5835-summaryRate	2023-11-30 15:16:18 +00:00
Alex Moreno	6699f5d5a6	Merge pull request 'fix(getFiltered): refs #3271 fix to event filter' (!1872) from 3271-zoneGetFilterdFix into test ... Reviewed-on: #1872 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-11-30 13:49:55 +00:00
Pablo Natek	72283005b8	remove(console.log): refs #3271 remove console.log	2023-11-30 14:43:14 +01:00
Pablo Natek	c457b5c4d2	Merge branch 'test' into 3271-zoneGetFilterdFix	2023-11-30 12:39:26 +00:00
Alex Moreno	ee7dd66ce9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-30 12:49:42 +01:00
Alex Moreno	35e74a7635	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-11-30 12:48:27 +01:00
Alex Moreno	ab69dcd4fe	refs #6524 fix: fixtures and feat: new changelog format	2023-11-30 12:32:41 +01:00
Javier Segarra	b241efc961	Merge pull request 'refs #6434 feat: improve signIn method' (!1867) from 6434-signInLog_improve_test into test ... Reviewed-on: #1867 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-11-30 11:20:57 +00:00
Alex Moreno	016e4ae37c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-11-30 12:20:50 +01:00
Pablo Natek	3f22f48df7	fix(getFiltered): refs #3271 fix to event filter	2023-11-30 12:13:12 +01:00
Carlos Satorres	e7d3ef0763	Merge pull request 'refs #6065 remove workcenter' (!1871) from hotfix-hoursFetch into master ... Reviewed-on: #1871 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-11-30 09:20:26 +00:00
Jorge Penadés	6121eeaa3a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-summaryRate	2023-11-30 09:44:05 +01:00
Carlos Satorres	9cdb7c3cca	refs #6065 remove workcenter	2023-11-30 09:18:00 +01:00
Javi Gallego	69e555e7b4	Merge pull request '5652-fixtures-fix' (!1870) from 5652-fixtures-fix into dev ... Reviewed-on: #1870 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-11-30 08:13:05 +00:00
Javier Segarra	7611acb8f2	refs #6434 perf rename version folder for sql file	2023-11-30 08:34:10 +01:00
Javier Segarra	80f8037f58	refs #6434 perf remove version folder for sql file	2023-11-30 08:23:14 +01:00
Javier Segarra	58855a7cdd	refs #6434 perf: remove bad characters method description	2023-11-30 08:14:56 +01:00
Javier Segarra	6b354a20ad	refs #6434 perf: add sql table description	2023-11-30 08:13:28 +01:00
Javier Segarra	138d11b7b0	refs #6434 perf new version folder for sql file	2023-11-30 08:10:32 +01:00
Javier Segarra	1576ab992d	refs #6434 perf: new field in SignInLog table	2023-11-29 19:36:30 +00:00
Javier Segarra	46774b2e73	refs #6434 perf: new field in SignInLog table	2023-11-29 19:35:37 +00:00
Javier Segarra	9176cdb4cb	refs #6434 perf: new field in SignInLog table	2023-11-29 19:34:00 +00:00
Javier Segarra	ed6c0924d7	refs #6434 perf: remove console.error	2023-11-29 19:33:04 +00:00
Javier Segarra	48b82b02ca	refs #6434 change param type for signInValidate	2023-11-29 19:32:10 +00:00
Javi Gallego	d246b5f9a8	Merge branch 'dev' into 5652-fixtures-fix	2023-11-29 15:26:51 +01:00
Carlos Satorres	9a3efdd6fe	refs #6085 model y back	2023-11-29 13:55:44 +01:00
Guillermo Bonet	b3cc020ea7	Merge pull request 'refs #6023 Fix change rol bug' (!1727) from 6023-changeRol into dev ... Reviewed-on: #1727 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-11-29 11:48:17 +00:00
Guillermo Bonet	5e9a62eac2	Merge branch 'dev' into 6023-changeRol	2023-11-29 08:21:23 +00:00
Alex Moreno	2e22984e77	refs #6197 fix: add salix role in fixtures	2023-11-29 09:13:54 +01:00
Carlos Satorres	e548ef4dae	refs #6085 searchpanel and change path	2023-11-29 07:51:58 +01:00
Carlos Satorres	0186c2c806	refs #6085 aclMail back	2023-11-29 07:33:49 +01:00
Javier Segarra	63533459b0	refs #6434 feat: improve signIn method	2023-11-28 13:22:17 +01:00