432 Commits

Author	SHA1	Message	Date
fbsanchez	c386a29b80	Merge remote-tracking branch 'origin/develop' into ent-3105-comportamiento-public_url	2019-07-12 09:38:28 +02:00
Daniel Barbero Martin	bd070b706b	fixed minor error	2019-07-11 12:45:52 +02:00
Alejandro Fraguas	26c606b0d5	Merge branch 'ent-3090-Personalizacion-saml-2' into 'develop' ... Added more parameters to SAML configuration See merge request artica/pandorafms!2506	2019-07-09 13:18:12 +02:00
fbsanchez	eb01e9baaf	public_url with force option	2019-07-02 14:17:53 +02:00
fbsanchez	a6327a16ad	Session expiration ignoring notifications checks	2019-07-01 12:46:09 +02:00
alejandro-campos	3d75e045f9	added new fields to saml configuration and added check to not allow user creation with all group in case an empty value was specified in group name attribute input	2019-06-27 17:42:29 +02:00
alejandro-campos	2a69e3a75e	Merge remote-tracking branch 'origin/develop' into ent-3090-Personalizacion-saml-2	2019-06-26 18:06:23 +02:00
alejandro-campos	f74b32fe3c	Added more parameters to SAML configuration	2019-06-14 10:34:51 +02:00
alejandro-campos	52b1c5e39b	fix bug: path of ssl certificate not being set on general settings	2019-06-13 13:18:17 +02:00
Daniel Rodriguez	81ac4e5bef	Merge branch 'ent-3466-ad-advanced-perms-fixed' into 'develop' ... Ent 3466 ad advanced perms fixed See merge request artica/pandorafms!2194	2019-06-10 16:05:21 +02:00
Alejandro Fraguas	45c58a7c72	Merge branch 'ent-4041-7980-bug-parametro-event_storm_protection' into 'develop' ... Variability event_storm_protection check is added with empty data See merge request artica/pandorafms!2428	2019-06-03 11:58:52 +02:00
Daniel Maya	552467286c	Merge branch 'develop' into 'ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual' ... # Conflicts: # pandora_console/extras/mr/28.sql	2019-05-29 11:10:31 +02:00
Alejandro Gallardo Escobar	f5d5cbf5b8	VC item cache improvements. ... -Added a default value to the configuration. -Changed the control to edit the cache expiration. - Added the cache to more items.	2019-05-28 18:34:07 +02:00
Luis Calvo	5966367f8f	eHorus user level login conf added in user editor	2019-05-28 13:14:42 +02:00
Luis Calvo	588d19102f	Resolve merge conflict	2019-05-27 18:30:24 +02:00
fbsanchez	7b5ae40868	multiple fixes	2019-05-23 10:27:50 +02:00
marcos.alconada	86dabc6476	Variability event_storm_protection check is added with empty data	2019-05-17 11:31:02 +02:00
Luis Calvo	c527435a0e	eHorus user-login settings ... Former-commit-id: e62be3b137ef5583fbd29186a834a86b075e78fb	2019-05-10 15:32:25 +02:00
marcos.alconada	b51cdb93df	arreglo con la vista del formulario ... Former-commit-id: 0d5b5c099ce2e096d8e3d8e1c0a6220baa27e0a9	2019-05-10 15:00:21 +02:00
marcos.alconada	793304b52d	Se habilita el boton de ehorus ... Former-commit-id: aceee670b00ad4291b7f4e9e0a90f17dca3feed9	2019-05-10 12:26:09 +02:00
Luis Calvo	ecce1160e1	Added button to select ehorus conf type and box into user conf	2019-05-09 19:23:18 +02:00
marcos.alconada	e0729b6ca6	Se vuelve a crear la rama ... Former-commit-id: 8ac69d4e1d15be23411faff82dc2bddcfcf7f7b6	2019-05-09 14:59:47 +02:00
Alejandro Gallardo Escobar	2d9b4908de	Visual Console Refactor: the legacy visual console is enabled by default ... Former-commit-id: 0ee821fac4e3665ac0d869e6b772b12014f76a8a	2019-04-25 14:08:55 +02:00
Alejandro Gallardo Escobar	998a66f654	Visual Console Refactor: added a setting to use the legacy VC and added the relation line width setup option to the client ... Former-commit-id: c6bb6ed82a8e84c485ad7270ebb46150fdfcfa8b	2019-04-16 12:23:03 +02:00
manuel	db13ecbb39	Added token save profile user ... Former-commit-id: 442a51cfbe7ac9730e9fd9c2c1ee16b6609e5f6a	2019-04-08 11:55:58 +02:00
daniel	89bbbd2893	Revert "fixed IPAM config" ... This reverts commit 1fe1beb930 [formerly 39b80d2ca41c21a823cdec5948e30109a81eeb2a] Former-commit-id: e11aec8e300db083b7ce04cb74d19de276e69eb7	2019-04-02 14:06:05 +02:00
Alejandro Fraguas	2461f826ce	Merge branch 'ent-3715-Pete_sql_en_mr_del_ipam' into 'develop' ... fixed IPAM config See merge request artica/pandorafms!2274 Former-commit-id: 95786e5f3fa31e8d8c663ee8f3488336c59d9b3c	2019-04-02 09:41:02 +02:00
fermin831	a2f5b8502a	Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 ... Conflicts: pandora_console/include/styles/pandora.css Former-commit-id: ad45f5bd3f07d6ef7a6d8d6a291d6a2fd75fda78	2019-03-26 10:11:13 +01:00
Tatiana Llorente	fe7103ba9c	Changes in header ... Former-commit-id: 3c69b91277f0078a65764c297126d3ebb0dfc11c	2019-03-25 12:41:39 +01:00
fermin831	2711eb59ea	Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 ... Conflicts: pandora_console/extras/mr/26.sql pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql pandora_console/pandoradb.sql Former-commit-id: 29c3e96f3022c59a9252849c2adeb29182476395	2019-03-25 09:20:06 +01:00
Daniel Barbero Martin	1fe1beb930	fixed IPAM config ... Former-commit-id: 39b80d2ca41c21a823cdec5948e30109a81eeb2a	2019-03-20 09:51:15 +01:00
fermin831	b660da6e84	Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 ... Conflicts: pandora_console/extras/mr/26.sql pandora_console/install.php Former-commit-id: dda11929acf5f741e0a4d290b4607ae72683284b	2019-03-14 10:49:16 +01:00
fbsanchez	750c64fbd7	Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2 ... Former-commit-id: 8dd2601c41392e8b252b2a719d16deef5b6398c7	2019-03-13 09:52:00 +01:00
Tatiana Llorente	71afb7a741	New login page ... Former-commit-id: 69408bda61a30561372a5ebaecc08fd04b434611	2019-03-11 10:07:22 +01:00
Fermin	dd8265f65e	Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 ... Former-commit-id: 65d43e483dc23616c44da3b26b73c94cbf10d3fe	2019-03-08 09:02:22 +01:00
fbsanchez	70e4e86cdf	Merge remote-tracking branch 'origin/ent-3432-Nueva-cabecera-y-menu-lateral' into ent-3595-discovery-fase-2 ... Former-commit-id: ba98fda78052b11f7bb579cf84d5e29e557e68ac	2019-03-05 18:58:26 +01:00
Tatiana Llorente	7be5d3e9e0	new header and menu ... Former-commit-id: 7a36ca23fc302cf3b86dca26971ce591107b66e8	2019-03-05 12:54:11 +01:00
fbsanchez	9fd391a819	Make always basic checks while browsing pandora ... Former-commit-id: db93bfdaa674cd2d632153825c37a8a41152dc2c	2019-03-04 14:57:57 +01:00
Tatiana Llorente	36fa0fc41f	new header and menu ... Former-commit-id: d1e8fbd044711f87b75177c32225be7847b60018	2019-03-04 08:39:56 +01:00
Fermin	3f53541c5e	Added switch to enable NTA ... Former-commit-id: 5fc3b47f8f9f92ac643db6a5dbe4fc320ca141f6	2019-03-01 13:38:48 +01:00
Fermin	f0a3f4e9d7	Added configurable purge tnetwork_matrix ... Former-commit-id: e5869879c2445c15c8332d245ac2dd0d3f8de5d5	2019-03-01 12:39:55 +01:00
Tatiana Llorente	34eedc5330	new header and menu ... Former-commit-id: aac70c14548c725b68fa031202e0b8449b725f45	2019-02-26 11:20:17 +01:00
Tatiana Llorente	3e87c8e931	new header and menu ... Former-commit-id: 975b72219cb07e0d4f9b332607e554bd65ea7cc3	2019-02-26 10:43:59 +01:00
daniel	d4c46ec14f	fix minor error ... Former-commit-id: 81b5c41c49a5e121c5ac34c12bfd5b1b7f5f943a	2019-02-26 08:44:50 +01:00
Tatiana Llorente	4c92375a58	new header and menu ... Former-commit-id: 3509107664a968fc358a8bb3e662f27b26b10c73	2019-02-25 12:23:15 +01:00
Tatiana Llorente	526311d1c6	new header and menu ... Former-commit-id: 0748bc89d30e8ae4723026848d493d15d82af9cd	2019-02-25 11:54:46 +01:00
fbsanchez	4abf19722b	Minor fixes and improvements. Discovery ... Former-commit-id: d4410ddca6aec18ed28b7b0236ee16a3e8a6d2b8	2019-02-22 18:12:01 +01:00
Luis Calvo	ea4b24de2e	Fixed ad advanced perms params saving ... Former-commit-id: a0aa5b3b666b0a990dfb087029f6e0bb2929292e	2019-02-22 10:54:17 +01:00
daniel	d116e4742a	add new tocken max events responses ... Former-commit-id: f65e6a478812a913d25fa7b87e9ac2b26b9a5ff4	2019-02-19 12:14:42 +01:00
fbsanchez	8c09b945c7	minor fix changed customer check ... Former-commit-id: f2659c9e7780dcddaa9528b1aa13a4d61026c154	2019-02-19 11:14:48 +01:00