22109 Commits

All Branches

Search

Author	SHA1	Message	Date
Pablo Natek	2ee41b17dc	Merge branch 'master' into 6404-fixSaturdayDelivery	2024-06-03 15:34:36 +00:00
Juan Ferrer	5dd2e3b7d3	ci(Jenkinsfile): refs #7442 Tag image with build id	2024-06-03 16:45:02 +02:00
Alex Moreno	0b885ab773	build: increase version	2024-06-03 15:06:29 +02:00
Alex Moreno	3875bdb98d	build(operator): remove console.log	2024-06-03 15:01:25 +02:00
Alex Moreno	bbf027ede5	fix(operator): neq error	2024-06-03 15:01:06 +02:00
Alex Moreno	c445bcb0ba	build(operator): remove console.log	2024-06-03 14:39:32 +02:00
Alex Moreno	9775e808a2	build(operator): remove console.log	2024-06-03 14:37:24 +02:00
Alex Moreno	35ae728e81	build(operator): console.log	2024-06-03 14:19:41 +02:00
Alex Moreno	a73c98eebe	build(operator): console.log	2024-06-03 13:04:09 +02:00
Pablo Natek	b9b0651069	fix: refs #6404 fix agency service selection	2024-06-03 12:38:57 +02:00
Guillermo Bonet	4abede62ab	Merge branch '6701-clientRate' of https://gitea.verdnatura.es/verdnatura/salix into 6701-clientRate	2024-06-03 12:16:34 +02:00
Guillermo Bonet	d3584691fa	refactor: refs #6701 Minor change	2024-06-03 12:16:33 +02:00
Guillermo Bonet	5ab8e79dde	Merge branch 'dev' into 6701-clientRate	2024-06-03 10:11:56 +00:00
Guillermo Bonet	85d68890b8	refactor: refs #6701 New table clientRate	2024-06-03 12:11:26 +02:00
Jorge Penadés	705a873d53	Merge pull request '#6889 drop addSaleByCode' (!2470) from 6889-dropAddSaleByCode into dev ... Reviewed-on: #2470 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-03 10:09:06 +00:00
Alex Moreno	349914743c	build: increase version	2024-06-03 10:48:21 +02:00
Carlos Satorres	ed213da040	Merge pull request 'fix acls' (!2535) from hotfix-logisticRefundACL into master ... Reviewed-on: #2535 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-03 08:45:23 +00:00
Jorge Penadés	39dcb7d6a8	fix: refs #6889 check if has collection or sectorCollection	2024-06-03 10:30:20 +02:00
Pablo Natek	b1a4b42028	fix: refs #6404 change db language on local	2024-06-03 10:29:38 +02:00
Carlos Satorres	7a92963886	fix acls	2024-06-03 10:21:25 +02:00
Jorge Penadés	ea7c2346d5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-06-03 10:13:59 +02:00
Jorge Penadés	0448f7b039	Merge pull request '#6600 add column' (!2378) from 6600-createItemPhotoComment into dev ... Reviewed-on: #2378 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-03 08:06:57 +00:00
Jorge Penadés	1382b24c1d	refactor: refs #6600 add space	2024-06-03 09:38:35 +02:00
Jon Elias	340a8c119e	refactor: refs #6753 fix saveSign	2024-06-03 09:35:44 +02:00
Jorge Penadés	72630d613b	fix: refs #6600 rollback	2024-06-03 09:32:03 +02:00
Jorge Penadés	790a637d4d	feat: refs #6600 Add photoMotivation column to item table and create itemPhotoComment table	2024-06-03 09:25:48 +02:00
Jorge Penadés	084f31e441	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6600-createItemPhotoComment	2024-06-03 08:34:10 +02:00
Jorge Penadés	68bb282659	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-06-03 08:30:41 +02:00
Robert Ferrús	ecd34e080d	feat: refs #7039 deleteVirtualColumnCountry	2024-06-03 07:59:57 +02:00
Sergio De la torre	9299d8f86c	Merge pull request 'refs #6832 fix: ToItem' (!2507) from 6832_refactorBackToItem into dev ... Reviewed-on: #2507 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-03 05:39:59 +00:00
Sergio De la torre	1941d8f5b3	Merge branch 'dev' into 6832_refactorBackToItem	2024-06-03 05:04:05 +00:00
Jorge Penadés	dc8696b422	feat: refs #6889 add back tests	2024-05-31 16:31:36 +02:00
Jorge Penadés	836cfcbd07	refactor: refs #6889 sale tests e2e	2024-05-31 13:58:26 +02:00
Jorge Penadés	ee09617b27	fix: refs #6889 e2e tests	2024-05-31 13:05:12 +02:00
Jorge Penadés	9578c506b4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-31 12:58:05 +02:00
Jorge Penadés	ab9c11ef84	fix: refs #6889 modify fixtures	2024-05-31 12:56:22 +02:00
Jorge Penadés	4772509b67	fix: refs #6889 e2e tests	2024-05-31 12:51:06 +02:00
Javi Gallego	5339354b92	Merge pull request 'refs #6408 - rocketChat' (!2520) from 6408-rocketChat into dev ... Reviewed-on: #2520 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-31 10:43:52 +00:00
Javi Gallego	6a08a806a9	Merge branch 'dev' into 6408-rocketChat	2024-05-31 10:39:14 +00:00
Guillermo Bonet	7dc17cd4f6	Merge branch 'test' into dev	2024-05-31 12:29:32 +02:00
Guillermo Bonet	d27bbd9a8f	hotfix: ticket 189567	2024-05-31 12:28:47 +02:00
Pablo Natek	46065a983f	Merge pull request '6404-adDeliveryAndCeroField' (!2530) from 6404-adDeliveryAndCeroField into master ... Reviewed-on: #2530 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-31 10:00:18 +00:00
Pablo Natek	988b3cbbee	fix: refs #6404 ref #6404 remove console.log	2024-05-31 11:53:55 +02:00
Pablo Natek	884b5f8475	feat: refs #6404 add cero filler to counter	2024-05-31 11:51:32 +02:00
Alex Moreno	94cc233852	deploy: increase version	2024-05-31 10:17:21 +02:00
Robert Ferrús	546e067dde	Merge pull request 'fix: refs #7039 hotFixcountry' (!2529) from 7039-hotFixCountry into master ... Reviewed-on: #2529 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-31 08:10:10 +00:00
Robert Ferrús	85c328e522	fix: refs #7039 hotFixcountry	2024-05-31 10:07:27 +02:00
Jorge Penadés	38bea60776	refactor: refs #6889 script sql	2024-05-31 09:49:58 +02:00
Javier Segarra	2b1ebee206	Merge pull request '#7228 - send full size image when croppie it' (!2416) from 7228_croppieUploadPhoto into dev ... Reviewed-on: #2416 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-05-31 07:29:54 +00:00
Alex Moreno	788f334e70	intros	2024-05-31 09:29:47 +02:00