6185 Commits

All Branches

Search

Author	SHA1	Message	Date
Pablo Natek	6e6b88d340	Merge pull request '7129-fixMigrationIssues' (!754) from 7129-fixMigrationIssues into dev ... Reviewed-on: #754 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-26 12:53:44 +00:00
Pablo Natek	6e6b65771a	Merge branch 'dev' into 7129-fixMigrationIssues	2024-09-26 06:09:21 +00:00
Javi Gallego	9095c579db	Merge pull request '6722-thermograph' (!761) from 6722-thermograph into dev ... Reviewed-on: #761 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-26 06:07:26 +00:00
Pablo Natek	c388d5ab2a	Merge branch 'dev' of https: refs #7129//gitea.verdnatura.es/verdnatura/salix-front into 7129-fixMigrationIssues	2024-09-26 07:57:59 +02:00
Javi Gallego	dcfdabde32	feat: tabulation	2024-09-25 14:17:26 +02:00
Javi Gallego	eb0e18bf58	Merge branch 'dev' into 6722-thermograph	2024-09-25 13:48:12 +02:00
Javi Gallego	bd2fa37450	feat: maxTemperature and minTemperature	2024-09-25 13:34:43 +02:00
Alex Moreno	8c13ceb3fe	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-25 13:28:13 +02:00
Alex Moreno	5f4df6eb96	Merge pull request '7155-travel_daysOnward_2' (!759) from 7155-travel_daysOnward_2 into test ... Reviewed-on: #759 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-09-25 11:27:25 +00:00
Alex Moreno	bcada72f04	fix: refs #7155 use chip-locale	2024-09-25 13:24:22 +02:00
Alex Moreno	6bd2835c59	chore: refs #7155 typo	2024-09-25 13:18:26 +02:00
Alex Moreno	9a11f94922	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 7155-travel_daysOnward_2	2024-09-25 13:17:34 +02:00
Alex Moreno	8dd2c44832	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-25 12:53:12 +02:00
Alex Moreno	f04beb8f90	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-09-25 12:52:58 +02:00
Jorge Penadés	0dec6edc68	Merge pull request 'fix: refs #6898 add role' (!757) from 6898-hotfix-addRole into master ... Reviewed-on: #757 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-25 10:48:16 +00:00
Jorge Penadés	aab428494e	fix: refs #6898 add role	2024-09-25 12:40:22 +02:00
Pablo Natek	cea5edd506	fix: refs #7129 translate	2024-09-25 12:33:19 +02:00
Javier Segarra	357f3ba308	Merge pull request 'fix: refs #6943 prevent null' (!756) from 6943-warmfix-preventNull into test ... Reviewed-on: #756 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-25 10:26:14 +00:00
Jorge Penadés	d2996f0838	fix: refs #6943 prevent null	2024-09-25 12:23:41 +02:00
Pablo Natek	ca568c31ca	fix: refs #7129 clone post	2024-09-25 11:51:51 +02:00
Pablo Natek	27b699ebf4	fix: refs #7129 some component styles	2024-09-25 11:16:27 +02:00
Pablo Natek	1ee3691cc0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-fixMigrationIssues	2024-09-25 08:26:27 +02:00
Jon Elias	4ff068aa8a	Merge pull request '#7553 modified TicketExpedition & changes in ticket section' (!571) from 7553_FixTicketExpedition into dev ... Reviewed-on: #571 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-25 05:51:15 +00:00
Javier Segarra	c1087614c6	Merge branch 'dev' into 7553_FixTicketExpedition	2024-09-25 05:50:22 +00:00
Javier Segarra	e8a0d44292	Merge pull request 'feat: autofocus after clear' (!747) from vnInput_autoFocus into dev ... Reviewed-on: #747 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-25 05:50:04 +00:00
Jon Elias	ff3ab83727	Merge branch 'dev' into 7553_FixTicketExpedition	2024-09-25 05:25:07 +00:00
Javier Segarra	2a64d9643e	Merge branch 'dev' into vnInput_autoFocus	2024-09-24 20:16:56 +00:00
Alex Moreno	d35b40a891	fix: vnTable color	2024-09-24 14:07:04 +02:00
Alex Moreno	991ad21c77	fix: refs #7155 remove userParams in watcher	2024-09-24 13:16:34 +02:00
Pablo Natek	f0c2baa60e	fix: refs #7129 remove consoleLog	2024-09-24 12:56:14 +02:00
Pablo Natek	70d640dc37	fix: refs #7129 some style issues	2024-09-24 12:54:34 +02:00
Jon Elias	67a1c28670	Merge branch 'dev' into 7553_FixTicketExpedition	2024-09-24 10:51:31 +00:00
Alex Moreno	32328da370	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-24 12:25:24 +02:00
Alex Moreno	c9e4ab490d	build: init version 2442	2024-09-24 12:23:19 +02:00
Alex Moreno	e555bd4cde	Merge branch 'test' of https: refs #7155//gitea.verdnatura.es/verdnatura/salix-front into 7155-travel_daysOnward	2024-09-24 12:21:31 +02:00
Alex Moreno	d85705bb39	Merge pull request '8032-devToTest_2440' (!751) from 8032-devToTest_2440 into test ... Reviewed-on: #751 Reviewed-by: Jon Elias <jon@verdnatura.es>	2024-09-24 10:05:32 +00:00
Jon Elias	8315eb2b4c	Merge branch 'dev' into 7553_FixTicketExpedition	2024-09-24 09:37:17 +00:00
Javier Segarra	41f168ebbe	Merge pull request '#7671 - Default Table Order by Description DESC' (!745) from 7671_dense_itemFixedPrices into dev ... Reviewed-on: #745 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-24 09:24:45 +00:00
Javier Segarra	3affd8712c	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-09-24 09:22:47 +00:00
Alex Moreno	3d34d9c6bb	chore: refs #7155 remove console.log	2024-09-24 10:54:17 +02:00
Jon Elias	21f7613f21	Merge branch 'dev' into 7553_FixTicketExpedition	2024-09-24 08:36:57 +00:00
Jon Elias	f34e81038e	Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-24 10:36:02 +02:00
Jon Elias	cd96003c0e	refactor: refs #7553 requested changes and added keyup.enter	2024-09-24 10:35:59 +02:00
Alex Moreno	edb6e9ce61	feat(TravelList): add daysOnward	2024-09-24 09:57:05 +02:00
Alex Moreno	2d90a75fa0	Merge pull request 'fix: wagon tests' (!752) from FixWagonTests into dev ... Reviewed-on: #752 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-24 07:53:08 +00:00
Javier Segarra	6e57306026	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-09-24 07:39:22 +00:00
Jon Elias	f2ae231efb	fix: missing code	2024-09-24 09:35:34 +02:00
Jon Elias	768e15755f	fix: deleted code	2024-09-24 09:18:10 +02:00
Jon Elias	2c73ce28c3	fix: fixed wagon tests	2024-09-24 09:02:35 +02:00
Pablo Natek	c400929c99	fix: refs #7129 translate page title	2024-09-24 08:33:16 +02:00