8692 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	bcf566ce28	Merge branch 'dev' into 2499-sale_quantity_zero	2020-10-13 08:11:56 +00:00
Joan Sanchez	f59bb07aaf	Merge pull request 'route ticket fixes' (#407) from 2452-route_tickets into dev ... Reviewed-on: #407 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-10-13 08:11:01 +00:00
Joan Sanchez	72ca310c32	Merge pull request '1447-updateClaim_refactor' (#405) from 1447-updateClaim_refactor into dev ... Reviewed-on: #405 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-10-13 08:09:50 +00:00
Joan Sanchez	7538b1c941	Merge branch 'dev' into 1447-updateClaim_refactor	2020-10-13 06:56:23 +00:00
Joan Sanchez	630e6ffac7	Merge pull request 'fix test' (#410) from 2494repair_xdescribe into dev ... Reviewed-on: #410 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-10-13 06:54:03 +00:00
Bernat Exposito Domenech	8a58017597	fix route/ticket	2020-10-13 08:50:47 +02:00
Joan Sanchez	3f8a675785	2499 - Allow zero quantity	2020-10-13 08:42:13 +02:00
Bernat Exposito Domenech	6e081df4e8	fix test	2020-10-13 08:17:00 +02:00
Carlos Jimenez Ruiz	5493c7437e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random	2020-10-08 16:00:35 +02:00
Carlos Jimenez Ruiz	b6b84cfea7	more tests fixed + small refactors	2020-10-08 16:00:19 +02:00
Joan Sanchez	12b623f5ee	Updated e2e	2020-10-08 14:55:37 +02:00
Joan Sanchez	498841b274	Added unit test	2020-10-08 14:22:55 +02:00
Joan Sanchez	355f95ae40	2473 - Added ticket restore option	2020-10-08 13:42:20 +02:00
Joan Sanchez	69f8687ab3	2471 - Renamed method backTestOnce to launchBackTest	2020-10-07 11:43:13 +02:00
Joan Sanchez	eceb33cce0	2473 - Added restore method	2020-10-07 11:00:26 +02:00
Bernat Exposito Domenech	e5557be3dc	route ticket fixes	2020-10-07 10:52:28 +02:00
Carlos Jimenez Ruiz	61872dec43	Merge pull request '2437 - Changed to "EN" default locale' (#406) from 2437-tests_locale_fix into dev ... Reviewed-on: #406 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-10-07 08:25:27 +00:00
Joan Sanchez	5680e86363	2437 - Changed to "EN" default locale	2020-10-07 08:03:21 +02:00
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