9551 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	a4d2c531a3	Changes	2021-03-10 10:29:58 +01:00
jorgebl	2f68509e65	WIP: added styles	2021-03-10 09:49:24 +01:00
jorgebl	45f9c1188d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys	2021-03-10 09:48:17 +01:00
Joan Sanchez	2a2e276c6b	Added back unit test plus fixes	2021-03-10 09:01:32 +01:00
Joan Sanchez	ab755e29c7	Merge branch 'dev' into 2787-change_css_date_time	2021-03-09 14:01:04 +00:00
Joan Sanchez	31205f4556	Added front unit test	2021-03-09 13:39:22 +01:00
Joan Sanchez	2541623423	Merge pull request 'Added icon for supplier descriptor' (#569) from 2733-supplier_descriptor_icon into dev ... Reviewed-on: #569 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-03-09 11:37:03 +00:00
Joan Sanchez	5cbd8d632d	Changes	2021-03-09 10:01:40 +01:00
Joan Sanchez	9da59949fd	Merge branch 'dev' into 2733-supplier_descriptor_icon	2021-03-09 08:31:03 +00:00
Joan Sanchez	e7cabc052e	Merge pull request '2832 Fixed problem with conditional for validate the role on item summary' (#568) from 2832-summary_validate_h4 into dev ... Reviewed-on: #568 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-03-09 08:27:15 +00:00
jorgebl	59882cca77	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2733-supplier_descriptor_icon	2021-03-09 09:26:02 +01:00
jorgebl	2d36d4e610	Added line break in vn-icon	2021-03-09 09:25:10 +01:00
Joan Sanchez	ff6c80aa7e	Merge branch 'dev' into 2832-summary_validate_h4	2021-03-09 08:24:10 +00:00
Carlos Jimenez Ruiz	6316abdb4b	Merge pull request '2831-item_botanical_refactor' (#567) from 2831-item_botanical_refactor into dev ... Reviewed-on: #567 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-03-09 08:11:00 +00:00
jorgebl	1922280c61	QA rename some descriptions in test and reworked the test	2021-03-08 17:49:04 +01:00
jorgebl	1379691576	Added icon for supplier descriptor	2021-03-08 13:52:11 +01:00
jorgebl	43dc158d7c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2832-summary_validate_h4	2021-03-08 13:17:38 +01:00
jorgebl	5cb959f5b8	removed controller.data from submit	2021-03-08 13:12:13 +01:00
jorgebl	27816b29e7	Removed ids on controller.data	2021-03-08 13:06:35 +01:00
jorgebl	134365dd9c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2831-item_botanical_refactor	2021-03-08 12:55:44 +01:00
jorgebl	d09e47835e	Rename the statements for correctly description the action	2021-03-08 12:40:13 +01:00
jorgebl	6e08a66343	Added acl action for logistic boss and show the recent data added on species and genus in their fields in item botanical	2021-03-08 12:38:54 +01:00
jorgebl	32ea2dbda6	Added permisions from models in table salix ACL	2021-03-08 12:32:35 +01:00
Carlos Jimenez Ruiz	dbb0deeb5a	Merge pull request '2703 Put time in 00:00 when field "shipped" change' (#563) from 2703-ticket_step_one into dev ... Reviewed-on: #563 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-03-08 09:54:32 +00:00
Carlos Jimenez Ruiz	5c776c0f11	Merge branch 'dev' into 2703-ticket_step_one	2021-03-08 09:48:38 +00:00
Carlos Jimenez Ruiz	5c183997d3	Merge pull request '2806-e2e_account_index' (#565) from 2806-e2e_account_index into dev ... Reviewed-on: #565 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-03-08 08:51:39 +00:00
Joan Sanchez	2aff48c42d	2837 - Updated fonts	2021-03-08 09:34:58 +01:00
Carlos Jimenez Ruiz	9fccc70069	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2806-e2e_account_index	2021-03-08 09:21:50 +01:00
jorgebl	192d7627b0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2832-summary_validate_h4	2021-03-08 09:12:34 +01:00
jorgebl	28b9da82ed	change conditional	2021-03-08 09:12:10 +01:00
Carlos Jimenez Ruiz	8b07a07619	Merge pull request '2837 - Updated fonts' (#566) from 2837-salix_fonts into dev ... Reviewed-on: #566 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-03-08 08:09:05 +00:00
Joan Sanchez	d7651ba4ac	2837 - Updated fonts	2021-03-08 07:53:00 +01:00
Joan Sanchez	85920e5c07	Added new SQL version	2021-03-05 17:11:04 +01:00
Carlos Jimenez Ruiz	dcbe625bc9	excluded e2e due to basic data error	2021-03-05 17:06:06 +01:00
Carlos Jimenez Ruiz	5908dea010	e2e path for account role	2021-03-05 16:25:09 +01:00
Carlos Jimenez Ruiz	f03de39433	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2806-e2e_account_index	2021-03-05 13:46:11 +01:00
Carlos Jimenez Ruiz	8027f108d9	Merge pull request '2823-e2e_travel_create' (#562) from 2823-e2e_travel_create into dev ... Reviewed-on: #562 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-03-05 12:43:04 +00:00
Carlos Jimenez Ruiz	32b527f3ec	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2806-e2e_account_index	2021-03-05 13:40:56 +01:00
Carlos Jimenez Ruiz	3f8e4df54c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2823-e2e_travel_create	2021-03-05 12:37:30 +01:00
Carlos Jimenez Ruiz	f01733a8b1	Merge pull request '2788 Add ellipsis in log component' (#561) from 2788-add-ellipsize_log-component into dev ... Reviewed-on: #561 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-03-05 11:36:43 +00:00
Carlos Jimenez Ruiz	2c6609cf12	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2823-e2e_travel_create	2021-03-05 12:14:25 +01:00
jorgebl	1fd18cae5a	QA	2021-03-05 11:40:01 +01:00
jorgebl	4ae418698b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2788-add-ellipsize_log-component	2021-03-05 11:39:25 +01:00
Carlos Jimenez Ruiz	3375189ff6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2806-e2e_account_index	2021-03-05 11:34:00 +01:00
Carlos Jimenez Ruiz	d68da2ad10	e2e paths for account index and alias	2021-03-05 11:33:55 +01:00
Carlos Jimenez Ruiz	b0a3a9b7bc	Merge pull request '2791-item_botanical_remove_field' (#564) from 2791-item_botanical_remove_field into dev ... Reviewed-on: #564 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-03-05 10:30:11 +00:00
Joan Sanchez	7ec9ddb6d9	Translation fix	2021-03-05 09:23:31 +01:00
jorgebl	b6bf61f410	description put correctly	2021-03-05 09:09:09 +01:00
jorgebl	63ac492845	Added message for duplicated names	2021-03-05 08:45:14 +01:00
jorgebl	5972526327	Merge branch '2791-item_botanical_remove_field' of https://gitea.verdnatura.es/verdnatura/salix into 2791-item_botanical_remove_field	2021-03-05 08:05:23 +01:00