5485 Commits

All Branches

Search

Author	SHA1	Message	Date
Pablo Natek	74b47361c4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought	2024-09-03 09:42:35 +02:00
Robert Ferrús	ea8fde49ff	Merge pull request 'feat: refs #211153 businessDataLinkGrafana' (!663) from 211153-businessDataLinkGrafana into dev ... Reviewed-on: #663 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-03 06:47:24 +00:00
Robert Ferrús	5a684e244f	Merge branch 'dev' into 211153-businessDataLinkGrafana	2024-09-03 06:46:35 +00:00
Pablo Natek	2fb974af0f	Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought	2024-09-03 08:01:19 +02:00
Pablo Natek	18ded3b6f5	Merge pull request 'feat: refs #7129 add km start and end on create form' (!666) from 7129-someFixesAfterMigration into dev ... Reviewed-on: #666 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-03 05:28:09 +00:00
Pablo Natek	f6fe05a47a	Merge branch 'dev' into 7129-someFixesAfterMigration	2024-09-03 05:26:37 +00:00
Jon Elias	e2674e0cd8	Merge pull request '#7354 end Zone migration' (!539) from 7354_ZoneMigration_End into dev ... Reviewed-on: #539 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-03 04:48:17 +00:00
Jon Elias	a2eb298733	Merge branch 'dev' into 7354_ZoneMigration_End	2024-09-03 04:36:22 +00:00
Jorge Penadés	6c113e33fd	Merge pull request 'test To Dev' (!665) from testToDev into dev ... Reviewed-on: #665 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-02 13:12:20 +00:00
Jorge Penadés	a382d8278c	Merge branch 'dev' into testToDev	2024-09-02 13:11:08 +00:00
Javier Segarra	d65b52804d	Merge pull request '#7889 - Implmenet main shortcuts' (!655) from 7889_main_shortcuts into dev ... Reviewed-on: #655 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-02 13:03:19 +00:00
Javier Segarra	5d511c7b1b	Merge branch 'dev' into 7889_main_shortcuts	2024-09-02 13:02:07 +00:00
Javier Segarra	c51af96ca7	fix: module icon	2024-09-02 12:56:44 +00:00
Pablo Natek	77d306ffeb	Merge branch 'dev' into 7129-someFixesAfterMigration	2024-09-02 12:46:26 +00:00
Pablo Natek	9cd941a01c	feat: refs #7129 add km start and end on create form	2024-09-02 14:45:43 +02:00
Jon Elias	8ffbe400d5	refactor: refs #7354 modified VnInputTime	2024-09-02 14:21:58 +02:00
Jon Elias	127d5c9fd3	Merge branch '7354_ZoneMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End	2024-09-02 13:44:26 +02:00
Jon Elias	ea1e82939a	fix: refs #7354 e2e tests	2024-09-02 13:44:25 +02:00
Jorge Penadés	200481414f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into testToDev	2024-09-02 13:21:40 +02:00
Jon Elias	1af4a559fc	Merge branch 'dev' into 7354_ZoneMigration_End	2024-09-02 10:50:22 +00:00
Jon Elias	709f434e5d	refactor: refs #7354 changed icon color in table and notification when deleting a zone	2024-09-02 12:49:15 +02:00
Robert Ferrús	a3b253c9eb	feat: refs #211153 businessDataLinkGrafana	2024-09-02 11:14:46 +02:00
Jorge Penadés	63f5f85e8d	Merge pull request 'fix: refs #7524 dynamic fetching' (!662) from 7524-warmfix-useLimit into test ... Reviewed-on: #662 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-02 08:54:27 +00:00
Jorge Penadés	56d226b36b	fix: refs #7524 dynamic fetching	2024-09-02 10:03:01 +02:00
Jorge Penadés	d55bf0ff75	Merge pull request '#7524 useLimit' (!645) from 7524-useLimit into test ... Reviewed-on: #645 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-02 07:50:45 +00:00
Javier Segarra	6854b2f3c7	Merge branch '7889_main_shortcuts' of https://gitea.verdnatura.es/verdnatura/salix-front into 7889_main_shortcuts	2024-09-02 09:34:35 +02:00
Javier Segarra	d3ab56184b	perf: remove console.log	2024-09-02 09:34:33 +02:00
Jorge Penadés	f0055d7b36	Merge pull request '#7353 fine tunning monitors' (!624) from 7353-fineTunningMonitor into dev ... Reviewed-on: #624 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-02 07:33:42 +00:00
Jorge Penadés	ed2167e199	refactor: refs #7353 ease logic	2024-09-02 09:30:15 +02:00
Jorge Penadés	a8fc5a8d73	Merge branch 'dev' of https: refs #7353//gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor	2024-09-02 09:09:27 +02:00
Javier Segarra	af9a58a3df	Merge branch 'dev' into 7889_main_shortcuts	2024-08-30 22:12:21 +00:00
Carlos Satorres	5b0df1124e	Merge pull request '7355-accountMigrationFixes2' (!658) from 7355-accountMigrationFixes2 into dev ... Reviewed-on: #658 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-08-30 10:58:09 +00:00
Carlos Satorres	874cbfea9b	refs #7366 fix travel hours	2024-08-30 12:31:42 +02:00
Carlos Satorres	859eb918cd	refs #6897 fix entry	2024-08-30 11:50:05 +02:00
Jorge Penadés	f9a509ac67	feat: refs #7353 add no one opt	2024-08-30 11:40:55 +02:00
Carlos Satorres	f33733c7f2	refs #7355 fix total	2024-08-30 11:25:00 +02:00
Carlos Satorres	8dd462531a	Merge branch '7355-accountMigrationFixes2' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigrationFixes2	2024-08-30 11:18:51 +02:00
Carlos Satorres	1544513a3e	refs #7355 #7366 fix account, summary, list, travelList, tooltip	2024-08-30 11:18:48 +02:00
Carlos Satorres	fa36f8d8af	Merge branch 'dev' into 7355-accountMigrationFixes2	2024-08-30 07:55:09 +00:00
Carlos Satorres	76cb8c6b28	refs #7355 remove bug	2024-08-30 09:54:16 +02:00
Carlos Satorres	d555b89598	refs #7355 remove bad code	2024-08-30 09:53:42 +02:00
Carlos Satorres	278f691ed2	refs #7355 fix views summarys, entryList, travelList refact	2024-08-30 09:52:43 +02:00
Jorge Penadés	90b2cf09b9	feat: refs #7353 add right icons	2024-08-29 16:54:09 +02:00
Jorge Penadés	6062c2d845	feat: refs #7353 salesPerson nickname & id	2024-08-29 16:51:55 +02:00
Jorge Penadés	956230d708	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor	2024-08-29 16:40:34 +02:00
Jorge Penadés	a845190768	Merge pull request 'fix: refs #7356 create claim dialog' (!656) from 7356-fixCreateClaimDialog into dev ... Reviewed-on: #656 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-29 14:38:45 +00:00
Jorge Penadés	b335da8ff6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7356-fixCreateClaimDialog	2024-08-29 16:36:23 +02:00
Carlos Satorres	36a7618ef5	refs #7355 previews	2024-08-29 15:06:09 +02:00
Carlos Satorres	691c9a8e81	refs #7355 fix roles filters	2024-08-29 14:57:27 +02:00
Carlos Satorres	9899d73566	refs #7355 fix accounts, vnTable	2024-08-29 14:45:47 +02:00