7580 Commits

All Branches

Search

Author	SHA1	Message	Date
Bernat Exposito Domenech	b953fa8773	client descriptor add risk	2020-05-18 11:50:55 +02:00
Carlos Jimenez Ruiz	79a0466850	Merge pull request '2216-show_client_icons' (#256) from 2216-show_client_icons into dev ... Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-05-18 09:46:56 +00:00
Joan Sanchez	53b55468fb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1833-claim_action_refactor	2020-05-18 11:45:43 +02:00
Joan Sanchez	4ee61906a5	Merge pull request '2211-fix_tooltip_unit_test' (#254) from 2211-fix_tooltip_unit_test into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-05-18 09:29:16 +00:00
Joan Sanchez	341eaab472	Removed css changes	2020-05-18 10:42:26 +02:00
Joan Sanchez	a3203fa81f	2216 Show active client icon on client index	2020-05-18 10:39:40 +02:00
Bernat Exposito Domenech	37d5cf5975	delete old db changes	2020-05-18 10:29:57 +02:00
Bernat Exposito Domenech	c205c173f8	invoiceOut descriptor popover in ticket summary	2020-05-18 10:28:33 +02:00
Carlos Jimenez Ruiz	b7b02566d1	fixed tooltip unit test for Jest	2020-05-18 10:05:54 +02:00
Carlos Jimenez Ruiz	e3374e5eea	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2211-fix_tooltip_unit_test	2020-05-18 10:03:47 +02:00
Joan Sanchez	1f2dee9c12	Merge pull request 'update structure and fix test' (#252) from 2241-production_export into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-05-18 06:23:09 +00:00
Joan Sanchez	67fc332b46	1833 Currency filter error	2020-05-15 17:00:55 +02:00
Carlos Jimenez Ruiz	c296c454d4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2211-fix_tooltip_unit_test	2020-05-15 16:10:38 +02:00
Joan Sanchez	42bec3a944	1833 Claim action refactor	2020-05-15 14:47:19 +02:00
Bernat Exposito Domenech	5ceb26c6da	update structure and fix test	2020-05-15 13:11:23 +02:00
Javi Gallego	3815edfbea	falta CR	2020-05-15 12:17:34 +02:00
Joan Sanchez	6692ac2e02	Merge pull request '2223 Added pickup checkbox' (#251) from 2223-claim_action_pickup into dev ... Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-05-14 15:41:30 +00:00
Joan Sanchez	9b085d13e1	Updated back unit test	2020-05-14 17:32:52 +02:00
Joan Sanchez	2bb17f4a00	Requested changes	2020-05-14 17:15:54 +02:00
Joan Sanchez	e51341102b	Updated e2e	2020-05-14 14:30:43 +02:00
Joan Sanchez	62d27e45e2	Updated unit tests	2020-05-14 14:01:34 +02:00
Juan Ferrer	b94c97d322	Hotfix: Clone option added to vnItemDescriptor	2020-05-13 17:51:27 +02:00
Joan Sanchez	94a219760c	2223 Added pickup checkbox	2020-05-13 15:04:57 +02:00
Carlos Jimenez Ruiz	3946155e24	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2211-fix_tooltip_unit_test	2020-05-13 09:21:09 +02:00
Juan Ferrer	07cbac7fcd	Merge fixes	2020-05-08 19:56:39 +02:00
Juan Ferrer	7a1bb7e68d	Merge branch 'dev' into 1882-descriptorRefactor	2020-05-08 14:01:49 +02:00
Juan Ferrer	b14d2f9455	Small fixes in vnOrderCatalog and vnZoneEvents	2020-05-08 13:23:06 +02:00
Juan Ferrer	58be5ef78e	Merge branch '#2224-item.diary-directiva-$anchorScroll' of verdnatura/salix into dev	2020-05-08 10:16:31 +00:00
Javi Gallego	9f339c6a11	Merge branch 'refactor-test-front-filters' of verdnatura/salix into dev	2020-05-07 09:28:11 +00:00
Javi Gallego	8453d25852	#2224item.diary provar directiva $anchorScroll	2020-05-06 18:42:50 +02:00
Juan Ferrer	6c14743017	Last fixes & tests passed	2020-05-06 14:38:09 +02:00
Joan Sanchez	71b0f38b53	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-05-03 14:56:04 +02:00
Joan Sanchez	134b4be136	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2020-05-03 14:47:51 +02:00
Joan Sanchez	d960ac7d84	Removed max auth attempts	2020-05-03 14:30:19 +02:00
Juan Ferrer	6a8e1bf6b5	#1882 Boileplate code removed, declarative quicklinks	2020-04-30 12:48:52 +02:00
Javi Gallego	7e895749eb	sin use strict	2020-04-30 08:18:40 +02:00
Javi Gallego	7da7e6cfaf	test	2020-04-30 08:13:25 +02:00
Javi Gallego	ceb3d1f4cf	all filters tested	2020-04-30 07:20:43 +02:00
Juan Ferrer	b536c8291a	#1882 Popover::show() boilerplate code removed	2020-04-28 14:26:02 +02:00
Javi Gallego	bb66e578d7	Merge branch '#2222-ticket.index-modificar-orden-de-las-secciones' of verdnatura/salix into dev	2020-04-27 12:24:11 +00:00
Juan Ferrer	5826099601	#1882 First step, front tests passed	2020-04-25 11:50:04 +02:00
Javi Gallego	6dacf20bd9	ticket.index modificar orden de las secciones	2020-04-23 17:59:46 +02:00
Carlos Jimenez Ruiz	fc00b3af47	Merge branch 'refactor-ticketLot-con-campo-zone' of verdnatura/salix into dev	2020-04-21 10:03:51 +00:00
Javi Gallego	dbb2257430	test de zone_getLanded y zone_getFromGeo	2020-04-20 13:49:33 +02:00
Ainki	219519dc26	test, fitxures and changes	2020-04-17 15:28:02 +02:00
Bernat Exposito Domenech	1c757a1104	structure DB	2020-04-17 15:27:57 +02:00
Ainki	ec630d6a7b	cherry-pick	2020-04-17 14:49:35 +02:00
Ainki	fceee0a9d6	spec	2020-04-17 14:47:50 +02:00
Ainki	07d952646a	change some names an methods	2020-04-17 14:47:40 +02:00
Ainki	1063db3a2f	print	2020-04-17 14:47:27 +02:00