8183 Commits

All Branches

Search

Author	SHA1	Message	Date
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	4d25fe88cf	Added functions to call sql from def	2020-09-25 14:45:00 +02:00
Javi Gallego	c909470f41	merge	2020-09-25 08:10:37 +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
Bernat Exposito Domenech	d4c819ebf7	new models and fixtures	2020-09-23 07:59:10 +02:00
Bernat Exposito Domenech	2b2970bfcd	fix checkInbox	2020-09-23 07:35:45 +02:00
Carlos Jimenez Ruiz	87e4765a1c	fixed ticket-weekly backend unit test	2020-09-22 16:53:47 +02:00
Bernat Exposito Domenech	ce1c4e6f60	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2378-imap	2020-09-22 14:00:52 +02:00
Bernat Exposito Domenech	06f03c6b84	mail models and fix checkInbox	2020-09-22 13:59:00 +02:00
Bernat Exposito	97fb4c5b31	Merge pull request 'Handle ticket without old state' (#384) from 2472-ticket_tracking_fix into dev ... Reviewed-on: #384 Reviewed-by: Bernat Exposito <bernat@verdnatura.es>	2020-09-22 06:37:49 +00:00
Joan Sanchez	89667a18c9	Handle ticket without old state	2020-09-22 07:50:30 +02:00
Joan Sanchez	ae3d00bad1	Added new method	2020-09-22 07:38:20 +02:00
Juan Ferrer	2d1cf566f8	All tests fixed	2020-09-21 22:54:36 +02:00
Juan Ferrer	6abd707a6d	Tests fixed	2020-09-21 19:16:51 +02:00
Juan Ferrer	81de97c071	Merge branch 'dev' into 2381-mariaDB	2020-09-21 18:33:28 +02:00
Juan Ferrer	7464609157	Merge pull request '2177-accountModule' (#373) from 2177-userModule into dev ... Reviewed-on: #373	2020-09-21 15:58:05 +00:00
Juan Ferrer	9528fe0a19	Merge branch 'dev' into 2381-mariaDB	2020-09-21 17:47:55 +02:00
Juan Ferrer	5e056c315f	Tests fixed	2020-09-21 17:46:40 +02:00
Juan Ferrer	1c621cff85	Fixtures fixes	2020-09-21 16:43:17 +02:00
Juan Ferrer	3880e21ce3	Test fixes	2020-09-21 16:09:34 +02:00
Juan Ferrer	2b05827be1	Merge	2020-09-21 14:10:26 +02:00
Juan Ferrer	fc6a19b60d	Merge branch 'dev' into 2177-userModule	2020-09-21 14:10:15 +02:00
Juan Ferrer	b9c526c29c	LDAP user & role syncronization	2020-09-21 13:24:43 +02:00
Carlos Jimenez Ruiz	6e3acfaa29	Merge pull request '1988-autocomplete_autoload' (#381) from 1988-autocomplete_prefetch into dev ... Reviewed-on: #381 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-09-21 09:58:20 +00:00