5805 Commits

All Branches

Search

Author	SHA1	Message	Date
Jon Elias	e76d8bf269	fix: fix conflicts	2024-07-23 09:15:06 +02:00
Jon Elias	a3256c7dc8	Merge branch '7014-RefactorQDrawer' of https://gitea.verdnatura.es/verdnatura/salix-front into 7014-RefactorQDrawer	2024-07-23 09:14:53 +02:00
Alex Moreno	ca9425cfb7	hotfix(entry_latest-buys): refs #6897 img	2024-07-23 09:14:22 +02:00
Jon Elias	18dac38fb2	Merge branch '7014-RefactorQDrawer' of https://gitea.verdnatura.es/verdnatura/salix-front into 7014-RefactorQDrawer	2024-07-23 09:14:14 +02:00
Jon Elias	33ad8fcb9d	refactor: refs #7014 improved route.js & deleted RouteMain	2024-07-23 09:12:00 +02:00
Alex Moreno	c7d54668e6	hotfix(entry_latest-buys): refs #6897 redirect to entry	2024-07-23 08:45:54 +02:00
Alex Moreno	53d59ee75c	Merge pull request '7773-testToMaster_2430' (!561) from 7773-testToMaster_2430 into master ... Reviewed-on: #561 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-07-23 06:24:04 +00:00
Jon Elias	92b053013f	Merge branch 'dev' into 7014-RefactorQDrawer	2024-07-23 06:18:17 +00:00
Carlos Satorres	b4f801e328	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration	2024-07-23 07:26:51 +02:00
Pablo Natek	a421c96e85	Merge pull request '#7129 - fixFilters' (!559) from 7129-fixFilters into test ... Reviewed-on: #559 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-07-22 16:00:14 +00:00
Pablo Natek	1a091e5b5a	Merge branch '7129-fixFilters' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-fixFilters	2024-07-22 17:50:59 +02:00
Pablo Natek	3ceb0771a7	fix: refs #7129 remove templates	2024-07-22 17:50:58 +02:00
Pablo Natek	f2b56c92c6	Merge branch 'test' into 7129-fixFilters	2024-07-22 15:37:35 +00:00
Javier Segarra	368b8404fa	updates: OrderCatlago	2024-07-22 15:13:03 +02:00
Pablo Natek	5f0c4fea3c	feat: refs #7129 add e2e	2024-07-22 13:19:41 +02:00
Jon Elias	848b267112	Merge branch 'dev' into 7717_fixOrderCatalog	2024-07-22 10:53:55 +00:00
Jon Elias	def3ca33a2	fix: refs #7717 fixed searchbar filter with rightmenu filters' applied	2024-07-22 12:52:58 +02:00
Jon Elias	01163dc128	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End	2024-07-22 12:01:10 +02:00
Pablo Natek	6f959ff99c	fix: refs #7129 fix filters	2024-07-22 09:18:53 +02:00
Pablo Natek	af6a20729b	fix: refs #7129 fixFilters	2024-07-22 09:12:56 +02:00
Guillermo Bonet	0a431ef5cb	Merge branch 'test' into dev	2024-07-22 08:20:16 +02:00
Guillermo Bonet	580777af65	Deleted repeated labeler i18n	2024-07-22 08:20:08 +02:00
Jon Elias	02e1de083a	fix: duplicate key	2024-07-19 15:00:05 +02:00
Jon Elias	eb2df02ad6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog	2024-07-19 14:55:09 +02:00
Jon Elias	7f376c8ea4	fix: refs #7717 fix catalog filter, searchbar redirect and search	2024-07-19 14:53:44 +02:00
Guillermo Bonet	76517d102d	Merge branch 'test' into dev	2024-07-19 13:09:19 +02:00
Guillermo Bonet	c5903e29e8	Merge branch 'master' into test	2024-07-19 13:08:41 +02:00
Guillermo Bonet	50c8b3c672	fix: refs #7648 Fix order property	2024-07-19 13:07:30 +02:00
Javier Segarra	a0350fe5e4	Merge pull request '7648_myEntries' (!555) from 7648_myEntries into master ... Reviewed-on: #555 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-19 10:28:36 +00:00
Javier Segarra	569b86c2c1	Merge branch 'master' into 7648_myEntries	2024-07-19 10:27:57 +00:00
Jon Elias	1589e51a4f	Merge branch '7354_ZoneMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End	2024-07-19 12:11:01 +02:00
Jon Elias	e60f846464	refactor: refs #7354 fix tableFilters	2024-07-19 12:11:00 +02:00
Alex Moreno	1de9462003	Merge branch 'dev' into 7547-accessToken-security	2024-07-19 07:50:06 +00:00
Javier Segarra	bcde62afb5	Merge branch 'dev' into 6943-fixCustomer	2024-07-19 07:41:55 +00:00
Jon Elias	daa4a41f09	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End	2024-07-19 09:25:28 +02:00
Jon Elias	30dbfc88b3	Merge pull request '#7323 End Worker migration' (!535) from 7323_WorkerMigration_End into dev ... Reviewed-on: #535 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-07-19 07:22:42 +00:00
Javier Segarra	55c8de78fc	perf: VnFilterPanel	2024-07-19 09:20:33 +02:00
Jon Elias	89aa987c58	Merge branch 'dev' into 7323_WorkerMigration_End	2024-07-19 06:20:57 +00:00
Jon Elias	26cdae2384	refactor: refs #7323 hidden column filter proposal	2024-07-19 08:18:41 +02:00
Alex Moreno	dbe56fa3a0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-07-19 08:02:58 +02:00
Alex Moreno	bcf4f34862	Merge pull request '6825-fix_vnSelectCache_and_autoload' (!557) from 6825-fix_vnSelectCache_and_autoload into test ... Reviewed-on: #557 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-07-19 06:01:56 +00:00
Alex Moreno	9b1636355d	fix: customerNotifications filter	2024-07-19 07:58:34 +02:00
Jon Elias	6f6ab74220	Merge branch '7323_WorkerMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End	2024-07-19 07:42:59 +02:00
Jon Elias	f171774605	fix: refs #7323 fixed left filter	2024-07-19 07:42:58 +02:00
Javier Segarra	7cbc52d700	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-07-18 15:21:01 +02:00
Javier Segarra	7cbdf0d98b	feat: fix bugs and filters	2024-07-18 15:20:44 +02:00
Alex Moreno	3fe566796b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-fixCustomer	2024-07-18 14:01:28 +02:00
Alex Moreno	f8026dd3f6	feat: improve VnSelectCache add find by Object	2024-07-18 13:54:22 +02:00
Alex Moreno	5833b4d856	fix(VnTable): autoload when has url parameters	2024-07-18 13:53:57 +02:00
Jon Elias	4495223735	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End	2024-07-18 13:03:53 +02:00