12541 Commits

All Branches

Search

Author	SHA1	Message	Date
Vicent Llopis	4ffb61b75c	refactor: refund	2022-04-22 11:45:14 +02:00
Joan Sanchez	89777646c2	Merge pull request 'refactor(SuggestedTickets): added translations and descriptors' (#945) from 3641-suggestedTickets_refactor into dev ... Reviewed-on: #945 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-04-22 09:37:48 +00:00
Carlos Jimenez Ruiz	9d46b4c79c	refactor(SuggestedTickets): added translations and descriptors	2022-04-22 11:26:16 +02:00
Alex Moreno	a46b2113dc	models	2022-04-22 07:39:47 +02:00
Vicent Llopis	d1bd2f9c77	refactor: refund	2022-04-21 14:59:41 +02:00
Vicent Llopis	4a6873a0fd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3752-claim_action	2022-04-21 09:34:37 +02:00
Vicent Llopis	0ec51202e0	pull request changed	2022-04-21 09:34:13 +02:00
Joan Sanchez	db7c1bc092	Merge branch 'dev' into 3795-client_administraive	2022-04-21 07:29:05 +00:00
Vicent Llopis	579ff3aa4a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3750-claim_photo	2022-04-21 07:13:34 +02:00
Joan Sanchez	bd0164dd4e	Merge pull request 'feat(user): added userConfig.darkMode relation towards account.user' (#943) from 3904-user_dark_mode into dev ... Reviewed-on: #943 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-04-20 14:30:32 +00:00
Vicent Llopis	de7a992480	change folder files	2022-04-20 15:18:52 +02:00
Vicent Llopis	5db20ee3e2	refactor: deleteOldFiles in claim	2022-04-20 14:46:37 +02:00
Alex Moreno	8b68fcf088	change new code	2022-04-20 14:40:29 +02:00
Alex Moreno	e00d63d7af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate	2022-04-20 14:30:23 +02:00
Carlos Jimenez Ruiz	8efcb6233f	feat(user): added userConfig.darkMode relation towards account.user	2022-04-20 10:25:01 +02:00
Alex Moreno	62f7b80ed4	quit $	2022-04-20 08:55:43 +02:00
Alex Moreno	ea2e38af4e	support front filter and front test for component	2022-04-20 08:24:12 +02:00
Alex Moreno	433afb8fe8	change tooltip client descriptor btnFive	2022-04-19 15:21:28 +02:00
Alex Moreno	69530d3019	fix filter	2022-04-19 14:12:31 +02:00
Alex Moreno	7cecf1584b	feat(ticket): change isAvailable to itemShortage	2022-04-19 12:04:06 +02:00
Alex Moreno	8432815cb7	refactor	2022-04-13 14:58:46 +02:00
Alex Moreno	04f993e227	fix	2022-04-13 13:55:18 +02:00
Alex Moreno	3d7beba822	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3887-multi-check	2022-04-13 13:07:07 +02:00
Alex Moreno	36addcdb6c	fix name tests	2022-04-13 13:05:20 +02:00
Alex Moreno	b7931278be	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3795-client_administraive	2022-04-13 13:03:07 +02:00
Joan Sanchez	91f111f609	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-04-13 11:33:49 +02:00
Carlos Jimenez Ruiz	8f15001440	Merge pull request '3897-item.fixed-price' (#940) from 3897-item.fixed-price into test ... Reviewed-on: #940 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-04-13 09:33:08 +00:00
Carlos Jimenez Ruiz	d84f882b36	Merge pull request '3830-ticket_sale' (#927) from 3830-ticket_sale into dev ... Reviewed-on: #927 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-04-13 09:30:47 +00:00
Carlos Jimenez Ruiz	9085098a04	Merge branch 'dev' into 3830-ticket_sale	2022-04-13 09:19:50 +00:00
Carlos Jimenez Ruiz	153b42cd26	Merge pull request '3758-client_unpaid' (#936) from 3758-client_unpaid into dev ... Reviewed-on: #936 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-04-13 09:19:27 +00:00
Carlos Jimenez Ruiz	6015050eed	Merge branch 'dev' into 3830-ticket_sale	2022-04-13 09:12:14 +00:00
Joan Sanchez	c2271b6071	Merge branch 'dev' into 3758-client_unpaid	2022-04-13 09:00:28 +00:00
Vicent Llopis	804f5f4b2f	fix: delete vn-focus and duplicated pagination	2022-04-13 10:37:52 +02:00
Carlos Jimenez Ruiz	f28631fa90	Merge pull request '2958-vnDescriptor_OpenSummaryPopup' (#934) from 2958-vnDescriptor_OpenSummaryPopup into dev ... Reviewed-on: #934 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-04-13 08:25:40 +00:00
Carlos Jimenez Ruiz	080975208b	Merge branch 'dev' into 2958-vnDescriptor_OpenSummaryPopup	2022-04-13 08:12:28 +00:00
Vicent Llopis	a47349646f	change versions db	2022-04-13 09:50:29 +02:00
Alex Moreno	32a065c07a	drop unnecessary locale	2022-04-13 08:21:00 +02:00
Alex Moreno	88d91d8b47	change db changes folder	2022-04-13 08:19:33 +02:00
Alex Moreno	14933d13cb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3758-client_unpaid	2022-04-13 08:17:44 +02:00
Alex Moreno	f2ee987dec	fix multi-check	2022-04-13 08:15:47 +02:00
Joan Sanchez	62daa6b38d	Send to user when no department channel is specified	2022-04-12 14:44:32 +02:00
Alex Moreno	8e87ab62a8	feat(entry_latest-buys): add multi-check-dummy	2022-04-12 14:40:25 +02:00
Alex Moreno	73ee790f8d	removed isFarmer property	2022-04-12 14:27:06 +02:00
Joan Sanchez	b13f526726	Notify to group with for user with busy status	2022-04-12 13:01:34 +02:00
Vicent Llopis	013390fae9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3830-ticket_sale	2022-04-12 12:49:34 +02:00
Vicent Llopis	c1edb8206e	refactor	2022-04-12 12:46:26 +02:00
Vicent Llopis	9a171d5202	refactor	2022-04-12 12:45:07 +02:00
Vicent Llopis	ad3b3c44d6	refactor: replace let for const	2022-04-12 12:44:46 +02:00
Vicent Llopis	1e11191e79	fix: frontTest	2022-04-12 12:32:48 +02:00
Vicent Llopis	5921891161	refactor: updated css	2022-04-12 12:20:36 +02:00