12750 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	2a758fd12a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4045-incoterms_authorization	2022-06-22 11:38:01 +02:00
Joan Sanchez	cffff93cdc	Updated translations	2022-06-22 10:57:28 +02:00
Joan Sanchez	b2d57f4022	Added portuguese translation	2022-06-22 09:25:21 +02:00
Joan Sanchez	f7d64e89ab	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-22 08:59:06 +02:00
Joan Sanchez	004f1390fc	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-06-22 08:58:51 +02:00
Alex Moreno	e4d71cfa15	Merge pull request '2240-salix-version-refresh' (#1001) from 2240-salix-version-refresh into dev	2022-06-22 05:21:10 +00:00
Alex Moreno	6d6b248202	Merge branch 'dev' into 2240-salix-version-refresh	2022-06-22 05:09:48 +00:00
Carlos Jimenez Ruiz	5aec6b4ac1	Merge pull request '4088-feat(client_web-access): add email field' (#1009) from 4088-client_web-access_email into dev ... Reviewed-on: #1009 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-06-21 12:45:05 +00:00
Joan Sanchez	e7bf88c703	Fix order	2022-06-21 14:26:34 +02:00
Alex Moreno	20f886e933	change email and text info in email field	2022-06-21 13:58:47 +02:00
Alex Moreno	17fd50ee33	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4088-client_web-access_email	2022-06-21 13:40:24 +02:00
Joan Sanchez	b41cf7a569	Merge pull request '4208-ticket.refund' (#1000) from 4208-ticket.refund into test ... Reviewed-on: #1000	2022-06-21 11:31:43 +00:00
Alex Moreno	c43b32bee7	Merge branch 'dev' into 2240-salix-version-refresh	2022-06-21 11:30:44 +00:00
Joan Sanchez	1d8fa517e7	Merge pull request 'refactor(ticket.create): display only active addresses' (#1008) from 4138-ticket_create_address_isActive into dev ... Reviewed-on: #1008 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-06-21 11:29:56 +00:00
Alex Moreno	0a1786d073	Merge branch 'dev' into 2240-salix-version-refresh	2022-06-21 11:25:29 +00:00
Joan Sanchez	7ce11c10f5	Merge branch 'test' into 4208-ticket.refund	2022-06-21 11:18:05 +00:00
Joan Sanchez	9751514b10	Merge branch 'dev' into 4138-ticket_create_address_isActive	2022-06-21 11:15:33 +00:00
Joan Sanchez	01ac06d845	Merge pull request 'fix: show correct payedHolidays' (#1007) from 4231-worker.calendar_payedHolidays into dev ... Reviewed-on: #1007 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-06-21 11:15:08 +00:00
Joan Sanchez	e5b1bfeec2	Merge branch 'dev' into 4231-worker.calendar_payedHolidays	2022-06-21 10:59:46 +00:00
Vicent Llopis	ec852b898c	fix: check if services exists	2022-06-21 12:44:19 +02:00
Joan Sanchez	16d677528a	FIX: Sort by id as last field	2022-06-21 12:18:33 +02:00
Carlos Jimenez Ruiz	e4883afc7c	removed deprecated procedures and functions from Account	2022-06-20 13:28:49 +02:00
Alex Moreno	0bc105f981	Merge branch 'dev' into 2240-salix-version-refresh	2022-06-20 09:21:29 +00:00
Joan Sanchez	4118f52a2f	Force master update	2022-06-20 10:04:00 +02:00
Alex Moreno	4c1cdd66af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4088-client_web-access_email	2022-06-20 07:31:55 +02:00
Alex Moreno	8d9d64b49d	feat(client_web-access): add email field	2022-06-20 07:31:10 +02:00
Juan Ferrer	504fb9acea	docker-compose fixes	2022-06-19 13:17:48 +02:00
Carlos Jimenez Ruiz	e034a17fe2	Merge branch 'dev' into 4138-ticket_create_address_isActive	2022-06-17 14:44:41 +00:00
Carlos Jimenez Ruiz	9fd812dd0f	Merge pull request 'Rename db changes folder' (#1006) from renameDbChangesFolder into dev ... Reviewed-on: #1006 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-06-17 14:43:40 +00:00
Carlos Jimenez Ruiz	7c580da6b8	refactor(ticket.create): display only active addresses	2022-06-17 16:42:59 +02:00
Carlos Jimenez Ruiz	a5f53364c3	Merge branch 'dev' into renameDbChangesFolder	2022-06-17 11:30:33 +00:00
Carlos Jimenez Ruiz	b5cea244ca	Merge pull request '4081-ticket.setDeleted' (#1003) from 4081-ticket.setDeleted into dev ... Reviewed-on: #1003 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-06-17 11:30:23 +00:00
Carlos Jimenez Ruiz	ba0975fe0e	Merge branch 'dev' into 4081-ticket.setDeleted	2022-06-17 10:48:18 +00:00
Carlos Jimenez Ruiz	f12d686c33	Merge pull request '4197-entry.lastetBuysFilter' (#1002) from 4197-entry.lastetBuysFilter into dev ... Reviewed-on: #1002 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-06-17 10:48:01 +00:00
Carlos Jimenez Ruiz	b75053dd56	Merge pull request 'fix(changes): prevent sql errors when test to master' (#1005) from TEST_preventSQLerror into test ... Reviewed-on: #1005 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-06-17 10:47:29 +00:00
Carlos Jimenez Ruiz	c22e36ff1e	Merge branch 'dev' into 4081-ticket.setDeleted	2022-06-17 10:45:13 +00:00
Vicent Llopis	6611fcb40e	fix: show correct payedHolidays	2022-06-17 12:34:33 +02:00
Joan Sanchez	9250cc78ff	Merge branch 'dev' into 4197-entry.lastetBuysFilter	2022-06-17 10:34:00 +00:00
Joan Sanchez	7d6d53b7db	Merge pull request '2808-e2e_account_descriptor' (#979) from 2808-e2e_account_descriptor into dev ... Reviewed-on: #979 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-06-17 10:32:15 +00:00
Alex Moreno	e775c67b1b	rename	2022-06-17 09:44:59 +02:00
Alex Moreno	fd6b688382	fix(changes): prevent sql errors when test to master	2022-06-17 09:40:33 +02:00
Carlos Jimenez Ruiz	9e70b8c5fd	web access user changed to a non-worker	2022-06-17 09:28:54 +02:00
Vicent Llopis	44e95a00c3	refactor: delete duplicated code	2022-06-17 08:54:40 +02:00
Vicent Llopis	1bd4b02a62	refactor: code	2022-06-17 08:18:23 +02:00
Carlos Jimenez Ruiz	1e504b6b9f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2808-e2e_account_descriptor	2022-06-16 16:46:33 +02:00
Joan Sanchez	4374fc6f0f	Merge pull request '4185-secure_client_pass_changes' (#1004) from 4185-secure_client_pass_changes into dev ... Reviewed-on: #1004 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-06-16 14:35:51 +00:00
Carlos Jimenez Ruiz	e151e35f7e	replaced isActive by active as per it's model and updated original data in controller	2022-06-16 16:25:21 +02:00
Carlos Jimenez Ruiz	869c9caf98	corrected a typo	2022-06-16 14:53:35 +02:00
Carlos Jimenez Ruiz	5dd91a0be9	excluded web access e2e path for another task to fix it.	2022-06-16 12:08:58 +02:00
Carlos Jimenez Ruiz	aa6ec3f770	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4185-secure_client_pass_changes	2022-06-16 12:01:05 +02:00