14298 Commits

All Branches

Search

Author	SHA1	Message	Date
Vicent Llopis	b2e3d61954	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4793-models_translation	2022-11-16 11:53:47 +01:00
Alexandre Riera	44053e08be	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-16 11:53:04 +01:00
Alexandre Riera	edb495c744	fix describe	2022-11-16 11:52:35 +01:00
Alexandre Riera	66002968f6	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-16 11:10:21 +01:00
Alexandre Riera	489df60afc	suggested filter added	2022-11-16 11:10:00 +01:00
Alexandre Riera	4feb2bea2c	working on e2e	2022-11-16 10:57:15 +01:00
Pau	0f0c4c0554	feat(save-sign implemented in salix back, refs 3681 @2h	2022-11-16 10:28:13 +01:00
Pau	46af56922c	Merge pull request 'fix(e2e test expected withoutNegatives checkbox to not be checked already)' (!1150) from fix-e2e-test-withoutNegatives into dev ... Reviewed-on: #1150 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2022-11-16 09:25:08 +00:00
Alexandre Riera	294f806bd9	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-16 09:52:13 +01:00
Alexandre Riera	78dc7db7a7	correcciones	2022-11-16 09:46:35 +01:00
Vicent Llopis	9bbaa7c718	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4793-models_translation	2022-11-16 09:41:43 +01:00
Alexandre Riera	655338d79e	Merge branch 'dev' into 3557-back-missingTrash	2022-11-16 08:19:57 +00:00
Pau	34b189ea10	Merge branch 'dev' into fix-e2e-test-withoutNegatives	2022-11-16 08:10:06 +00:00
Pau	67f8db6166	Merge pull request '4157-send-sms-to-routes' (!1106) from 4157-send-sms-to-routes into dev ... Reviewed-on: #1106 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-16 08:09:25 +00:00
Alex Moreno	ccb0cfdf01	Merge branch 'dev' into fix-e2e-test-withoutNegatives	2022-11-16 08:08:08 +00:00
Pau	7779059459	Merge branch 'dev' into 4157-send-sms-to-routes	2022-11-16 08:05:19 +00:00
Pau	78ba047df0	Merge pull request '4492-item.create-same-as-item.isLaid' (!1125) from 4492-item.create-same-as-item.isLaid into dev ... Reviewed-on: #1125 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-16 08:04:53 +00:00
Pau	2a4af7ac78	Merge branch 'dev' into 4492-item.create-same-as-item.isLaid	2022-11-16 07:29:09 +00:00
Pau	b21d4b698e	Merge branch 'dev' into 4157-send-sms-to-routes	2022-11-16 07:29:03 +00:00
Pau	a3f56f1622	Merge branch 'dev' into 4507-greuge-add-userFk	2022-11-16 07:28:39 +00:00
Pau	7b3a1bfb22	requested changes	2022-11-16 08:28:12 +01:00
Pau	66e6a47692	fix(e2e test expected withoutNegatives checkbox to not be checked already)	2022-11-16 08:25:07 +01:00
Alexandre Riera	8d4d6fa94c	Merge branch 'dev' into 3557-back-missingTrash	2022-11-16 07:24:58 +00:00
Alex Moreno	080d6aedf4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-16 08:19:39 +01:00
Alex Moreno	e32ddd9f44	Merge pull request 'remove-focus' (!1149) from remove-focus into dev ... Reviewed-on: #1149 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2022-11-16 07:17:08 +00:00
Pau	8e7e7901af	Implement needed functions refs #3681 @1h	2022-11-16 08:11:29 +01:00
Alexandre Riera	7c8178b423	Merge branch 'dev' into 3557-back-missingTrash	2022-11-16 07:07:20 +00:00
Alex Moreno	925c384622	Actualizar 'e2e/paths/05-ticket/02_expeditions_and_log.spec.js' ... remove focus	2022-11-16 06:36:35 +00:00
Vicent Llopis	0089b821cf	fix: corregido test intermitente	2022-11-16 07:26:30 +01:00
Vicent Llopis	46c7aa24b8	fix: corregidas traducciones	2022-11-16 07:14:45 +01:00
Pau	d7dc7c4329	Merge branch 'dev' into 4507-greuge-add-userFk	2022-11-16 06:08:01 +00:00
Alexandre Riera	b7c9d6ea50	refs #3963 front and back tests fixed	2022-11-15 15:30:00 +01:00
Alex Moreno	9085e7fab1	fix: use routes	2022-11-15 15:12:15 +01:00
Vicent Llopis	c200e1af32	refactor: optimizado select	2022-11-15 15:09:41 +01:00
Pau	192d7336a4	change test	2022-11-15 14:22:09 +01:00
Pau	6e58b1de8b	refs #4511 Changed fixtures to fix broken test @30min	2022-11-15 14:17:24 +01:00
Vicent Llopis	dd8117b6a4	feat: añadidas traducciones	2022-11-15 14:02:31 +01:00
Pau	56893ea58b	Merge branch 'dev' into 4511-kkear-expedition.itemFk	2022-11-15 13:42:06 +01:00
Alex Moreno	8dcd567a68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-15 13:20:52 +01:00
Alexandre Riera	09d7c450a2	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-15 13:08:36 +01:00
Alexandre Riera	97a6aff499	fix workerFk	2022-11-15 13:08:06 +01:00
Alexandre Riera	607f61092a	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-15 13:06:10 +01:00
Alexandre Riera	01607c71b6	fix rocket message and order table	2022-11-15 13:03:55 +01:00
Alex Moreno	7a7da9508f	feat: workerWelcomeEmail	2022-11-15 12:56:30 +01:00
Alex Moreno	cba3c38ba6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2022-11-15 12:55:07 +01:00
Vicent Llopis	284837083c	feat: coge el idioma local	2022-11-15 12:34:18 +01:00
Vicent Llopis	fc516d4029	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4793-models_translation	2022-11-15 12:23:59 +01:00
Alex Moreno	b57a64227b	Merge pull request '3569-refactor_isEditable-canEdit' (!1082) from 3569-refactor_isEditable-canEdit into dev ... Reviewed-on: #1082 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2022-11-15 11:10:08 +00:00
Vicent Llopis	843e5ae736	feat: traducciones en los modelos	2022-11-15 11:41:57 +01:00
Pau	90f69da3ca	Merge branch 'dev' into 4157-send-sms-to-routes	2022-11-15 10:30:14 +00:00