1776 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	6b363610d2	Merge pull request 'refs #6795 summary, order' (!183) from 6795-claimRefact into dev ... Reviewed-on: #183 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-16 13:44:41 +00:00
Carlos Satorres	5f28296725	Merge branch 'dev' into 6795-claimRefact	2024-02-16 13:06:21 +00:00
Carlos Satorres	e24c0afefb	Merge pull request 'refs #6787 isLoading' (!180) from 6787-loadingDescriptor into dev ... Reviewed-on: #180 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-16 13:06:05 +00:00
Carlos Satorres	deacf0feef	Merge branch 'dev' into 6787-loadingDescriptor	2024-02-16 12:50:32 +00:00
Carlos Satorres	72e7bf0f7a	refs #6795 fix navigate	2024-02-16 13:49:11 +01:00
William Buezas	0761860b37	Improve drag and drop borders status	2024-02-16 09:24:31 -03:00
William Buezas	c322bfb46c	general improvements	2024-02-15 14:23:01 -03:00
Alex Moreno	87f81eb80a	refs #6664 hotFix: multiplicatorValue updateGreuges	2024-02-15 16:15:48 +01:00
Alex Moreno	72d51a53a8	hotFix: vnSelectFilter	2024-02-15 14:53:43 +01:00
Alex Moreno	67982b3bbb	Merge pull request 'refs #6862 fixtest' (!190) from 6862-fixTest into test ... Reviewed-on: #190 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>	2024-02-15 11:28:51 +00:00
Carlos Satorres	3c4df81579	refs #6862 fixtest	2024-02-15 11:30:51 +01:00
William Buezas	de7d2b4e72	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ExtraCommunityDragAndDrop	2024-02-14 22:22:55 -03:00
William Buezas	08e39232e2	add dashed border to first and last child to drop row	2024-02-14 22:18:54 -03:00
William Buezas	e29801a47e	General improvements and handle params changes in VnFilterPanel	2024-02-14 22:14:44 -03:00
William Buezas	60d2491409	change drag status color	2024-02-14 18:20:54 -03:00
Carlos Satorres	926395a7e7	refs #6763 fix tree descriptor	2024-02-14 15:31:53 +01:00
William Buezas	fbe8c912f6	Fix dragend status	2024-02-14 09:55:18 -03:00
William Buezas	ca06140a8d	remove v-if	2024-02-13 10:49:27 -03:00
William Buezas	2693f259d4	Add drag and drop do Travel Extra Community table	2024-02-13 10:17:24 -03:00
Carlos Satorres	1e5638b487	refs #6787 fix descriptor skeleton	2024-02-13 12:44:20 +01:00
Carlos Satorres	409bb1a13e	refs #6795 fix return	2024-02-13 11:51:59 +01:00
Carlos Satorres	ab512e3b03	refs #6795 fix tfront	2024-02-13 11:50:12 +01:00
Carlos Satorres	c2675bfe56	refs #6763 fix descriptor	2024-02-13 11:31:33 +01:00
Alex Moreno	1db827a7c8	refs #6795 fix: claim paddings and colors	2024-02-13 08:03:31 +01:00
Carlos Satorres	7aab50ffff	Merge branch 'dev' into 6795-claimRefact	2024-02-12 16:46:51 +00:00
Carlos Satorres	e3e0439d7e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6763-vnTreeRefact	2024-02-12 14:07:08 +01:00
Carlos Satorres	a9c288e6ea	refs #6795 fix url, details	2024-02-12 13:58:13 +01:00
Alex Moreno	f38b5845ff	Merge pull request 'feature/TravelExtraCommunityCorrections' (!188) from hyervoni/salix-front-mindshore:feature/TravelExtraCommunityCorrections into dev ... Reviewed-on: #188 Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-12 12:39:32 +00:00
William Buezas	cd2eb71efd	Fix view icon	2024-02-12 08:14:10 -03:00
William Buezas	4810e02907	add basic order to table	2024-02-09 20:50:33 -03:00
William Buezas	254d5a291f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/TravelExtraCommunityCorrections	2024-02-09 10:43:09 -03:00
Alex Moreno	80a3d646a4	Merge branch 'dev' into 6797-deployDev-useBun	2024-02-09 13:25:56 +00:00
Javier Segarra	c250f2c154	Merge pull request 'feature/FaltantesModuloTravel' (!185) from hyervoni/salix-front-mindshore:feature/FaltantesModuloTravel into dev ... Reviewed-on: #185 Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-09 13:11:22 +00:00
William Buezas	399f47b17c	merge with salix-front dev branch and resolve conflicts	2024-02-09 08:59:46 -03:00
William Buezas	1b31657338	Add tooltip to VnSelegDialog Action icon and small corrections	2024-02-09 08:51:39 -03:00
Carlos Satorres	b08f4f5ded	Merge pull request 'refs #6791 change field' (!187) from 6791-negativeNickname into dev ... Reviewed-on: #187 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-09 11:49:46 +00:00
Carlos Satorres	587e0a53e7	refs #6791 change field	2024-02-09 12:17:35 +01:00
Carlos Satorres	c87f49b86e	refs #6795 popup item	2024-02-09 11:46:47 +01:00
Carlos Satorres	b355d4aa0f	refs #6795 remove watch	2024-02-09 10:15:36 +01:00
Carlos Satorres	d13bf60ea3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6795-claimRefact	2024-02-09 09:08:56 +01:00
Carlos Satorres	b3251967b8	refs #6795 fix descriptor	2024-02-09 09:07:54 +01:00
Jorge Penadés	18a84f2d61	Merge pull request '#4466 invoiceInCorrection' (!176) from 4666-invoiceInCorrection into dev ... Reviewed-on: #176 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>	2024-02-09 07:46:15 +00:00
William Buezas	c67f4cf858	Thermograph create form and general improvements	2024-02-08 23:30:08 -03:00
Alex Moreno	2fb1688af4	Merge branch 'dev' into 4666-invoiceInCorrection	2024-02-08 17:30:47 +00:00
Alex Moreno	54e7e9c1e3	Merge pull request 'bugfix/shelving-154' (!168) from hyervoni/salix-front-mindshore:bugfix/shelving-154 into dev ... Reviewed-on: #168 Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-08 17:28:04 +00:00
Kevin Martinez	4e42a6ab74	Merge remote-tracking branch 'salix/dev' into bugfix/shelving-154 ... # Conflicts: # src/pages/Route/RouteList.vue	2024-02-08 10:22:58 -03:00
Carlos Satorres	2f081841f9	refs #6795 fix claims	2024-02-08 13:59:37 +01:00
Jorge Penadés	2eceb226a9	Merge branch '4666-invoiceInCorrection' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection	2024-02-08 13:30:21 +01:00
Jorge Penadés	97b8b0fa37	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection	2024-02-08 13:30:15 +01:00
Jorge Penadés	5d90939288	Merge pull request '#6657 fixSummaryDescriptor' (!175) from 6657-fixSummaryDescriptor into dev ... Reviewed-on: #175 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-08 12:22:52 +00:00