3047 Commits

Author	SHA1	Message	Date
Jorge Penadés	b88d61e864	Merge commit '6fb4e8677' into 6274-loginWorkerTimeControl	2023-12-07 14:53:33 +01:00
Jorge Penadés	6fb4e86777	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into HEAD	2023-12-07 14:47:31 +01:00
Javi Gallego	58ba1c10d0	ci: dev-test	2023-12-07 08:01:16 +01:00
Javi Gallego	7ff8ec93ff	Merge pull request 'test' (!1879) from test into dev ... Reviewed-on: #1879	2023-12-06 07:54:13 +00:00
Jorge Penadés	b50a6add0d	refs #6274 merge renewToken	2023-12-05 15:57:42 +01:00
Jorge Penadés	bb186bafe0	Merge branch '6264-renewToken' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-12-05 14:12:00 +01:00
Jorge Penadés	25006a938b	refs #6274 refactor clockIn	2023-12-05 11:53:27 +01:00
Jorge Penadés	419ab41816	refs #6276 Acl addTimeEntry	2023-12-05 09:55:22 +01:00
Jorge Penadés	8cb97e2477	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-12-04 15:09:44 +01:00
Javier Segarra	a8b0a7a5b3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken	2023-12-04 14:46:21 +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
Pablo Natek	3f22f48df7	fix(getFiltered): refs #3271 fix to event filter	2023-11-30 12:13:12 +01: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	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	97d7f8356f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken	2023-11-30 07:08:23 +01:00
Javier Segarra	46774b2e73	refs #6434 perf: new field in SignInLog table	2023-11-29 19:35:37 +00:00
Javi Gallego	d246b5f9a8	Merge branch 'dev' into 5652-fixtures-fix	2023-11-29 15:26:51 +01:00
Jorge Penadés	c609f6f47f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-11-29 09:27:50 +01:00
Alex Moreno	2e22984e77	refs #6197 fix: add salix role in fixtures	2023-11-29 09:13:54 +01:00
Jorge Penadés	48dd068190	refs #6274 upperCase Model	2023-11-29 08:37:56 +01:00
Jorge Penadés	29fb36010c	refs #6274 back methods created	2023-11-28 14:48:03 +01:00
Javier Segarra	63533459b0	refs #6434 feat: improve signIn method	2023-11-28 13:22:17 +01:00
Javi Gallego	2fa56cce4b	fix: refs #5652 arreglo fixtures	2023-11-28 09:22:00 +01:00
Javier Segarra	901a44cc62	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken	2023-11-27 09:48:31 +01:00
Guillermo Bonet	2be1639e9f	refactor: refs #3222 Expence to expense	2023-11-24 12:42:25 +01:00
Javi Gallego	f44424dbcf	test: refs #6028 test	2023-11-23 09:44:47 +01:00
Javi Gallego	5b289ec083	Merge branch 'dev' into 6028_route_getRouteByWorker	2023-11-23 09:21:44 +01:00
Alex Moreno	217aa1ac77	refs #6491 deploy(2350) init version	2023-11-23 08:35:08 +01:00
Javi Gallego	e856de0cfd	feat: refs #6028 test	2023-11-22 15:54:38 +01:00
Javi Gallego	e146c0ea46	Merge branch 'dev' into 6028_route_getRouteByWorker	2023-11-22 12:42:20 +01:00
Guillermo Bonet	d52c82fb19	Merge branch 'dev' into 4502-zoneEstimatedDelivery	2023-11-22 11:36:07 +00:00
Guillermo Bonet	b3d1c72adc	Merge branch 'dev' into 4502-zoneEstimatedDelivery	2023-11-21 09:13:41 +00:00
Alex Moreno	e909c2bc26	Merge branch 'dev' into 6454-dbDump	2023-11-21 09:13:17 +00:00
Jorge Penadés	34e5409533	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-newInvoiceInDueDay	2023-11-21 08:19:11 +01:00
Alex Moreno	ee1a0c15ee	refs #6454 feat: dump db	2023-11-20 15:09:55 +01:00
Guillermo Bonet	5fdf18825c	Merge branch 'dev' into 4502-zoneEstimatedDelivery	2023-11-20 13:14:51 +00:00
Alex Moreno	e25ca914a0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-20 10:13:02 +01:00
Guillermo Bonet	b2b12adb3d	Merge branch '4502-zoneEstimatedDelivery' of https://gitea.verdnatura.es/verdnatura/salix into 4502-zoneEstimatedDelivery	2023-11-20 09:47:58 +01:00
Guillermo Bonet	61b2d4c5fd	refactor: refs #4502 zoneEstimatedDelivery	2023-11-20 09:47:57 +01:00
Alex Moreno	7951b874a6	Merge branch 'dev' into 6264-renewToken	2023-11-20 06:39:50 +00:00
Juan Ferrer	1937560118	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-11-16 23:07:30 +01:00
Juan Ferrer	4f5242e3ae	fix: refs #6432 account sync fixes	2023-11-16 23:07:26 +01:00
Javier Segarra	a73453e9ed	refs #6434 feat: remove old sql file	2023-11-16 11:56:59 +01:00
Alex Moreno	b8d256e4e4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate	2023-11-16 09:58:51 +01:00
Alex Moreno	f677382f96	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-16 09:29:53 +01:00