9724 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	c2d50c6044	Dup entry error handler	2020-12-29 14:02:26 +01:00
Joan Sanchez	a3f17ae302	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2661-travel_cloneWithEntries	2020-12-29 13:55:06 +01:00
Carlos Jimenez Ruiz	3f4366b907	Merge pull request '2690 - Duplicated foreign key fix' (#495) from 2690-duplicated_fk into dev ... Reviewed-on: #495 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2020-12-29 12:51:07 +00:00
Joan Sanchez	edd25a347b	Moved line	2020-12-29 13:44:12 +01:00
Joan Sanchez	20862db854	2690 - Duplicated foreign key fix	2020-12-29 13:39:10 +01:00
Joan Sanchez	2886e02328	Enabled loggable for locations	2020-12-29 08:50:12 +01:00
Joan Sanchez	f4ff31a294	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2657-zone_log	2020-12-29 08:09:49 +01:00
Joan Sanchez	f29840b37b	Buyer ACL	2020-12-29 07:52:36 +01:00
Carlos Jimenez Ruiz	4a60e1da1e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2685-create_test_e2e_entryObservation	2020-12-28 15:36:35 +01:00
Carlos Jimenez Ruiz	e193c2998c	Merge pull request '2665-route_index_multi_clone + e2e' (#492) from 2665-route_index_multi_clone into dev ... Reviewed-on: #492 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-12-28 14:11:58 +00:00
Joan Sanchez	910caf5689	2661 - Added clone options	2020-12-28 14:53:26 +01:00
Carlos Jimenez Ruiz	67072f5c23	e2e path for route index now works focused and full run	2020-12-28 14:13:22 +01:00
Jorge Padawan	5af51763d6	Created back test field for entryObservation	2020-12-28 12:55:28 +01:00
Carlos Jimenez Ruiz	846117d3bd	backend unit tests disabled for jenkins	2020-12-28 10:16:25 +01:00
Carlos Jimenez Ruiz	f16eaf105b	enabled back end unit tests for jenkins	2020-12-28 09:46:33 +01:00
Carlos Jimenez Ruiz	0715f8ac81	now loopback reconects to db	2020-12-28 09:44:21 +01:00
Carlos Jimenez Ruiz	3f9446d94f	e2e path updated + extension refactor	2020-12-24 16:48:56 +01:00
Carlos Jimenez Ruiz	68f2976c2d	e2e path updated for clonation	2020-12-24 13:15:14 +01:00
Carlos Jimenez Ruiz	e6106b1aa9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2665-route_index_multi_clone	2020-12-24 11:31:27 +01:00
Carlos Jimenez Ruiz	8ede30398b	clone feature for routes index	2020-12-24 11:31:20 +01:00
Joan Sanchez	c192a0e125	Merge pull request '2667-create_entryObservation' (#490) from 2667-create_entryObservation into dev ... Reviewed-on: #490 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-12-24 08:59:33 +00:00
Carlos Jimenez Ruiz	5696ada927	Merge pull request '2666 - Closure invalid email notification' (#489) from 2666-closure_invalid_email into dev ... Reviewed-on: #489 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2020-12-23 12:38:29 +00:00
Jorge Padawan	259842c22d	Retirado el parametro required por no utilizarse	2020-12-23 13:32:58 +01:00
Jorge Padawan	3517bdea41	Añadido a las foreignKeys el valor UNIQUE	2020-12-23 13:31:55 +01:00
Joan Sanchez	87f9a39e50	Merge branch 'dev' into 2666-closure_invalid_email	2020-12-23 12:29:36 +00:00
Joan Sanchez	c740767599	Merge pull request 'fix searchbar index' (#491) from 2625-travel_index into dev ... Reviewed-on: #491 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-12-23 11:51:10 +00:00
Bernat Exposito	a21476e3df	fix searchbar index	2020-12-23 12:42:41 +01:00
Jorge Padawan	2948747da3	Seccion nueva, "Note" mas campo entryObservation	2020-12-23 12:25:12 +01:00
Jorge Padawan	a19064cb1b	Nueva tabla entryObservation y he juntado la consulta de 1260-navidad con 1260-holydays	2020-12-23 12:23:37 +01:00
Juan Ferrer	d064bc0417	Merge branch 'master' into test	2020-12-23 00:00:38 +01:00
Joan Sanchez	6416b0ad79	2666 - Closure invalid email notification	2020-12-22 14:56:21 +01:00
Javi Gallego	0c7ddd863d	xdiario test ok	2020-12-22 10:08:11 +01:00
Javi Gallego	36bace2a94	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2020-12-22 07:42:28 +01:00
Carlos Jimenez Ruiz	e70b8a80e1	Merge pull request '2663 - Drag & drop ticket to route index' (#488) from 2663-route_dragdrop into dev ... Reviewed-on: #488 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2020-12-21 14:06:02 +00:00
Carlos Jimenez Ruiz	be1a317df8	Merge branch 'dev' into 2663-route_dragdrop	2020-12-21 14:02:05 +00:00
Joan Sanchez	2ed7fdd367	Merge pull request 'years previous to contract error corrected' (#487) from 2675-worker_time_control_year_error into dev ... Reviewed-on: #487 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-12-21 13:58:40 +00:00
Joan Sanchez	35dc2a533b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2663-route_dragdrop	2020-12-21 14:52:08 +01:00
Joan Sanchez	1419acb8a7	2663 - Drag & drop ticket to route index	2020-12-21 14:48:47 +01:00
Carlos Jimenez Ruiz	ec0ae8f07c	years previous to contrar error corrected	2020-12-21 13:52:37 +01:00
Carlos Jimenez Ruiz	564ca3a511	Merge pull request '2622-route_tickets_refactor' (#486) from 2622-route_tickets_refactor into dev ... Reviewed-on: #486 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-12-21 11:50:19 +00:00
Carlos Jimenez Ruiz	482cbd7195	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2622-route_tickets_refactor	2020-12-21 12:39:26 +01:00
Carlos Jimenez Ruiz	369a79b79f	route.tickets refactor	2020-12-21 12:37:36 +01:00
Carlos Jimenez Ruiz	ffc9b8dba9	Merge pull request '2576 - Photo upload component' (#470) from 2576-photo_uploader into dev ... Reviewed-on: #470 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2020-12-21 09:55:45 +00:00
Joan Sanchez	027a37bdad	Requested changes	2020-12-21 10:14:15 +01:00
Javi Gallego	340927799c	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2020-12-21 09:53:00 +01:00
Javi Gallego	3a6d62ac7d	xdiario	2020-12-21 09:52:27 +01:00
Bernat Exposito	d4ab25f974	Merge pull request '2616-supplier_consumption' (#480) from 2616-supplier_consumption into dev ... Reviewed-on: #480 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-12-21 07:08:12 +00:00
Bernat Exposito	1a641d1d4b	cr changes	2020-12-18 22:31:46 +01:00
Joan Sanchez	6717853efb	Updated front tests	2020-12-18 18:02:41 +01:00
Joan Sanchez	95df28fc35	Keep file	2020-12-18 17:29:04 +01:00