12075 Commits

All Branches

Search

Author	SHA1	Message	Date
Vicent Llopis	b96d9ea4c2	feat(zone.events): add dialog	2022-05-12 13:53:13 +02:00
Carlos Jimenez Ruiz	526bc99c4f	docker container.run now receives boolean flag isCI	2022-05-12 13:51:31 +02:00
Carlos Jimenez Ruiz	9a47bdafbe	debuging conection errors on CI db	2022-05-12 13:24:19 +02:00
Carlos Jimenez Ruiz	c9794386ba	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into gulp-jasmine_deprecation	2022-05-12 12:39:01 +02:00
Carlos Jimenez Ruiz	0b6e85ea08	Merge branch 'gulp-jasmine_deprecation' of https://gitea.verdnatura.es/verdnatura/salix into gulp-jasmine_deprecation	2022-05-12 12:38:40 +02:00
Carlos Jimenez Ruiz	eee2d26f5e	nodemon removed from CI test run	2022-05-12 12:37:56 +02:00
Joan Sanchez	eb0314e32f	disabled --prefer-offline	2022-05-12 12:20:55 +02:00
Joan Sanchez	558585fd15	Updated redmine link	2022-05-12 12:08:12 +02:00
Vicent Llopis	a18b194219	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday	2022-05-12 12:07:06 +02:00
Carlos Jimenez Ruiz	322d08756d	removed packa-lock for jenkins	2022-05-12 12:00:03 +02:00
Carlos Jimenez Ruiz	cce1d93dde	jasmine reporters config for CI	2022-05-12 11:43:41 +02:00
Javi Gallego	0d63f3c3af	Merge branch 'dev' into 3851-dms_delete	2022-05-12 11:13:34 +02:00
Alex Moreno	5021315ed4	refactor(clientCredit): test and types	2022-05-12 09:47:47 +02:00
Vicent Llopis	6441393249	refactor: pull request changes	2022-05-12 08:47:17 +02:00
Vicent Llopis	568579f461	refactor: pull request changes	2022-05-12 08:27:04 +02:00
Alex Moreno	7f46d4e50a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3409-clientCredit_maxRows	2022-05-12 08:06:39 +02:00
Alex Moreno	af1fa8051f	refactor(clientCredit): refactor test	2022-05-12 08:06:30 +02:00
Vicent Llopis	16fdf982c8	feat(item.itemtype): add frontTest	2022-05-12 07:40:24 +02:00
Carlos Jimenez Ruiz	833addcb75	gulp-jasmine replaced by jasmine	2022-05-11 19:38:10 +02:00
Carlos Jimenez Ruiz	c749438f32	Merge branch 'dev' into 3977-invoiceIn.tax	2022-05-11 13:37:29 +00:00
Carlos Jimenez Ruiz	b0f70c728e	Merge pull request '3940-export_database' (#966) from 3940-export_database into dev ... Reviewed-on: #966 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-05-11 13:10:15 +00:00
Carlos Jimenez Ruiz	442644d3f1	Merge branch 'dev' into 3940-export_database	2022-05-11 12:57:29 +00:00
Vicent Llopis	05b0a5342f	feat(zone.events): new dialog when choose 'exclude'	2022-05-11 14:53:52 +02:00
Vicent Llopis	13a6f1f8c1	feat(item): add section itemType	2022-05-11 14:47:54 +02:00
Joan Sanchez	d39147689d	Merge branch 'dev' into 3771-ticket.expedition	2022-05-11 12:47:33 +00:00
Joan Sanchez	afe4f0ba94	Merge branch 'dev' into 3977-invoiceIn.tax	2022-05-11 12:46:39 +00:00
Vicent Llopis	734f9cb60d	feat(item.itemType): added section itemType	2022-05-11 07:28:17 +02:00
Carlos Jimenez Ruiz	d994daa619	Merge pull request '3327 - Invoicing queue' (#961) from 3327-global_invoicing into dev ... Reviewed-on: #961 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-05-10 13:15:17 +00:00
Carlos Jimenez Ruiz	86ee110b78	Merge branch 'dev' into 3327-global_invoicing	2022-05-10 12:55:00 +00:00
Joan Sanchez	e0c0663e41	Renamed folder	2022-05-10 14:21:41 +02:00
Carlos Jimenez Ruiz	a7b56b3b89	Merge branch 'dev' into 3327-global_invoicing	2022-05-10 12:19:31 +00:00
Carlos Jimenez Ruiz	d7b76835f5	Merge pull request '3752-claim_action' (#939) from 3752-claim_action into dev ... Reviewed-on: #939 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-05-10 12:05:03 +00:00
Carlos Jimenez Ruiz	a47c0dbaea	Merge branch 'dev' into 3752-claim_action	2022-05-10 11:47:14 +00:00
Carlos Jimenez Ruiz	b5dbe67c99	Merge pull request '3887-multi-check' (#942) from 3887-multi-check into dev ... Reviewed-on: #942 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-05-10 11:46:48 +00:00
Carlos Jimenez Ruiz	0e65f382f9	Merge branch 'dev' into 3752-claim_action	2022-05-10 11:36:35 +00:00
Alex Moreno	946f1c1cb5	refactor test	2022-05-10 12:02:50 +02:00
Alex Moreno	5919c42df2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3887-multi-check	2022-05-10 11:42:35 +02:00
Joan Sanchez	7f19f0bebe	Merge pull request '3795-client_administraive' (#938) from 3795-client_administraive into dev ... Reviewed-on: #938	2022-05-10 08:26:38 +00:00
Joan Sanchez	866834d1d7	Merge pull request '3948-invoceIn.index' (#956) from 3948-invoceIn.index into dev ... Reviewed-on: #956 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-05-10 08:25:47 +00:00
Joan Sanchez	aa431bbe0f	Merge branch 'dev' into 3795-client_administraive	2022-05-10 08:24:32 +00:00
Joan Sanchez	4e9396f4f3	Merge pull request '3996-fix(entry_summary): get entry.id' (#968) from 3996-entry_summary into dev ... Reviewed-on: #968 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-05-10 08:22:40 +00:00
Joan Sanchez	93829eeff5	Merge branch 'dev' into 3948-invoceIn.index	2022-05-10 08:22:06 +00:00
Joan Sanchez	c0f2b9dca9	Merge branch 'dev' into 3996-entry_summary	2022-05-10 08:09:31 +00:00
Joan Sanchez	d9c8ed96e4	Added SQL version	2022-05-10 09:46:56 +02:00
Alex Moreno	fde73b35e7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3887-multi-check	2022-05-10 08:57:28 +02:00
Alex Moreno	5bad0592a5	change errors	2022-05-10 08:48:51 +02:00
Alex Moreno	263d0e3f79	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3795-client_administraive	2022-05-10 07:55:41 +02:00
Vicent Llopis	bb4dbb60b8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3752-claim_action	2022-05-10 07:11:26 +02:00
Carlos Jimenez Ruiz	b7e3607ece	Merge pull request '3978-invoiceIn.summary' (#967) from 3978-invoiceIn.summary into dev ... Reviewed-on: #967 Reviewed-by: Joan Sanchez <joan@verdnatura.es> Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-05-09 15:28:59 +00:00
Carlos Jimenez Ruiz	5c55caaec6	Merge branch 'dev' into 3978-invoiceIn.summary	2022-05-09 14:59:32 +00:00