8101 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	a3c11b4e00	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2457-fix_regularizeClaim_unit_test	2020-09-29 13:33:34 +02:00
Carlos Jimenez Ruiz	1e55632b94	refactor & fix regularize claim and prices Diff	2020-09-29 13:28:02 +02:00
Carlos Jimenez Ruiz	40abd68734	fix byWarehouse and ticket.filter tests	2020-09-29 13:11:11 +02:00
Juan Ferrer	611aa9cafa	SQL hotfix	2020-09-29 10:55:04 +02:00
Carlos Jimenez Ruiz	0f557c5286	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2457-fix_regularizeClaim_unit_test	2020-09-29 10:45:50 +02:00
Carlos Jimenez Ruiz	d37a362756	Merge pull request 'Enabled back unit tests' (#390) from 2460-back_pool_closed into dev ... Reviewed-on: #390 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-09-29 07:24:24 +00:00
Carlos Jimenez Ruiz	438a4b936e	Merge branch 'dev' into 2460-back_pool_closed	2020-09-29 07:14:49 +00:00
Joan Sanchez	d9b43a8da2	Merge pull request '2381-mariaDB' (#391) from 2381-mariaDB into dev ... Reviewed-on: #391 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-09-29 06:56:47 +00:00
Joan Sanchez	ec2385cd15	Merge branch 'dev' into 2381-mariaDB	2020-09-29 06:53:14 +00:00
Carlos Jimenez Ruiz	6afee4924c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2457-fix_regularizeClaim_unit_test	2020-09-29 08:44:33 +02:00
Joan Sanchez	1dee164f17	Merge branch 'dev' into 2460-back_pool_closed	2020-09-29 05:54:26 +00:00
Joan Sanchez	38351cd331	Merge pull request 'export structure db' (#392) from 2468-export_production into dev ... Reviewed-on: #392 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-09-29 05:51:47 +00:00
Bernat Exposito Domenech	5f9ef3aea3	export structure db	2020-09-29 07:37:29 +02:00
Juan Ferrer	991bece64a	SQL fixes	2020-09-28 21:25:53 +02:00
Joan Sanchez	2c9f664d01	Enabled back unit tests	2020-09-28 14:14:14 +02:00
Juan Ferrer	82de0a30a4	Merge branch 'dev' into 2381-mariaDB	2020-09-28 10:41:16 +02:00
Juan Ferrer	5264b615d4	Optimización docker salix-db	2020-09-28 10:40:50 +02:00
Joan Sanchez	a573fa4bbb	Merge pull request '2381-mariaDB' (#374) from 2381-mariaDB into dev ... Reviewed-on: #374 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-09-28 06:25:28 +00:00
Joan Sanchez	a1349de32d	Merge branch 'dev' into 2381-mariaDB	2020-09-28 06:18:53 +00:00
Joan Sanchez	a5ec5d0d6c	Merge pull request '#2458 - Removed states from pending tickets' (#387) from 2458-ticket_index_pending into dev ... Reviewed-on: #387 Reviewed-by: Bernat Exposito <bernat@verdnatura.es>	2020-09-28 06:18:14 +00:00
Joan Sanchez	3e2f85dbd2	Merge branch 'dev' into 2458-ticket_index_pending	2020-09-28 06:13:39 +00:00
Joan Sanchez	0438171a47	Merge branch 'dev' into 2381-mariaDB	2020-09-28 06:09:48 +00:00
Joan Sanchez	64de4fdf72	Merge pull request 'Update models and fixtures' (#388) from 2442-update_fixtures into dev ... Reviewed-on: #388 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-09-28 06:09:20 +00:00
Joan Sanchez	d8ae9715e5	Merge branch 'dev' into 2381-mariaDB	2020-09-25 12:54:27 +00:00
Bernat Exposito Domenech	790c9bfe6f	update models and fixtures	2020-09-25 14:50:04 +02:00
Joan Sanchez	8bfd462fd1	Merge branch 'dev' into 2458-ticket_index_pending	2020-09-24 13:12:10 +00:00
Joan Sanchez	fbab7aebcf	Removed jenkins success notifications	2020-09-24 15:00:43 +02:00
Joan Sanchez	f1d36df558	#2458 - Removed states from pending tickets	2020-09-24 15:00:00 +02:00
Joan Sanchez	de3c7acb08	Merge branch 'dev' into 2381-mariaDB	2020-09-24 12:30:44 +00:00
Joan Sanchez	69e2597b91	Updated e2e	2020-09-24 14:01:56 +02:00
Javi Gallego	8c6f56a10f	Merge pull request '2366 - Merge event colors' (#386) from 2366-calendar_merge_events into dev ... Reviewed-on: #386 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-09-24 09:45:21 +00:00
Joan Sanchez	d2dbf417f4	Updated to standard color	2020-09-24 11:15:35 +02:00
Joan Sanchez	d18d7670ec	Updated unit tests	2020-09-24 10:44:12 +02:00
Joan Sanchez	53e729eddd	2366 - Merge event colors	2020-09-24 10:14:53 +02:00
Joan Sanchez	164f636f3f	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2020-09-24 09:02:16 +02:00
Joan Sanchez	44e23ca560	Removed sql version	2020-09-24 09:00:42 +02:00
Joan Sanchez	a2e7d57c36	Merge pull request '2449 - Ticket basic show only available zones on autocomplete' (#382) from 2449-ticket_basicData into dev ... Reviewed-on: #382 Reviewed-by: Bernat Exposito <bernat@verdnatura.es>	2020-09-23 13:14:13 +00:00
Joan Sanchez	5265202e65	Merge branch 'dev' into 2449-ticket_basicData	2020-09-23 13:10:32 +00:00
Joan Sanchez	53386e3974	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-09-23 15:08:43 +02:00
Joan Sanchez	e285fdf162	Merge pull request '2378-imap' (#385) from 2378-imap into dev ... Reviewed-on: #385	2020-09-23 12:46:24 +00:00
Joan Sanchez	75ac6ad8d3	Updated unit test	2020-09-23 14:20:41 +02:00
Joan Sanchez	a8589d6945	Autocomplete warehouse on agency selection	2020-09-23 14:13:44 +02:00
Joan Sanchez	c49614b8cf	Merge branch 'dev' into 2449-ticket_basicData	2020-09-23 09:23:09 +00:00
Joan Sanchez	5ec5979a3e	Updated tests	2020-09-23 11:21:25 +02:00
Bernat Exposito Domenech	3f4e5a6c0c	fix checkinbox	2020-09-23 09:31:21 +02:00
Bernat Exposito Domenech	1f23f6c53c	delete import	2020-09-23 09:11:00 +02:00
Bernat Exposito Domenech	eff0641769	delete console.log	2020-09-23 08:13:36 +02:00
Bernat Exposito Domenech	28dc557e2f	fix checkInbox	2020-09-23 08:09:24 +02:00
Bernat Exposito Domenech	ca41b93995	mail models and fix checkInbox	2020-09-23 08:09:06 +02:00
Bernat Exposito Domenech	01574b8967	new method for imap	2020-09-23 08:00:54 +02:00