10504 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	4f40075c2e	Merge branch 'dev' into 2657-zone_log	2020-12-03 11:16:18 +00:00
Javi Gallego	5bfc8a546d	Merge pull request 'fix ticket component' (#473) from 2656-ticket_component into dev ... Reviewed-on: #473 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-12-03 09:30:53 +00:00
Bernat Exposito	aaee855da3	fix ticket component	2020-12-03 10:26:49 +01:00
Bernat Exposito	6eeecc553b	zoneLog calendar	2020-12-02 12:49:50 +01:00
Bernat Exposito	6605e5ae4c	zoneLog	2020-12-02 12:05:47 +01:00
Juan Ferrer	cc9f313867	Docker replicas restored	2020-11-30 19:20:52 +01:00
Juan Ferrer	49111e3d73	Replicas removed from compose	2020-11-30 19:11:20 +01:00
Juan Ferrer	fc9412bddd	Merge branch 'master' into test	2020-11-30 19:05:44 +01:00
Juan Ferrer	954ba0c69d	Back replicas	2020-11-30 19:05:33 +01:00
Juan Ferrer	f0817188bb	Merge branch 'master' into test	2020-11-30 18:51:40 +01:00
Juan Ferrer	b2a3adc96f	LDAP sync hotfix	2020-11-30 18:50:04 +01:00
Juan Ferrer	61bb2f14ba	LDAP sync hotfix	2020-11-30 18:45:50 +01:00
Joan Sanchez	1ba1d27ba0	2576 - Photo upload component	2020-11-27 13:10:39 +01:00
Joan Sanchez	5dbf4f3926	Merge pull request 'log refactor' (#469) from 2610-log_refactor into dev ... Reviewed-on: #469 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-11-27 11:40:36 +00:00
Bernat Exposito	ba156a2e42	log refactor	2020-11-27 11:56:41 +01:00
Bernat Exposito	857b876808	Merge pull request '2645-export_production' (#468) from 2645-export_production into dev ... Reviewed-on: #468 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-11-25 12:13:36 +00:00
Bernat Exposito	06e7583f2b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2645-export_production	2020-11-25 12:47:17 +01:00
Bernat Exposito	78f25e0b46	export production	2020-11-25 12:37:44 +01:00
Bernat Exposito	34c1115954	Merge pull request '2588 - No ellipsize on summary notes or address' (#467) from 2588-summaries_refactor into dev ... Reviewed-on: #467 Reviewed-by: Bernat Exposito <bernat@verdnatura.es>	2020-11-25 07:12:25 +00:00
Joan Sanchez	5ff364dcf0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2588-summaries_refactor	2020-11-25 08:01:47 +01:00
Bernat Exposito	200e0acdfd	Merge pull request '2628 - Remove item name from search on tag removal' (#466) from 2628-catalog_search_fix into dev ... Reviewed-on: #466 Reviewed-by: Bernat Exposito <bernat@verdnatura.es>	2020-11-25 06:58:47 +00:00
Joan Sanchez	27f0a5cd63	Updated Node version	2020-11-25 07:54:20 +01:00
Joan Sanchez	d3f1f06588	Updated selector	2020-11-25 07:50:02 +01:00
Joan Sanchez	8eb14a8bdc	2588 - No ellipsize on summary notes or address	2020-11-24 14:56:10 +01:00
Joan Sanchez	ca4a89199c	Updated selector	2020-11-24 14:09:05 +01:00
Joan Sanchez	561991f18c	2628 - Remove item name from search on tag removal	2020-11-24 13:54:31 +01:00
Carlos Jimenez Ruiz	2a2104936c	Merge pull request '2629 - Open ticket lines on new window' (#465) from 2629-ticket_lines_newtab into dev ... Reviewed-on: #465 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2020-11-24 11:39:47 +00:00
Joan Sanchez	d9e14a0c3a	2629 - Open ticket lines on new window	2020-11-24 12:10:02 +01:00
Carlos Jimenez Ruiz	2e623eb100	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2503-backend_unit_jest	2020-11-24 11:41:54 +01:00
Joan Sanchez	cca33e0945	Merge pull request 'Added section' (#452) from 2569-travel_extra_community into dev ... Reviewed-on: #452 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2020-11-24 10:29:34 +00:00
Joan Sanchez	b2794dc413	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community	2020-11-24 10:52:35 +01:00
Joan Sanchez	cb22112ed4	package update	2020-11-24 10:52:30 +01:00
Carlos Jimenez Ruiz	fbb2fc3bdd	Merge pull request '2607-preview_icon' (#464) from 2607-preview_icon into dev ... Reviewed-on: #464 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2020-11-24 09:33:44 +00:00
Joan Sanchez	3329d33ec9	Merge branch 'dev' into 2569-travel_extra_community	2020-11-24 09:27:14 +00:00
Joan Sanchez	55061bea07	Fixed selector	2020-11-24 09:06:37 +01:00
Bernat Exposito	f2e8f7655b	Merge pull request '2493-route_ticket_drag_and_drop' (#462) from 2493-route_ticket_drag_and_drop into dev ... Reviewed-on: #462 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-11-24 07:57:36 +00:00
Bernat Exposito	6a7568eb29	Merge branch 'dev' into 2493-route_ticket_drag_and_drop	2020-11-24 07:36:52 +00:00
Joan Sanchez	80bae4de0a	2607 - Changed preview icon	2020-11-24 08:22:54 +01:00
Carlos Jimenez Ruiz	4172d0bb9b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community	2020-11-23 18:51:16 +01:00
Carlos Jimenez Ruiz	1b46359574	removed focus on describe	2020-11-23 18:42:11 +01:00
Carlos Jimenez Ruiz	551af77fc3	extension refactor	2020-11-23 18:35:57 +01:00
Carlos Jimenez Ruiz	e7c5f4d4b5	Merge branch '2569-travel_extra_community' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community	2020-11-23 18:29:18 +01:00
Carlos Jimenez Ruiz	6b0f1544a4	wait and waitFor are now deprecated. Test refactor	2020-11-23 18:28:39 +01:00
Carlos Jimenez Ruiz	609098b751	e2e path for travel extra community + puppeteer v5	2020-11-23 18:27:32 +01:00
Carlos Jimenez Ruiz	7d5b66be89	Merge pull request '2611 - Summary go to entity' (#463) from 2611-summary_goTo into dev ... Reviewed-on: #463 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2020-11-23 13:21:41 +00:00
Joan Sanchez	52eb39ccda	Removed autoload from crud-model	2020-11-23 14:12:43 +01:00
Joan Sanchez	2469ce827e	Removed commented code	2020-11-23 14:02:07 +01:00
Joan Sanchez	c654e14cfe	2611 - Summary go to entity	2020-11-23 13:41:51 +01:00
Bernat Exposito	37ac312bd5	pr changes	2020-11-23 13:05:24 +01:00
Bernat Exposito	b07ae3f60c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2493-route_ticket_drag_and_drop	2020-11-23 13:04:38 +01:00