8797 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	33289b3ac1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-01-13 11:18:02 +01:00
Joan Sanchez	946d0e8209	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-01-13 11:05:48 +01:00
Joan Sanchez	0e9160f61b	Letter debtor hotfix	2021-01-13 11:05:30 +01:00
Joan Sanchez	0079d31b34	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-01-13 10:47:27 +01:00
Joan Sanchez	5059abca80	Dms edit hotfix	2021-01-13 10:40:51 +01:00
Bernat Exposito	b1613871e1	Merge pull request '2672-trigger_itemTag' (#509) from 2672-trigger_itemTag into dev ... Reviewed-on: #509 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2021-01-13 07:33:55 +00:00
Bernat Exposito	ba69f9e20c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2672-trigger_itemTag	2021-01-13 08:17:46 +01:00
Bernat Exposito	975e158ebb	itemTag trigger	2021-01-13 08:17:41 +01:00
Joan Sanchez	7bcad01bef	Disabled loggable	2021-01-12 14:25:47 +01:00
Joan Sanchez	dd29b351d2	Disabled loggable	2021-01-12 14:25:01 +01:00
Carlos Jimenez Ruiz	78d9b40828	Merge pull request '2650-add_button_edit_on_summaries' (#507) from 2650-add_button_edit_on_summaries into dev ... Reviewed-on: #507 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-01-12 10:07:16 +00:00
Jorge Padawan	1a4c631c70	Fix for good practique code	2021-01-12 11:00:42 +01:00
Jorge Padawan	b4899fc0ff	Fix for good practique code	2021-01-12 10:17:12 +01:00
Jorge Padawan	9ca2e677bd	Fix for good practique code	2021-01-12 10:15:33 +01:00
Jorge Padawan	509de4fa0a	Fix for good practique code	2021-01-12 10:11:37 +01:00
Jorge Padawan	a9eb0355d4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2650-add_button_edit_on_summaries	2021-01-12 09:17:53 +01:00
Joan Sanchez	880093921e	Vn-th sortable icon hotfix	2021-01-12 07:52:11 +01:00
Joan Sanchez	4435f5e1b0	Vn-th sortable icon hotfix	2021-01-12 07:45:13 +01:00
Jorge Padawan	809811ea10	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2650-add_button_edit_on_summaries	2021-01-12 07:40:10 +01:00
Jorge Padawan	f45aa7937d	Added conditionals with rols to display or not the icons with link	2021-01-12 07:39:12 +01:00
Joan Sanchez	ac12d72c65	Merge pull request '2691 - Added "or" between date ranges and scope days' (#505) from 2691-ticket_scope_days into dev ... Reviewed-on: #505 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-01-11 14:13:49 +00:00
Joan Sanchez	7568a1c066	Updated unit tests	2021-01-11 14:54:24 +01:00
Bernat Exposito	8b3af8851c	fix trigger itemTag	2021-01-11 11:29:47 +01:00
Jorge Padawan	af55e2cc32	Add tooltip and modified sref for previews	2021-01-11 10:36:20 +01:00
Joan Sanchez	035bdfb1ad	Rounded box	2021-01-11 10:08:33 +01:00
Joan Sanchez	b5676d40b4	Merge branch 'dev' into 2691-ticket_scope_days	2021-01-11 08:09:09 +00:00
Joan Sanchez	ffdc753ad4	2691 - Added "or" between date ranges and scope days	2021-01-11 08:48:53 +01:00
Jorge Padawan	5a30bf5fa4	2650 add links to edit on summaries	2021-01-08 15:43:33 +01:00
Jorge Padawan	ef4f7d7ca9	2650 new style icon edit button for summaries	2021-01-08 15:42:43 +01:00
Javi Gallego	eecbdec7ad	Merge pull request 'export table payment' (#504) from 2713-export_payment into dev ... Reviewed-on: #504 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2021-01-08 14:20:46 +00:00
Javi Gallego	6184681d7b	Merge branch 'dev' into 2713-export_payment	2021-01-08 13:52:00 +00:00
Joan Sanchez	f8ba2534cc	2691 - Scope days changes	2021-01-08 14:32:48 +01:00
Bernat Exposito	a2550ce128	export table payment	2021-01-08 10:24:41 +01:00
Carlos Jimenez Ruiz	418774e5e0	Merge pull request '2605 - Ticket request send chat notification' (#500) from 2605-ticket_request_chat into dev ... Reviewed-on: #500 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-01-08 09:07:17 +00:00
Carlos Jimenez Ruiz	c623a5d1e4	Merge branch 'dev' into 2605-ticket_request_chat	2021-01-08 09:00:23 +00:00
Jorge Padawan	344840d2c9	First step add-button-edit-summaries	2021-01-08 08:43:28 +01:00
Carlos Jimenez Ruiz	2a948ddc33	Merge pull request 'refactor tag fixtures' (#502) from 2707-fixtures_tag into dev ... Reviewed-on: #502 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-01-07 12:43:37 +00:00
Bernat Exposito	779b229dfc	refactor tag fixtures	2021-01-07 12:11:14 +01:00
Bernat Exposito	490c05f8a9	Merge pull request 'export production' (#501) from 2704-export_production into dev ... Reviewed-on: #501 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2021-01-07 07:50:57 +00:00
Bernat Exposito	81edd9e57d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2704-export_production	2021-01-07 08:45:53 +01:00
Bernat Exposito	6179921978	export production	2021-01-07 08:37:56 +01:00
Joan Sanchez	c454273405	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-01-06 12:44:28 +01:00
Joan Sanchez	e5b13267e2	2605 - Ticket request send chat notification	2021-01-05 15:03:35 +01:00
Joan Sanchez	94c8c115e5	Font hotfix	2021-01-05 13:51:17 +01:00
Joan Sanchez	292a46106e	Translation fix	2021-01-04 15:08:52 +01:00
Joan Sanchez	2a97833f00	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-01-04 14:17:08 +01:00
Joan Sanchez	9aca59e47a	CSS height fix	2021-01-04 14:16:12 +01:00
Joan Sanchez	062e1514c9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-01-04 13:50:55 +01:00
Carlos Jimenez Ruiz	11de5743b7	Merge pull request '2700 - Closure by multiple agencies' (#498) from 2700-closure_by_agency into dev ... Reviewed-on: #498 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-01-04 10:58:26 +00:00
Joan Sanchez	e4f9ad2774	Merge branch 'dev' into 2700-closure_by_agency	2021-01-04 08:28:21 +00:00