25419 Commits

All Branches

Search

Author	SHA1	Message	Date
Pablo Natek	9f2057fdd0	fix: refs #7781 pallet merge	2024-08-08 12:46:10 +02:00
Alex Moreno	141e116401	Merge pull request 'BREACKING CHANGE: claim redirect to lilium' (!2843) from 6336-claim-redirectToLilium into dev ... Reviewed-on: #2843 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-08-08 10:43:38 +00:00
Alex Moreno	30e1b7280a	Merge branch 'dev' into 6336-claim-redirectToLilium	2024-08-08 10:38:33 +00:00
Jorge Penadés	853a57ec63	#6900 fix: empty commit	2024-08-08 12:37:29 +02:00
Jorge Penadés	660ebfbe15	#6900 feat: empty commit	2024-08-08 12:36:06 +02:00
Jorge Penadés	4af881a8d9	#6900 feat: clear empty	2024-08-08 12:35:11 +02:00
Jorge Penadés	b4ea7819f8	#6900 feat: clear empty	2024-08-08 12:18:42 +02:00
Jorge Penadés	1ccfd8731f	#6900 feat: empty commit	2024-08-08 12:17:56 +02:00
Jorge Penadés	afc5615140	#6900 fix: #6900 rectificative filter	2024-08-08 12:14:44 +02:00
Alex Moreno	dd6aa6b1dd	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-08-08 11:52:06 +02:00
Alex Moreno	c8f1b7c5ff	hotFix(validateCode): username comparation	2024-08-08 11:51:46 +02:00
Sergio De la torre	09d93caddb	Merge pull request 'refs #6078 - workerAct' (!2814) from 6078_workerAct into dev ... Reviewed-on: #2814 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-08 08:26:11 +00:00
Alex Moreno	17d05ecfe2	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-08-08 10:07:26 +02:00
Alex Moreno	8580fa0849	hotFix(sendTwoFactor): fix code digits	2024-08-08 10:07:03 +02:00
Alex Moreno	f0f4610be5	Merge branch '6336-claim-redirectToLilium' of https://gitea.verdnatura.es/verdnatura/salix into 6336-claim-redirectToLilium	2024-08-08 09:05:08 +02:00
Alex Moreno	4fb82dc944	test: fix ticket sale e2e	2024-08-08 09:05:08 +02:00
Jorge Penadés	00ba0bbe6d	Merge pull request '#7323 redirect woker module to Lilium' (!2825) from Worker_Migration into dev ... Reviewed-on: #2825 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-08 06:54:55 +00:00
Jorge Penadés	2c1eb6ee42	Merge branch 'dev' into Worker_Migration	2024-08-08 06:49:08 +00:00
Pako Natek	1154e9f55c	Merge branch 'dev' into 7836-futureEntries	2024-08-08 06:28:30 +00:00
Pako Natek	a01794f9cd	Merge branch '7836-futureEntries' of https://gitea.verdnatura.es/verdnatura/salix into 7836-futureEntries	2024-08-08 08:27:52 +02:00
Pako Natek	41942783aa	dropOldProc	2024-08-08 08:27:50 +02:00
Alex Moreno	8112797918	Merge branch 'dev' into 6336-claim-redirectToLilium	2024-08-08 06:23:59 +00:00
Alex Moreno	715439ae38	test: fix claim descriptor redirect to lilium	2024-08-08 08:23:17 +02:00
Alex Moreno	c768fa113e	test: fix ticket redirect to lilium	2024-08-08 08:20:26 +02:00
Pako Natek	c3da3b9bf3	Merge pull request '7836-futureEntries' (!2839) from 7836-futureEntries into dev ... Reviewed-on: #2839 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-08 06:06:22 +00:00
Pako Natek	a9cdbb1255	Merge branch 'dev' into 7836-futureEntries	2024-08-08 06:01:35 +00:00
Jorge Penadés	8241a6c22a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into Worker_Migration	2024-08-07 15:48:41 +02:00
Guillermo Bonet	09a0459a7b	refs #7844 Fix tests part 2/2	2024-08-07 13:52:41 +02:00
Guillermo Bonet	4cbea3bf7b	refs #7844 Fix tests part 2/2	2024-08-07 13:51:00 +02:00
Guillermo Bonet	8aa06e12b3	refs #7844 Fix tests part 1/2	2024-08-07 12:39:18 +02:00
Robert Ferrús	2429d213da	Merge pull request 'feat: refs #7818 entry_splitByShelving' (!2840) from 7818-entry_splitByShelvingFix into master ... Reviewed-on: #2840 Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>	2024-08-07 10:03:03 +00:00
Robert Ferrús	03cc32a525	Merge branch 'master' into 7818-entry_splitByShelvingFix	2024-08-07 10:01:32 +00:00
Alex Moreno	4e831dc1bd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6336-claim-redirectToLilium	2024-08-07 11:17:09 +02:00
Sergio De la torre	22c3a632e2	feat workerActivity refs #6078	2024-08-07 10:48:12 +02:00
Pako Natek	9b2cbcd5cc	reviewed	2024-08-07 10:42:14 +02:00
Guillermo Bonet	4f2e343d0c	refs #7844 Fix	2024-08-07 10:40:10 +02:00
Guillermo Bonet	ea75446982	refs #7844 Change in problems calc	2024-08-07 10:32:47 +02:00
Jorge Penadés	4b8b7e3a18	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration	2024-08-07 10:16:53 +02:00
Robert Ferrús	4c6e3ca49a	Merge pull request 'fix: refs #7685 hotFixAddress_updateCoordinates' (!2841) from 7685-address_updateCoordinatesFix into master ... Reviewed-on: #2841 Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>	2024-08-07 08:15:46 +00:00
Jorge Penadés	b64b91e50f	feat: refs #7524 wip remote hooks	2024-08-07 10:12:54 +02:00
Robert Ferrús	41e44b747a	fix: refs #7685 hotFixAddress_updateCoordinates	2024-08-07 10:12:39 +02:00
Sergio De la torre	849989afa8	feat workerActivity refs #6078	2024-08-07 08:19:44 +02:00
Sergio De la torre	f9e9181637	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6078_workerAct	2024-08-07 08:15:27 +02:00
Robert Ferrús	f385b9a8a3	feat: refs #7818 entry_splitByShelving	2024-08-07 07:12:29 +02:00
Jorge Penadés	b3b7e9c213	fix: refs #7524 default limit select	2024-08-06 17:08:27 +02:00
Pablo Natek	9d49d23be8	Merge branch 'master' into 7781-fixPalletMerge	2024-08-06 15:00:13 +00:00
Pablo Natek	eaf7730394	Merge branch 'master' into 6403-from-packingSite-to-productionConfig	2024-08-06 14:58:54 +00:00
Sergio De la torre	163faf983e	feat workerActivity refs #6078	2024-08-06 16:34:46 +02:00
Jorge Penadés	c31e33535d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7524-limitSelect	2024-08-06 15:23:59 +02:00
Guillermo Bonet	fc102eff7b	Merge branch 'test' into dev	2024-08-06 14:12:32 +02:00