23432 Commits

All Branches

Search

Author	SHA1	Message	Date
Sergio De la torre	664bdc981d	Merge branch 'dev' into 7763_rename_itemShelving	2024-08-08 15:21:43 +00:00
Alex Moreno	1c75c429cc	test: husky	2024-08-08 13:29:02 +02:00
Pablo Natek	7ca768582f	Merge pull request 'fix: refs #6130 commit lint' (!2846) from 6130-fix-husky-lint into dev ... Reviewed-on: #2846 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-08 10:55:40 +00:00
Pablo Natek	62cee3a07a	fix: refs #6130 commit lint	2024-08-08 12:49:36 +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
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
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
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
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
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
Sergio De la torre	163faf983e	feat workerActivity refs #6078	2024-08-06 16:34:46 +02:00
Guillermo Bonet	fc102eff7b	Merge branch 'test' into dev	2024-08-06 14:12:32 +02:00
Guillermo Bonet	03358170d3	fix: refs #7740 ticket route throw	2024-08-06 14:10:16 +02:00
Sergio De la torre	5a7201a9fd	Merge branch 'dev' into 7763_rename_itemShelving	2024-08-06 11:48:34 +00:00
Sergio De la torre	3ca64f51a9	feat rename refs #7763	2024-08-06 13:47:20 +02:00
Pako Natek	fc7c7beef7	Merge branch 'dev' into 7836-futureEntries	2024-08-06 11:23:56 +00:00
Guillermo Bonet	184cbb2800	Merge branch 'test' into dev	2024-08-06 12:58:08 +02:00
Guillermo Bonet	ffa775a8a5	Merge pull request 'fix: refs #7834 expeditionScan_Put' (!2832) from 7834-fixExpeditionScanPut into master ... Reviewed-on: #2832 Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>	2024-08-06 10:56:10 +00:00
Guillermo Bonet	d1bb77d6ed	fix: refs #7834 expeditionScan_Put	2024-08-06 12:51:55 +02:00
Sergio De la torre	ff4a35ee2e	Merge branch 'dev' into 7763_rename_itemShelving	2024-08-06 10:49:40 +00:00
Guillermo Bonet	28b848930e	Merge branch 'test' into dev	2024-08-06 12:45:55 +02:00
Guillermo Bonet	c7c711ac1a	fix: refs #7728 duaInvoiceInBooking	2024-08-06 12:43:51 +02:00
Alex Moreno	0152fb8a98	hotFix getTIckets	2024-08-06 09:51:15 +02:00
Alex Moreno	f1b55ff75b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-08-06 09:44:27 +02:00
Alex Moreno	69c676d44b	hotFix(route): fix getTicket use skip	2024-08-06 09:38:27 +02:00
Alex Moreno	afbba83969	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-08-06 09:17:16 +02:00
Alex Moreno	89ba79053a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-08-06 09:17:11 +02:00
Alex Moreno	fb15225078	Merge pull request 'build: dump 2432' (!2838) from 7837-dump_2432 into master ... Reviewed-on: #2838 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-08-06 07:16:43 +00:00
Guillermo Bonet	58677dca56	Merge pull request 'refactor: refs #7820 Deprecated silexACL' (!2833) from 7820-silexAcl into dev ... Reviewed-on: #2833 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-06 07:15:20 +00:00