19221 Commits

All Branches

Search

Author	SHA1	Message	Date
Pako Natek	214aff403a	delete fixtures local	2024-03-22 11:09:49 +01:00
Pako Natek	8fd7792e7c	gitignore	2024-03-22 11:05:48 +01:00
Pako Natek	8f54a7f12d	deliveryDate	2024-03-18 14:03:16 +01:00
Pako Natek	67b55ae845	fixtures local	2024-03-13 14:16:27 +01:00
Pako Natek	25f979156a	nuevo url para catalogue y sliders_get	2024-03-13 14:00:59 +01:00
Pako Natek	b588b9807c	fixtures local	2024-03-07 13:45:53 +01:00
Pako Natek	2f275d8f32	itemType add	2024-02-29 13:06:26 +01:00
Pako Natek	24b564f1ce	test	2024-02-15 14:42:06 +01:00
Pako Natek	7413644295	contact_request and deliveryDate_get	2024-02-15 14:37:09 +01:00
Pako Natek	ec9604323d	commit	2024-02-15 13:54:34 +01:00
Pako Natek	04df5a0ccd	refs #6021	2024-02-15 13:52:58 +01:00
Pako Natek	55d15dbca2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6021-floranet	2024-02-15 13:50:15 +01:00
Guillermo Bonet	98ad133afd	Merge pull request 'refactor: refs #6775 Deleted proc itemProposal_Add' (!2034) from 6775-itemProposalAdd into dev ... Reviewed-on: #2034 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-15 12:21:23 +00:00
Guillermo Bonet	4b568bc41e	Merge branch 'dev' into 6775-itemProposalAdd	2024-02-15 13:19:58 +01:00
Pako Natek	0eaeb2e805	nueva rama	2024-02-15 13:13:22 +01:00
Alex Moreno	8cb17762f8	refs #6863 deployt: init version 24.10	2024-02-15 12:21:45 +01:00
Juan Ferrer	acc9d05530	build: refs #6859 pnpm-lock.yaml updated	2024-02-15 11:49:25 +01:00
Juan Ferrer	38cfb6e03e	build: refs #6859 Merge from test	2024-02-15 11:47:33 +01:00
Juan Ferrer	a9ccbfc1d4	Merge branch 'test' into dev	2024-02-15 11:41:01 +01:00
Juan Ferrer	cc24ecdc7d	build(dump): refs #6859	2024-02-15 11:28:46 +01:00
Guillermo Bonet	f63abc1a6e	fix: refs #6859 zoneEstimatedDelivery	2024-02-15 11:07:47 +01:00
Alex Moreno	625922275c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-15 10:14:19 +01:00
Alex Moreno	6685a20114	build: refs #6859 myt pull db	2024-02-15 10:04:15 +01:00
Alex Moreno	2703d50cbf	refs #6859 fix(account): changePassword name	2024-02-15 09:39:02 +01:00
Javier Segarra	904692a11f	Merge pull request '#2687 - Fix Travel_cloneWithEntries' (!2021) from 2687_fix_travel_cloneWithEntries into test ... Reviewed-on: #2021 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-15 07:34:49 +00:00
Javier Segarra	234ea26fe2	Merge branch 'test' into 2687_fix_travel_cloneWithEntries	2024-02-15 07:07:44 +00:00
Alex Moreno	fddbf6451b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-02-15 07:52:08 +01:00
Javier Segarra	0e32814717	Merge branch '2687_fix_travel_cloneWithEntries' of https://gitea.verdnatura.es/verdnatura/salix into 2687_fix_travel_cloneWithEntries	2024-02-15 07:50:22 +01:00
Javier Segarra	d9756a0f3f	refs #2687 feat: comments	2024-02-15 07:49:57 +01:00
Alex Moreno	b08dd95e92	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-15 07:30:42 +01:00
Javier Segarra	3ff3c812ed	refs #2687 fix: remove bad changes file	2024-02-14 20:15:34 +01:00
Javi Gallego	798bd10303	Merge pull request 'feat: refs #5720 vehicle nuevos campos' (!2029) from 5720-poolbancario into dev ... Reviewed-on: #2029 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-14 14:02:21 +00:00
Robert Ferrús	e21f8aafe0	Merge pull request 'fix: refs #6371 balanceNestTree add constraint' (!2039) from 6371-fixCreateConstraint into dev ... Reviewed-on: #2039 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-14 13:48:57 +00:00
Javi Gallego	d7efdacab3	Merge branch 'dev' into 5720-poolbancario	2024-02-14 13:47:13 +00:00
Robert Ferrús	88f508a424	fix: refs #6371 balanceNestTree add constraint	2024-02-14 14:42:04 +01:00
Guillermo Bonet	a690401b33	Merge pull request 'refactor: refs #6778 Migrated views of vn2008 to vn' (!1996) from 6778-changeViewDependencesVn2008 into dev ... Reviewed-on: #1996 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-14 13:17:46 +00:00
Guillermo Bonet	8ee8fe1851	Merge branch '6778-changeViewDependencesVn2008' of https://gitea.verdnatura.es/verdnatura/salix into 6778-changeViewDependencesVn2008	2024-02-14 12:12:41 +01:00
Guillermo Bonet	35fc8930ce	fix: refs #6778 Fix and tested	2024-02-14 12:12:40 +01:00
Guillermo Bonet	18c10e2dd7	refactor: refs #6778 Requested changes	2024-02-14 11:39:15 +01:00
Guillermo Bonet	2c82a64029	Merge branch 'dev' into 6778-changeViewDependencesVn2008	2024-02-14 10:38:33 +00:00
Guillermo Bonet	267fd8beb8	Merge pull request 'refactor: refs #6501 Migrated procs from vn2008 to vn' (!2016) from 6501-procMigration into dev ... Reviewed-on: #2016 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-14 10:31:12 +00:00
Guillermo Bonet	b46087b75c	refactor: refs #6501 Requested changes	2024-02-14 11:21:22 +01:00
Guillermo Bonet	b815677a1f	Merge branch '6501-procMigration' of https://gitea.verdnatura.es/verdnatura/salix into 6501-procMigration	2024-02-14 11:16:53 +01:00
Guillermo Bonet	b64637254b	refactor: refs #6501 Requested changes	2024-02-14 11:16:52 +01:00
Guillermo Bonet	08db19bf4e	Merge branch 'dev' into 6501-procMigration	2024-02-14 10:11:12 +00:00
Robert Ferrús	0ee5226dcb	Merge pull request 'feat: refs #6371 cleanTablesFix' (!2011) from 6371-limpiezaTablasVn2008Part1Fix into dev ... Reviewed-on: #2011 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-14 10:10:10 +00:00
Guillermo Bonet	cddb8dc216	Merge branch 'dev' into 6501-procMigration	2024-02-14 10:06:23 +00:00
Guillermo Bonet	874f776498	refactor: refs #6501 Requested changes	2024-02-14 11:05:16 +01:00
Robert Ferrús	fb44052a09	Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1Fix	2024-02-14 10:01:36 +00:00
Javier Segarra	d1b24125f4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 2687_fix_travel_cloneWithEntries	2024-02-14 09:33:34 +01:00