8351 Commits

All Branches

Search

Author	SHA1	Message	Date
Juan Ferrer	b6da896fe7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-11-02 10:11:34 +01:00
Javi Gallego	e81aef74a9	Merge pull request '2510-client-address-create-test' (#418) from 2510-client-address-create-test into dev ... Reviewed-on: #418 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2020-11-02 07:53:53 +00:00
Juan Ferrer	e25a978b19	Merge branch 'test' into dev	2020-11-01 00:03:05 +01:00
Juan Ferrer	414c0931eb	Sync management UI	2020-10-31 22:56:02 +01:00
Juan Ferrer	9b4f8697b9	User sync fixes	2020-10-31 21:16:58 +01:00
Juan Ferrer	937d5beefe	User sync fixes	2020-10-31 03:13:17 +01:00
Juan Ferrer	f39fa33b83	User sync fixes	2020-10-31 02:53:48 +01:00
Juan Ferrer	7763bcc1ef	User sync fixes	2020-10-31 02:34:59 +01:00
Juan Ferrer	fdf6df4ca8	User sync fixes	2020-10-31 02:31:42 +01:00
Juan Ferrer	1354d4647d	User sync fixes	2020-10-31 02:26:17 +01:00
Juan Ferrer	ae94d7db02	User sync fixes	2020-10-31 02:20:43 +01:00
Juan Ferrer	ba5a03c980	User sync fixes	2020-10-31 01:56:19 +01:00
Juan Ferrer	15c39f93ca	root id changed from 0 to 100 due to loopback join problems with id 0	2020-10-31 01:10:32 +01:00
Juan Ferrer	76ee8e6f38	User sync fixes	2020-10-31 00:40:54 +01:00
Juan Ferrer	9b563cb8bf	LDAP & Samba synchronization fixes + improvements	2020-10-31 00:02:27 +01:00
Javi Gallego	a472ce9a81	Merge branch 'dev' into 2510-client-address-create-test	2020-10-30 17:24:20 +01:00
Javi Gallego	0825042a6b	Merge pull request 'refactor to catch wrong strings' (#430) from 2482-fix_worker_timeControl_e2e into dev ... Reviewed-on: #430 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-10-30 16:23:13 +00:00
Carlos Jimenez Ruiz	22ba4a3e4f	removed code obfuscation	2020-10-30 17:09:11 +01:00
Javi Gallego	b50ae7b8ca	testback arreglados	2020-10-30 15:50:59 +01:00
Javi Gallego	71fe677a7e	fix getSummary	2020-10-30 10:50:13 +01:00
Carlos Jimenez Ruiz	28ec55b440	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2482-fix_worker_timeControl_e2e	2020-10-30 10:46:05 +01:00
Carlos Jimenez Ruiz	2f6b3f0c38	small refactors for #2512	2020-10-30 10:45:55 +01:00
Javi Gallego	59cbe276f4	Merge branch 'dev' into 2510-client-address-create-test	2020-10-30 10:08:38 +01:00
Javi Gallego	31b5a140d4	test completados	2020-10-30 10:07:53 +01:00
Carlos Jimenez Ruiz	66a77f395f	Merge pull request 'create section supplier log' (#429) from 2539-supplier_log into dev ... Reviewed-on: #429 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-10-30 08:29:45 +00:00
Javi Gallego	3fdc9c315d	Merge branch 'dev' into 2510-client-address-create-test	2020-10-30 08:40:47 +01:00
Bernat Exposito	ea8d9e70b0	supplier log	2020-10-30 08:27:02 +01:00
Bernat Exposito	e75c275409	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2539-supplier_log	2020-10-30 08:24:13 +01:00
Joan Sanchez	ea6fc0fb04	Card fix	2020-10-30 07:23:21 +01:00
Carlos Jimenez Ruiz	25684ec521	small refactor timeControl index	2020-10-29 13:46:36 +01:00
Bernat Exposito	792b689b58	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2539-supplier_log	2020-10-29 13:40:21 +01:00
Bernat Exposito	bda8875584	Merge pull request 'ticket component refactor' (#435) from 2522-ticket_component into dev ... Reviewed-on: #435 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-10-29 10:52:05 +00:00
Carlos Jimenez Ruiz	26c9e54663	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2482-fix_worker_timeControl_e2e	2020-10-29 11:47:34 +01:00
Bernat Exposito Domenech	ea03d06a62	Merge branch '2522-ticket_component' of https://gitea.verdnatura.es/verdnatura/salix into 2522-ticket_component	2020-10-29 11:46:57 +01:00
Bernat Exposito Domenech	551feed16f	fix translate	2020-10-29 11:46:37 +01:00
Bernat Exposito	361af260a5	Merge branch 'dev' into 2522-ticket_component	2020-10-29 10:11:24 +00:00
Bernat Exposito Domenech	42d16d0258	ticket component refactor	2020-10-29 11:09:58 +01:00
Joan Sanchez	a76b2525d4	Merge pull request '2502-supplier_summary + e2e' (#425) from 2502-supplier_summary into dev ... Reviewed-on: #425 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-10-29 07:55:36 +00:00
Bernat Exposito Domenech	403d4b9118	cr changes	2020-10-29 08:17:06 +01:00
Bernat Exposito Domenech	a4bf680ca5	Merge branch '2502-supplier_summary' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary	2020-10-29 08:07:58 +01:00
Bernat Exposito Domenech	a5e6f99b1f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary	2020-10-29 08:06:50 +01:00
Bernat Exposito Domenech	8d32f93512	cr changes	2020-10-29 07:44:04 +01:00
Carlos Jimenez Ruiz	b3d9b1b6c8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2482-fix_worker_timeControl_e2e	2020-10-28 14:04:06 +01:00
Carlos Jimenez Ruiz	a4c57d7618	e2e path for supplier summary and descriptor	2020-10-28 12:29:50 +01:00
Carlos Jimenez Ruiz	687d9618cb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary	2020-10-28 12:16:18 +01:00
Bernat Exposito	cb1d48734a	Merge pull request '2532 - Added icon taxDataChecked on ticket index' (#431) from 2532-icon_taxDataChecked into dev ... Reviewed-on: #431 Reviewed-by: Bernat Exposito <bernat@verdnatura.es>	2020-10-28 10:21:03 +00:00
Joan Sanchez	109fcb3ca4	2532 - Added icon taxDataChecked on ticket index	2020-10-28 09:57:39 +01:00
Carlos Jimenez Ruiz	8dba3fbb93	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary	2020-10-28 09:54:26 +01:00
Carlos Jimenez Ruiz	5bfa6e5939	refactor to catch wrong strings	2020-10-28 09:44:33 +01:00
Bernat Exposito Domenech	77bc1b562e	create section supplier log	2020-10-28 09:08:27 +01:00