18678 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	2c9c2df362	Merge branch '6703-refactorSaleRefund' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund	2024-02-01 08:14:56 +01:00
Jorge Penadés	af4af43d9f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund	2024-02-01 08:14:50 +01:00
Alex Moreno	467879bdd6	Merge branch 'dev' into 6703-refactorSaleRefund	2024-02-01 06:46:25 +00:00
Guillermo Bonet	50b7f4350e	Merge pull request 'feat: refs #6235 Added device in clockIn' (!1977) from 6235-addDeviceWorkerTimeControl into dev ... Reviewed-on: #1977	2024-02-01 06:45:33 +00:00
Alex Moreno	d338a04a27	Merge branch 'dev' into 6235-addDeviceWorkerTimeControl	2024-02-01 06:35:51 +00:00
Robert Ferrús	d2748e5afa	Merge pull request 'feat: refs #6691 delete view vn2008 part8' (!1982) from 6691-deleteView2008Part8 into dev ... Reviewed-on: #1982 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-01 06:34:07 +00:00
Robert Ferrús	905c15dac7	Merge branch '6691-deleteView2008Part8' of https://gitea.verdnatura.es/verdnatura/salix into 6691-deleteView2008Part8	2024-02-01 07:29:52 +01:00
Robert Ferrús	183097de03	refs #6688 fix: puppeteer	2024-02-01 07:29:43 +01:00
Robert Ferrús	f8cee0cf8d	Merge branch 'dev' into 6691-deleteView2008Part8	2024-02-01 06:04:08 +00:00
Guillermo Bonet	a9fd1eafa8	Merge branch 'dev' into 6235-addDeviceWorkerTimeControl	2024-02-01 06:03:42 +00:00
Juan Ferrer	1df4005067	build: refs #6706 hook test	2024-01-31 15:22:04 +01:00
Guillermo Bonet	15c22cdaa0	Merge branch 'dev' into 6235-addDeviceWorkerTimeControl	2024-01-31 12:16:37 +00:00
Guillermo Bonet	851e5cc5af	refactor: refs #6235 Fixed tests back	2024-01-31 13:16:56 +01:00
Jorge Penadés	e88abe7b7c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund	2024-01-31 13:11:37 +01:00
Robert Ferrús	21766a6152	Merge branch 'dev' into 6691-deleteView2008Part8	2024-01-31 11:44:30 +00:00
Juan Ferrer	d7a5ec1e5b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-01-31 12:02:09 +01:00
Juan Ferrer	59d45ab85c	build: refs #6706 hook test	2024-01-31 12:02:08 +01:00
Guillermo Bonet	e0d15e572c	Merge branch 'dev' into 6235-addDeviceWorkerTimeControl	2024-01-31 10:13:57 +00:00
Robert Ferrús	8616b33c33	feat: refs #6691 delete view vn2008 part8	2024-01-31 11:12:16 +01:00
Jorge Penadés	6f306ad18c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund	2024-01-31 09:59:57 +01:00
Jorge Penadés	e6eac54709	fix: refs #6703 tests & front	2024-01-31 09:59:32 +01:00
Sergio De la torre	eb3d344957	Merge pull request '6186_deletePackingShelve' (!1975) from 6186_deletePackingShelve into dev ... Reviewed-on: #1975 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-01-31 08:35:07 +00:00
Jorge Penadés	c136395d1e	fix: refs #6703 fix conflicts	2024-01-31 09:16:38 +01:00
Jorge Penadés	d43976192a	fix: refs #6703 fix conflicts	2024-01-31 09:16:26 +01:00
Guillermo Bonet	7d045d6abe	Merge branch 'dev' into 6235-addDeviceWorkerTimeControl	2024-01-31 08:05:22 +00:00
Guillermo Bonet	dd17b2c05d	feat: refs #6235 Added device in clockIn	2024-01-31 09:04:30 +01:00
Sergio De la torre	a8b483078f	refs #6186 feat:deprecated packingShelve	2024-01-31 08:52:36 +01:00
Sergio De la torre	f88cef6745	refs #6186 feat:deprecated packingShelve	2024-01-31 08:45:52 +01:00
Juan Ferrer	6d01164fb3	build: refs #6706 hook test	2024-01-30 23:25:14 +01:00
Juan Ferrer	827586ebd6	build: refs #6706 hook test	2024-01-30 23:14:51 +01:00
Juan Ferrer	67db31e39b	build: refs #6706 hook test	2024-01-30 23:06:12 +01:00
Juan Ferrer	e4f62e4e06	build: refs #6706 hook test	2024-01-30 22:53:33 +01:00
Juan Ferrer	53ac10d0be	build: refs #6706 hook test	2024-01-30 22:33:55 +01:00
Juan Ferrer	7ab11543ed	build: refs #5483 Jenkinsfile optimized for daily DB push	2024-01-30 21:57:04 +01:00
Juan Ferrer	420398260f	fix: refs #5483 Jenkinsfile codefix	2024-01-30 21:49:58 +01:00
Juan Ferrer	4d065a2f79	fix: refs #5483 Jenkinsfile fixes, global nodejs tool	2024-01-30 21:37:20 +01:00
Juan Ferrer	4251f29a17	fix: refs #5483 compose fixes	2024-01-30 21:05:59 +01:00
Juan Ferrer	76545cd1ac	fix: refs #5483 Jenkinsfile & compose fixes	2024-01-30 20:58:15 +01:00
Juan Ferrer	29634e16e5	fix: refs #5483 Jenkinsfile fix	2024-01-30 20:44:33 +01:00
Juan Ferrer	027f7d2c1d	build: refs #5483 dev deploy, tag image with version	2024-01-30 20:41:24 +01:00
Juan Ferrer	7d2b5fbeda	build: refs #5483 Parallel install, code reorder	2024-01-30 20:04:32 +01:00
Juan Ferrer	1a64126655	build: refs #5483 Jenkinsfile parallel deploy	2024-01-30 19:51:30 +01:00
Juan Ferrer	3e0ebc0f26	fix: refs #5483 Jenkinsfile rocketchat fixes	2024-01-30 19:45:37 +01:00
Juan Ferrer	84961dda49	build: refs #5483 test workers increased to 6, test rocket notification	2024-01-30 19:41:09 +01:00
Juan Ferrer	095d6b4140	fix: refs #5483 Unused code removed	2024-01-30 19:35:23 +01:00
Juan Ferrer	17c9054155	fix: refs #5483 Jenkinsfile fixes	2024-01-30 19:30:26 +01:00
Juan Ferrer	624f61465a	fix: refs #5483 Jenkinsfile fixes	2024-01-30 19:05:55 +01:00
Juan Ferrer	12af757929	refs #5483 Jenkinsfile fix	2024-01-30 19:01:14 +01:00
Juan Ferrer	79f509ca46	fix: refs #5483 Jenkinsfile code fix	2024-01-30 18:54:41 +01:00
Juan Ferrer	56ac47dc16	build: refs #5483 send rocket message, skip steps when run source isn't git	2024-01-30 18:52:31 +01:00