8575 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	a62698330a	small refactor	2020-11-12 09:45:41 +01:00
Carlos Jimenez Ruiz	1dd0d463a9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2592-item_request_accept_decline	2020-11-12 09:21:20 +01:00
Javi Gallego	02a73b8c2a	Merge pull request '2557-export_production' (#441) from 2557-export_production into dev ... Reviewed-on: #441 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-11-12 07:56:27 +00:00
Bernat Exposito	fd8682e416	fdescribe	2020-11-12 08:37:08 +01:00
Bernat Exposito	2454999938	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download	2020-11-12 08:14:55 +01:00
Bernat Exposito	5be616ad91	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2557-export_production	2020-11-12 08:04:38 +01:00
Carlos Jimenez Ruiz	95a62f66ad	2548 item diary columns width	2020-11-11 16:58:56 +01:00
Carlos Jimenez Ruiz	e3090fc276	e2e fixed	2020-11-11 16:54:27 +01:00
Carlos Jimenez Ruiz	9a8a32ee9b	denied & accepted no longer show deny icon	2020-11-11 16:08:27 +01:00
Carlos Jimenez Ruiz	1ad4e8bae1	packages	2020-11-11 15:47:30 +01:00
Carlos Jimenez Ruiz	e2a6d708de	Merge pull request '2500-display_dates' (#450) from 2500-display_dates into dev ... Reviewed-on: #450 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-11-11 14:31:48 +00:00
Carlos Jimenez Ruiz	ba86693891	minor refactor	2020-11-11 15:14:05 +01:00
Carlos Jimenez Ruiz	6cd1332a18	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2500-display_dates	2020-11-11 14:45:22 +01:00
Carlos Jimenez Ruiz	795d371dc8	Merge pull request '2425-ticket_descriptor_menu' (#447) from 2425-ticket_descriptor_menu into dev ... Reviewed-on: #447 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2020-11-11 13:44:59 +00:00
Joan Sanchez	136c127cae	Updated back unit test	2020-11-11 14:32:53 +01:00
Joan Sanchez	b6f29d205c	Merge branch 'dev' into 2425-ticket_descriptor_menu	2020-11-11 13:06:14 +00:00
Bernat Exposito	eb8931bca5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download	2020-11-11 13:57:37 +01:00
Joan Sanchez	378982389a	Requested chagnes	2020-11-11 13:44:42 +01:00
Carlos Jimenez Ruiz	74e4a4e42a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2500-display_dates	2020-11-11 12:45:58 +01:00
Carlos Jimenez Ruiz	3a0ff3be38	summary title amended + clientDescriptor for alias	2020-11-11 12:45:45 +01:00
Joan Sanchez	db4f226f6f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-11-11 12:39:15 +01:00
Joan Sanchez	75ff7c297f	Removed max width	2020-11-11 12:37:59 +01:00
Joan Sanchez	024fda0f65	2591 - Data checked icon	2020-11-11 12:37:45 +01:00
Joan Sanchez	a0d50410aa	Added section	2020-11-11 12:34:07 +01:00
Carlos Jimenez Ruiz	5d70794326	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2500-display_dates	2020-11-11 12:02:49 +01:00
Carlos Jimenez Ruiz	c2f92cb127	small refactor	2020-11-11 12:02:40 +01:00
Bernat Exposito	a060ac5c70	fix pr changes	2020-11-11 11:58:14 +01:00
Carlos Jimenez Ruiz	086ac2538a	Merge pull request '2591 - Checked data icon' (#449) from 2591-checked_data_icon into dev ... Reviewed-on: #449 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2020-11-11 10:27:02 +00:00
Bernat Exposito	1e95f0105a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download	2020-11-11 10:52:46 +01:00
Bernat Exposito	75ffa108fb	refactor back download	2020-11-11 10:52:35 +01:00
Joan Sanchez	9d5765724b	Removed max width	2020-11-11 09:17:34 +01:00
Joan Sanchez	5a08798b22	2591 - Data checked icon	2020-11-11 09:11:11 +01:00
Joan Sanchez	d959dbc058	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2425-ticket_descriptor_menu	2020-11-11 07:34:34 +01:00
Carlos Jimenez Ruiz	e22e74a725	expanded date columns + order index translations	2020-11-10 16:47:39 +01:00
Joan Sanchez	5b7a646245	Merge pull request '2584 - Client consumption fixes' (#445) from 2584-client_consumption into dev ... Reviewed-on: #445 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2020-11-10 14:10:30 +00:00
Joan Sanchez	53566be56a	Merge branch 'dev' into 2584-client_consumption	2020-11-10 14:03:38 +00:00
Joan Sanchez	8b699841e7	Merge pull request '2574 Filter tag by composed color' (#443) from 2574-itemTag_refactor into dev ... Reviewed-on: #443 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2020-11-10 14:01:48 +00:00
Carlos Jimenez Ruiz	45a2a2d8e6	Merge branch 'dev' into 2584-client_consumption	2020-11-10 13:30:38 +00:00
Joan Sanchez	dfbe1a02d2	Removed unused import	2020-11-10 14:06:41 +01:00
Joan Sanchez	08af948eb0	Merge branch 'dev' into 2574-itemTag_refactor	2020-11-10 12:39:17 +00:00
Carlos Jimenez Ruiz	95dae0ab1c	e2e toBe -> toContain for message.text	2020-11-10 12:06:21 +01:00
Bernat Exposito	44d3cf748b	change id in ticketLastState model	2020-11-10 11:44:41 +01:00
Joan Sanchez	b8784688b8	e2e fix	2020-11-10 11:41:10 +01:00
Bernat Exposito	c673f2130a	fix e2e	2020-11-10 11:33:01 +01:00
Joan Sanchez	a93d9f91cc	Updated unit tests	2020-11-10 10:38:25 +01:00
Bernat Exposito	e4e4f37609	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download	2020-11-10 08:46:37 +01:00
Bernat Exposito	4ea5993dcc	user image	2020-11-10 08:39:34 +01:00
Carlos Jimenez Ruiz	82c739eab2	stacktrace raw + e2e amends	2020-11-09 18:25:02 +01:00
Carlos Jimenez Ruiz	282adfa7b6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2425-ticket_descriptor_menu	2020-11-09 16:06:29 +01:00
Carlos Jimenez Ruiz	ca27e79d42	e2e path fix for ticket sales	2020-11-09 16:06:16 +01:00