9346 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	a845f53f0a	Bug fixes	2021-02-03 12:43:30 +01:00
Joan Sanchez	ddc1456bb0	Merge pull request 'error is not a required field' (#534) from 2768-image_downloadimages_unit_tests into dev ... Reviewed-on: #534 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-02-03 09:42:35 +00:00
Carlos Jimenez Ruiz	ff94b182a1	error is not a required field	2021-02-03 10:16:46 +01:00
Joan Sanchez	38311f526d	Calculate volume	2021-02-03 09:03:03 +01:00
Carlos Jimenez Ruiz	fcbf157c20	Merge pull request '2617-add_scope_days_on_travel_index' (#530) from 2617-add_scope_days_on_travel_index into dev ... Reviewed-on: #530 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-02-02 13:33:32 +00:00
Carlos Jimenez Ruiz	2aaed295c9	Merge branch 'dev' into 2617-add_scope_days_on_travel_index	2021-02-02 13:13:32 +00:00
Joan Sanchez	ea1066d664	Added changes version 10281	2021-02-02 14:08:12 +01:00
Carlos Jimenez Ruiz	dd9e9bac9b	removed unused character	2021-02-02 14:02:57 +01:00
Carlos Jimenez Ruiz	a77c5c5b66	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index	2021-02-02 14:02:30 +01:00
Carlos Jimenez Ruiz	a0d6e53dbb	polutd test removed	2021-02-02 14:00:35 +01:00
Carlos Jimenez Ruiz	1379b52d8a	Merge pull request '2692-add_advanced_search_engine2' (#519) from 2692-add_advanced_search_engine2 into dev ... Reviewed-on: #519 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-02-02 12:29:20 +00:00
Jorge Padawan	186e59c7ae	.	2021-02-02 13:18:17 +01:00
Jorge Padawan	b57578f933	Remove parenthesis on expectedParams	2021-02-02 13:12:54 +01:00
Jorge Padawan	b576c0ad69	Remove parenthesis on expectedParams	2021-02-02 13:11:17 +01:00
Jorge Padawan	1a87eb3085	Remove bad code	2021-02-02 12:52:24 +01:00
Jorge Padawan	218a19d7da	Removed bad code	2021-02-02 12:37:00 +01:00
Jorge Padawan	c7424997d5	Removed bad code	2021-02-02 12:22:18 +01:00
Jorge Padawan	ee6b694637	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2	2021-02-02 11:58:07 +01:00
Jorge Padawan	a1a3607d3c	Remove bad code	2021-02-02 11:57:42 +01:00
Jorge Padawan	6fed5a21b7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index	2021-02-02 11:50:09 +01:00
Jorge Padawan	a2e78a8f25	Merge branch '2617-add_scope_days_on_travel_index' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index	2021-02-02 11:49:53 +01:00
Jorge Padawan	60015178a6	Remove bad code	2021-02-02 11:49:42 +01:00
Joan Sanchez	f6af7f14af	Merge pull request 'Add list of emails from client' (#523) from 2723-Format_emails_for_summaries into dev ... Reviewed-on: #523 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-02-02 10:06:22 +00:00
Carlos Jimenez Ruiz	6a2c131593	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index	2021-02-02 10:59:59 +01:00
Carlos Jimenez Ruiz	3ab59cbec8	Merge pull request '2762 - Delete entry as teamBoss' (#533) from 2762-worker_delete_entry into dev ... Reviewed-on: #533 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-02-02 09:32:09 +00:00
Jorge Padawan	f0f96f1ab5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index	2021-02-02 10:27:52 +01:00
Jorge Padawan	db5e786235	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2	2021-02-02 10:26:27 +01:00
Jorge Padawan	7b7571ae77	Fixed problems with default search	2021-02-02 10:26:10 +01:00
Jorge Padawan	9d96a4a6a1	Fixed problems test e2e	2021-02-02 10:17:13 +01:00
Joan Sanchez	dea858c314	Removed focus	2021-02-02 10:12:37 +01:00
Joan Sanchez	524d1274c9	Merge branch 'dev' into 2762-worker_delete_entry	2021-02-02 09:11:48 +00:00
Carlos Jimenez Ruiz	1f29d6be16	Merge pull request '2741 - Claim detail deletion visual fix' (#532) from 2741-claim_detail_delete into dev ... Reviewed-on: #532 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-02-02 09:10:50 +00:00
Joan Sanchez	a21d8acde6	2762 - Delete entry ass teamBoss	2021-02-02 10:07:13 +01:00
Joan Sanchez	3f4ebdebf6	Merge branch 'dev' into 2723-Format_emails_for_summaries	2021-02-02 08:22:34 +00:00
Joan Sanchez	20116ac620	2741 - Claim detail deletion visual fix	2021-02-02 09:08:11 +01:00
Jorge Padawan	94897a830a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index	2021-02-02 08:48:03 +01:00
Joan Sanchez	220b417ade	Merge pull request '2763 - Notify urgent issues' (#531) from 2763-notify_urgent_issue into dev ... Reviewed-on: #531 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-02-02 07:23:11 +00:00
Joan Sanchez	b34e5804ae	Updated unit test	2021-02-02 08:15:20 +01:00
Jorge Padawan	e1db173185	Changed scope days value to a correct sentence	2021-02-01 13:29:12 +01:00
Jorge Padawan	6bba5ec126	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index	2021-02-01 13:21:16 +01:00
Jorge Padawan	3f963f2d99	changed message	2021-02-01 13:19:26 +01:00
Jorge Padawan	4f644cb708	Changed name of value on scope days test	2021-02-01 13:13:18 +01:00
Jorge Padawan	811edc054b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2	2021-02-01 13:09:47 +01:00
Joan Sanchez	4ac207c568	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2763-notify_urgent_issue	2021-02-01 12:58:50 +01:00
Carlos Jimenez Ruiz	ecabad3ca3	Merge pull request '2517-clientBalanceCompensaciones' (#506) from 2517-clientBalanceCompensaciones into dev ... Reviewed-on: #506 Reviewed-by: Joan Sanchez <joan@verdnatura.es> Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-02-01 11:13:52 +00:00
Javi Gallego	a08c5c6ff7	error de ruta arreglado	2021-02-01 10:51:17 +01:00
Carlos Jimenez Ruiz	4424235bd8	Merge branch '2517-clientBalanceCompensaciones' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones	2021-02-01 09:53:17 +01:00
Carlos Jimenez Ruiz	17c784e06f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones	2021-02-01 09:52:42 +01:00
Carlos Jimenez Ruiz	ebbeee6af4	ticket payout e2e updated	2021-02-01 09:52:16 +01:00
Javi Gallego	7e95106ff5	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2021-02-01 09:47:00 +01:00