8989 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	2c9fd45958	2778 - Allow edit order number	2021-02-05 12:09:48 +01:00
Joan Sanchez	5bd7e4a67f	Translation fix	2021-02-05 08:05:57 +01:00
Joan Sanchez	84cef1949b	Image size fix	2021-02-04 18:28:58 +01:00
Joan Sanchez	d589dd435c	Default image refs to 1	2021-02-04 18:23:22 +01:00
Joan Sanchez	215e0c9fc4	Image download fix for images without extension	2021-02-03 15:01:09 +01:00
Joan Sanchez	a845f53f0a	Bug fixes	2021-02-03 12:43:30 +01:00
Joan Sanchez	f6af7f14af	Merge pull request 'Add list of emails from client' (#523) from 2723-Format_emails_for_summaries into dev ... Reviewed-on: #523 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-02-02 10:06:22 +00:00
Carlos Jimenez Ruiz	3ab59cbec8	Merge pull request '2762 - Delete entry as teamBoss' (#533) from 2762-worker_delete_entry into dev ... Reviewed-on: #533 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-02-02 09:32:09 +00:00
Joan Sanchez	dea858c314	Removed focus	2021-02-02 10:12:37 +01:00
Joan Sanchez	524d1274c9	Merge branch 'dev' into 2762-worker_delete_entry	2021-02-02 09:11:48 +00:00
Carlos Jimenez Ruiz	1f29d6be16	Merge pull request '2741 - Claim detail deletion visual fix' (#532) from 2741-claim_detail_delete into dev ... Reviewed-on: #532 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-02-02 09:10:50 +00:00
Joan Sanchez	a21d8acde6	2762 - Delete entry ass teamBoss	2021-02-02 10:07:13 +01:00
Joan Sanchez	3f4ebdebf6	Merge branch 'dev' into 2723-Format_emails_for_summaries	2021-02-02 08:22:34 +00:00
Joan Sanchez	20116ac620	2741 - Claim detail deletion visual fix	2021-02-02 09:08:11 +01:00
Joan Sanchez	220b417ade	Merge pull request '2763 - Notify urgent issues' (#531) from 2763-notify_urgent_issue into dev ... Reviewed-on: #531 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-02-02 07:23:11 +00:00
Joan Sanchez	b34e5804ae	Updated unit test	2021-02-02 08:15:20 +01:00
Joan Sanchez	4ac207c568	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2763-notify_urgent_issue	2021-02-01 12:58:50 +01:00
Carlos Jimenez Ruiz	ecabad3ca3	Merge pull request '2517-clientBalanceCompensaciones' (#506) from 2517-clientBalanceCompensaciones into dev ... Reviewed-on: #506 Reviewed-by: Joan Sanchez <joan@verdnatura.es> Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-02-01 11:13:52 +00:00
Javi Gallego	a08c5c6ff7	error de ruta arreglado	2021-02-01 10:51:17 +01:00
Carlos Jimenez Ruiz	4424235bd8	Merge branch '2517-clientBalanceCompensaciones' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones	2021-02-01 09:53:17 +01:00
Carlos Jimenez Ruiz	17c784e06f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones	2021-02-01 09:52:42 +01:00
Carlos Jimenez Ruiz	ebbeee6af4	ticket payout e2e updated	2021-02-01 09:52:16 +01:00
Javi Gallego	7e95106ff5	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2021-02-01 09:47:00 +01:00
Joan Sanchez	f5f4c5936d	2763 - Notify urgen issues	2021-02-01 09:29:47 +01:00
Joan Sanchez	3ec55426ae	Removed params due a docker error	2021-02-01 07:21:36 +01:00
Carlos Jimenez Ruiz	0e0ff94b43	client balance path updated	2021-01-29 16:33:23 +01:00
Jorge Padawan	9cf5d73be7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2723-Format_emails_for_summaries	2021-01-29 16:15:26 +01:00
Jorge Padawan	d2683683ae	Show list of mutiple emails on summary	2021-01-29 16:15:03 +01:00
Carlos Jimenez Ruiz	de5984cf0d	Merge pull request '2748 - Added module keybinds' (#529) from 2748-keybinds into dev ... Reviewed-on: #529 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-01-29 13:39:20 +00:00
Carlos Jimenez Ruiz	47e2319dfc	Merge branch 'dev' into 2748-keybinds	2021-01-29 13:33:45 +00:00
Joan Sanchez	57c124b936	Updated config params	2021-01-29 10:03:18 +01:00
Joan Sanchez	f66a5ecfdc	2748 - Added module keybinds	2021-01-29 09:46:57 +01:00
Carlos Jimenez Ruiz	c442eaa0c7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones	2021-01-29 09:13:58 +01:00
Carlos Jimenez Ruiz	6658643988	Merge branch '2517-clientBalanceCompensaciones' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones	2021-01-29 09:13:48 +01:00
Carlos Jimenez Ruiz	0c8d2997e1	Merge pull request '2580-fetched_tags_refactor' (#527) from 2580-fetched_tags_refactor into dev ... Reviewed-on: #527 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-01-28 16:11:19 +00:00
Carlos Jimenez Ruiz	5d82d469a7	Merge branch 'dev' into 2580-fetched_tags_refactor	2021-01-28 16:04:37 +00:00
Carlos Jimenez Ruiz	5384c2b217	Merge pull request '2476 - downloadImages() method refactor' (#528) from 2476-floramondo_refactor into dev ... Reviewed-on: #528 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-01-28 16:03:28 +00:00
Joan Sanchez	7bcbf5303e	Fix where	2021-01-28 16:08:57 +01:00
Joan Sanchez	ade2d9f4a2	Removed catch	2021-01-28 16:01:49 +01:00
Joan Sanchez	9d5d2e9177	Added method prune again	2021-01-28 15:57:33 +01:00
Carlos Jimenez Ruiz	4ab42e5850	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2580-fetched_tags_refactor	2021-01-28 15:10:54 +01:00
Carlos Jimenez Ruiz	5c466e1163	vn-fetched-tags visual refactor	2021-01-28 15:10:47 +01:00
Joan Sanchez	ca47fe6827	2476 - downloadImages() method refactor	2021-01-28 12:23:18 +01:00
Javi Gallego	4b302915b5	fallo validateasync	2021-01-27 09:14:37 +01:00
Joan Sanchez	7b85b968f2	Merge pull request 'fix test updateVolume' (#525) from 2735-test_route_updateVolume into dev ... Reviewed-on: #525 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-01-27 06:25:12 +00:00
Joan Sanchez	e86deee03c	Merge branch 'dev' into 2735-test_route_updateVolume	2021-01-27 06:10:21 +00:00
Joan Sanchez	30e8d7291e	Merge pull request 'export production' (#526) from 2756-export_production into dev ... Reviewed-on: #526 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-01-27 06:08:25 +00:00
Bernat Exposito	01c96272bd	export production	2021-01-26 10:55:30 +01:00
Bernat Exposito	df073094f8	fix test updateVolume	2021-01-26 09:07:00 +01:00
Carlos Jimenez Ruiz	b7765a7162	Merge branch '2517-clientBalanceCompensaciones' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones	2021-01-25 15:28:10 +01:00