8224 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	641eb93282	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random	2020-10-06 14:50:23 +02:00
Bernat Exposito Domenech	fcebbb68b6	delete comments	2020-10-06 14:46:58 +02:00
Carlos Jimenez Ruiz	253711d911	Merge pull request 'Removed test exclusion' (#404) from 2043-claim_action_test into dev ... Reviewed-on: #404 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-10-06 12:46:16 +00:00
Joan Sanchez	a29d92718a	Updated description	2020-10-06 14:37:03 +02:00
Joan Sanchez	254c391138	Removed test exclusion	2020-10-06 14:32:24 +02:00
Bernat Exposito Domenech	3d39467613	refactor updateclaim	2020-10-06 14:23:35 +02:00
Bernat Exposito Domenech	134d1c4385	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1447-updateClaim_refactor	2020-10-06 13:06:43 +02:00
Bernat Exposito Domenech	e6b4d21ddb	refactor updateClaim	2020-10-06 10:57:40 +02:00
Carlos Jimenez Ruiz	0dbdb5103e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random	2020-10-06 10:16:08 +02:00
Carlos Jimenez Ruiz	89fb980f14	some tests fixed	2020-10-06 10:15:27 +02:00
Joan Sanchez	2856fa63fc	Added ACL for module account	2020-10-06 09:50:40 +02:00
Carlos Jimenez Ruiz	6fd6ff5e7d	Merge pull request '2486 - Changed date filter' (#402) from 2486-last_entries_fix into dev ... Reviewed-on: #402 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-10-06 07:18:44 +00:00
Carlos Jimenez Ruiz	b8b32d20bc	Merge branch 'dev' into 2486-last_entries_fix	2020-10-06 07:12:00 +00:00
Carlos Jimenez Ruiz	e44989eb1d	Merge pull request 'Added focus directive to searchbar' (#401) from 2492-index_refactor into dev ... Reviewed-on: #401 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-10-06 07:11:28 +00:00
Joan Sanchez	6ecf595a11	2486 - Changed date filter	2020-10-06 08:52:11 +02:00
Joan Sanchez	085df7119f	Merge branch 'dev' into 2492-index_refactor	2020-10-06 06:51:11 +00:00
Joan Sanchez	530a4026f8	Merge pull request 'Added client consumption campaign filter' (#400) from 2481-campaign_filter into dev ... Reviewed-on: #400 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-10-06 06:50:24 +00:00
Joan Sanchez	0b8d8a4f65	Added focus directive to searchbar	2020-10-06 08:17:12 +02:00
Joan Sanchez	f00828cf57	Merge branch 'dev' into 2481-campaign_filter	2020-10-06 05:44:11 +00:00
Carlos Jimenez Ruiz	27d2c59358	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random	2020-10-05 16:09:30 +02:00
Joan Sanchez	4e9cc69ec0	Merge pull request 'ticket service' (#383) from 2443 into dev ... Reviewed-on: #383 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-10-05 13:02:09 +00:00
Javi Gallego	77064d85a0	Merge branch 'dev' into 2443	2020-10-05 12:54:02 +00:00
Joan Sanchez	91fa3e2aec	Updated description	2020-10-05 14:47:42 +02:00
Joan Sanchez	71e29e747a	Requested changes	2020-10-05 14:45:39 +02:00
Javi Gallego	531bb6da25	quito copy	2020-10-05 13:22:56 +02:00
Joan Sanchez	86025b88e3	Merge branch 'dev' into 2481-campaign_filter	2020-10-05 09:36:02 +00:00
Carlos Jimenez Ruiz	8b89bcfa11	Merge pull request 'Enabled loggable on calendar model' (#396) from 2451-loggable_calendar into dev ... Reviewed-on: #396 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-10-05 09:34:16 +00:00
Joan Sanchez	cef2dc982f	Updated sql	2020-10-05 10:47:12 +02:00
Joan Sanchez	d0ece57219	Updated unit test	2020-10-05 10:09:36 +02:00
Carlos Jimenez Ruiz	9c139b49aa	enabled jasme random + indentations	2020-10-05 10:04:00 +02:00
Joan Sanchez	ad11a92c87	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2451-loggable_calendar	2020-10-05 10:02:44 +02:00
Javi Gallego	e95514d967	reorganiza campos	2020-10-05 09:24:49 +02:00
Carlos Jimenez Ruiz	eb731eb648	Merge pull request '2455 - Validate socialname when isDataChecked is changed' (#395) from 2455-socialname_validation into dev ... Reviewed-on: #395 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-10-05 07:24:05 +00:00
Javi Gallego	0294d2a845	Merge branch 'dev' into 2443	2020-10-05 09:07:00 +02:00
Joan Sanchez	0dee59f66f	Merge branch 'dev' into 2455-socialname_validation	2020-10-05 07:01:11 +00:00
Joan Sanchez	4abef978a5	Merge pull request 'refactor getComponentSum' (#399) from 2489-ticket_component into dev ... Reviewed-on: #399 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-10-05 06:58:01 +00:00
Joan Sanchez	e3b14405b7	Added unit tests	2020-10-05 08:50:07 +02:00
Joan Sanchez	cdde4d95d7	Added filter	2020-10-05 07:53:03 +02:00
Bernat Exposito Domenech	161313ad15	refactor getComponentSum	2020-10-02 13:58:48 +02:00
Joan Sanchez	420dfdbdff	Send notification by email	2020-10-02 12:23:48 +02:00
Carlos Jimenez Ruiz	9dca47be97	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2484-Sale_priceDifference_test_fails	2020-10-02 09:40:15 +02:00
Carlos Jimenez Ruiz	ff3b75267a	priceDifference test fix + refactor	2020-10-02 09:39:58 +02:00
Javi Gallego	8b4d25d506	test arreglados windows	2020-10-02 08:57:51 +02:00
Javi Gallego	8d1709ea51	Merge branch 'dev' into 2443	2020-10-01 16:46:33 +02:00
Javi Gallego	78e22df177	test e2e de expense ok	2020-10-01 16:45:28 +02:00
Carlos Jimenez Ruiz	a2232f659b	Merge pull request 'refactor selectors' (#398) from 2485-refactor_selectors into dev ... Reviewed-on: #398 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-10-01 09:28:26 +00:00
Bernat Exposito Domenech	5807f6ca38	delete selector	2020-10-01 11:21:23 +02:00
Bernat Exposito Domenech	a7bee03b3d	refactor selectors	2020-10-01 10:38:02 +02:00
Juan Ferrer	6d8b13423f	SQL hotfix	2020-10-01 10:02:19 +02:00
Bernat Exposito Domenech	998bfcd4df	refactor selectors	2020-10-01 08:53:31 +02:00