11431 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	13230a2fe9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3563-item_index_producer	2022-02-01 12:40:04 +01:00
Alex Moreno	f90607c8c7	change changes folder name	2022-02-01 12:39:58 +01:00
Alex Moreno	a012740742	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3552-monitor_ticket_state	2022-02-01 12:38:22 +01:00
Alex Moreno	128612a5ab	Merge branch '3552-monitor_ticket_state' of https://gitea.verdnatura.es/verdnatura/salix into 3552-monitor_ticket_state	2022-02-01 12:38:09 +01:00
Alex Moreno	90ed2fdfac	change changes folder name	2022-02-01 12:38:05 +01:00
Carlos Jimenez Ruiz	dca77ba66f	Merge branch 'dev' into 3563-item_index_producer	2022-02-01 11:28:17 +00:00
Carlos Jimenez Ruiz	44119db16b	Merge pull request '3582-feat(icons): import new icons' (#868) from 3582-icons_import into dev ... Reviewed-on: #868 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-02-01 11:26:24 +00:00
Carlos Jimenez Ruiz	bce66899c5	corrected a typo	2022-02-01 12:24:11 +01:00
Joan Sanchez	a8900b06b7	Merge branch 'dev' into 3258-import_buys	2022-02-01 10:57:39 +00:00
Alex Moreno	0eb5d8fe1c	feat(icons): import new icons	2022-02-01 11:48:47 +01:00
Joan Sanchez	67985077e7	fix(loggable): removed private properties from logs	2022-02-01 11:24:04 +01:00
Carlos Jimenez Ruiz	054b112223	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3258-import_buys	2022-02-01 11:06:25 +01:00
Carlos Jimenez Ruiz	9fac23038f	Merge pull request '3052-feat(client_defaulter): section and tests' (#858) from 3052-client_defaulter into dev ... Reviewed-on: #858 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-02-01 09:12:04 +00:00
Carlos Jimenez Ruiz	01e269db6d	Merge branch 'dev' into 3052-client_defaulter	2022-02-01 09:03:47 +00:00
Alex Moreno	56331da20b	feat(item_index): add column producer	2022-02-01 09:37:11 +01:00
Joan Sanchez	3725d5451c	Merge pull request '3430-ticket_step-two ticket without negatives' (#823) from 3430-ticket_step-two into dev ... Reviewed-on: #823 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-02-01 08:34:39 +00:00
Alex Moreno	28734e6ad2	Merge branch '3052-client_defaulter' of https://gitea.verdnatura.es/verdnatura/salix into 3052-client_defaulter	2022-02-01 08:50:01 +01:00
Alex Moreno	368498d763	refactor(defaulter): array request	2022-02-01 08:49:56 +01:00
Alex Moreno	7cf252a8f1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3052-client_defaulter	2022-02-01 07:29:38 +01:00
Alex Moreno	60adb6f37c	translations	2022-02-01 07:21:34 +01:00
Alex Moreno	3d2f661bf0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-02-01 07:20:21 +01:00
Joan Sanchez	1236227bc7	Merge branch 'dev' into 3052-client_defaulter	2022-01-31 16:23:15 +00:00
Joan Sanchez	9878780006	Merge branch 'dev' into 3552-monitor_ticket_state	2022-01-31 15:41:20 +00:00
Joan Sanchez	6a1837ee99	Merge pull request '3567-fix(item_waste): title background dark' (#865) from 3567-item_waste into dev ... Reviewed-on: #865 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-01-31 15:41:09 +00:00
Joan Sanchez	12cfc347c6	Merge branch 'dev' into 3567-item_waste	2022-01-31 15:35:38 +00:00
Alex Moreno	f21cdeb3b6	fix(item_waste): title background dark	2022-01-31 13:27:33 +01:00
Joan Sanchez	d5b8909af4	Merge pull request 'update table companyGroup' (#863) from 3537-table_companyGroup into dev ... Reviewed-on: #863 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-01-31 12:26:55 +00:00
Alex Moreno	78b3df0b6a	feat(monitor_ticket): classColor in db	2022-01-31 13:15:37 +01:00
Joan Sanchez	e618423ef8	Updated unit tests	2022-01-31 12:27:42 +01:00
Alex Moreno	746cbede4b	feat(client_defaulter): move tool-bar up , add column author	2022-01-31 08:17:15 +01:00
Joan Sanchez	d30e8d9bcc	Removed already uploaded changes	2022-01-28 14:50:19 +01:00
Joan Sanchez	26f980998a	renamed folder	2022-01-28 14:49:11 +01:00
Alex Moreno	8936e02cd4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3052-client_defaulter	2022-01-28 14:23:22 +01:00
Joan Sanchez	2480f37e24	Renamed version number (olrder version already applied on production)	2022-01-28 14:20:54 +01:00
Joan Sanchez	78507240ee	Merge branch 'dev' into 3258-import_buys	2022-01-28 13:14:14 +00:00
Joan Sanchez	db54d92b69	Updated E2E	2022-01-28 14:11:26 +01:00
Alex Moreno	6890f7ddcb	refactor(ticket_sale): split e2e, change name backTest	2022-01-28 09:36:32 +01:00
Alex Moreno	19d1ea47a0	feat(ticket_sale): role restriction to create payBack	2022-01-28 09:36:32 +01:00
Joan Sanchez	c5ffc16486	Filters items with last item buy	2022-01-28 09:35:30 +01:00
Vicent Llopis	44e6219df5	update table companyGroup	2022-01-28 09:30:54 +01:00
Alex Moreno	072ac5fb6a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3052-client_defaulter	2022-01-28 09:28:13 +01:00
Alex Moreno	b25ffa8feb	feat(ticket_step-two): redirect to new ticket	2022-01-28 09:15:41 +01:00
Alex Moreno	38100eeda4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-27 15:15:08 +01:00
Carlos Jimenez Ruiz	2748dd649a	Merge pull request '3553-fix(travel_summary): vn-check change value to ng-model' (#862) from 3553-travel_summary into dev ... Reviewed-on: #862 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-01-27 09:45:58 +00:00
Carlos Jimenez Ruiz	abd758721e	Merge branch 'dev' into 3553-travel_summary	2022-01-27 09:36:22 +00:00
Carlos Jimenez Ruiz	09a14fba41	Merge pull request '3549-feat(travel_search-panel): add continent filter' (#860) from 3549-travel_search-panel into dev ... Reviewed-on: #860 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-01-27 09:35:38 +00:00
Carlos Jimenez Ruiz	d4d761150e	Merge branch 'dev' into 3549-travel_search-panel	2022-01-27 08:26:28 +00:00
Alex Moreno	74916c182a	Merge branch '3430-ticket_step-two' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-27 07:22:39 +01:00
Alex Moreno	d0c4099255	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-27 07:20:39 +01:00
Joan Sanchez	879183a4e2	Merge pull request '3536-DbUserSync' (#857) from 3536-DbUserSync into dev ... Reviewed-on: #857 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-01-26 13:52:44 +00:00