527 Commits

Author SHA1 Message Date
Alejandro Fraguas
f8c9448866 Merge branch 'ent-5955-XSS-System-logfiles' into 'develop'
Solved security issue with system logfiles field

Closes pandora_enterprise#5955

See merge request artica/pandorafms!3289
2020-06-15 10:24:48 +02:00
Alejandro Fraguas
51f61059f4 Merge branch 'ent-5953-XSS-Visual-styles' into 'develop'
Cleaned tags for affected fields

Closes pandora_enterprise#5953

See merge request artica/pandorafms!3285
2020-06-15 09:47:19 +02:00
Jose Gonzalez
251e6669b9 Solved security issue with system logfiles field 2020-06-09 12:51:17 +02:00
Jose Gonzalez
73cf98fc02 Cleaned tags for affected fields 2020-06-09 10:22:54 +02:00
alejandro-campos
ab61cf1fc5 changed console and audit log locations 2020-06-08 10:48:48 +02:00
fbsanchez
fae026a089 Form fixes 2020-05-26 13:48:43 +02:00
Tatiana Llorente
ec57540fb0 Ent 5432 libreria de modulos de pandora integrada en consola 2020-02-27 11:20:24 +01:00
marcos
76ed257287 Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens 2020-01-21 15:23:26 +01:00
alejandro-campos
bb4d3abe6b change config default value 2020-01-17 12:42:29 +01:00
Marcos Alconada
5268c23c7a Merge branch 'develop' into 'ent-4705-encriptado-de-nuevos-tokens'
# Conflicts:
#   pandora_console/include/functions_config.php
2020-01-16 09:23:42 +01:00
alejandro-campos
d9062def99 Merge branch 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' of https://brutus.artica.es:8081/artica/pandorafms into ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024 2020-01-15 16:01:11 +01:00
alejandro-campos
3f26f2ef6f fix bug when deleting custom units and changed default value for byte multiplier 2020-01-15 16:00:33 +01:00
Alejandro Campos
0468c85a4d Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
# Conflicts:
#   pandora_console/godmode/setup/setup_visuals.php
2020-01-07 12:00:27 +01:00
vgilc
c14a462e63 Merge branch '5027-pandora-db-error-history-db-step' into 'develop'
Added control for int values

See merge request artica/pandorafms!2927
2020-01-07 10:20:26 +01:00
Tatiana Llorente
4cd1ca38a4 Ent 5091 unificacion de tamaño de letra en informes 2020-01-07 09:25:31 +01:00
marcos
b551f1a13c update 2019-12-18 17:48:29 +01:00
marcos
f3ddec4436 updates 2019-12-18 15:30:23 +01:00
marcos
91fe85e90e updates2 2019-12-18 15:15:25 +01:00
marcos
35136ada8e minnor error 2019-12-17 15:25:28 +01:00
Tatiana Llorente
eca876212c Ent 5095 visualizacion formato de fechas 2019-12-17 12:15:51 +01:00
alejandro-campos
d30c2c9b3b Fix bug when updating ACL IP list 2019-12-13 14:17:25 +01:00
alejandro-campos
5880bec88a changes in module data formatting when printed across the application and new setup options 2019-12-05 17:41:44 +01:00
Jose Gonzalez
6883240931 Added control for int values 2019-12-02 11:54:39 +01:00
Daniel Barbero Martin
ea2c5bc8c9 Fixed translate 2019-11-27 11:49:20 +01:00
daniel
960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
fbsanchez
83590146b1 Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms 2019-11-13 17:38:24 +01:00
Daniel Rodriguez
073ca73b2a Merge branch 'ent-4670-Cambiar-tamaño-fuente-en-informes' into 'develop'
Added token in visual styles to change the font size in items of reports - #4670

See merge request artica/pandorafms!2798
2019-11-12 18:09:39 +01:00
fbsanchez
72b1fb2b16 Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF
Conflicts:
	pandora_console/include/javascript/pandora.js

	modified:   pandora_console/general/register.php
	modified:   pandora_console/godmode/agentes/configurar_agente.php
	modified:   pandora_console/godmode/agentes/module_manager_editor.php
	new file:   pandora_console/include/ajax/welcome_window.php
	new file:   pandora_console/include/class/WelcomeWindow.class.php
	modified:   pandora_console/include/constants.php
	modified:   pandora_console/include/functions_config.php
	modified:   pandora_console/include/javascript/pandora.js
	new file:   pandora_console/include/styles/new_installation_welcome_window.css
2019-10-30 16:56:44 +01:00
marcos
e725a0185b cambios semi finales 2019-10-24 16:56:13 +02:00
fbsanchez
709f4cac81 WebSocket configuration, quickShell settings, quickShell proxied url compatibility 2019-10-23 19:56:48 +02:00
fbsanchez
6c52462c8c Modular WebSocket engine, added ssh and telnet to quickshell extension 2019-10-21 17:36:26 +02:00
Tatiana Llorente
18679f90e5 Added token in visual styles to change the font size in items of reports - #4670 2019-10-09 16:24:37 +02:00
Daniel Rodriguez
c9cfbf0bf2 Merge branch 'ent-4461-Configuracion-integracion-integria' into 'develop'
Ent 4461 configuracion integracion integria

See merge request artica/pandorafms!2732
2019-09-26 14:34:50 +02:00
alejandro-campos
96622933fc added new section in integria setup to configure different options for event responses and alert created tickets 2019-09-26 13:22:10 +02:00
Tatiana Llorente
5436df5575 Changed the word incident for ticket - #4461 2019-09-25 16:13:37 +02:00
Tatiana Llorente
84ae4a8391 Merge remote-tracking branch 'origin/develop' into ent-4461-Configuracion-integracion-integria
Conflicts:
	pandora_console/extras/mr/32.sql
2019-09-25 10:50:31 +02:00
Daniel Rodriguez
e03e83d565 Merge branch 'ent-4260-Fallo-de-label-de-percentile-en-custom-graph' into 'develop'
fixed error percentil label

See merge request artica/pandorafms!2734
2019-09-25 10:27:13 +02:00
fbsanchez
746f817fe4 Windows: Revisión general Pandora - Discovery 2019-09-24 19:07:55 +02:00
Daniel Barbero Martin
84d1979c9e fixed error percentil label 2019-09-18 11:15:55 +02:00
alejandro-campos
87f8badc18 completed integria setup and incident creation and update 2019-09-17 13:38:17 +02:00
alejandro-campos
93b9c76f58 Merge branch 'develop' into ent-4047-Simplificacion-de-la-configuracion-del-sistema-de-email 2019-09-10 10:50:53 +02:00
alejandro-campos
11cb53582c backup changes 2019-09-02 17:01:41 +02:00
alejandro-campos
28cf43498e lint change 2019-08-05 14:18:23 +02:00
alejandro-campos
9b8e3c540c created integria integration setup 2019-08-05 13:42:01 +02:00
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