Daniel Rodriguez
|
40921b96f9
|
Merge branch 'ent-6791-sesiones-se-borran-con-pandora_db' into 'develop'
Avoid erase ALL sessions from tsessions_php (pandora_db)
See merge request artica/pandorafms!3663
|
2021-01-05 13:43:42 +01:00 |
José González
|
02475d25b6
|
Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
# pandora_console/general/header.php
# pandora_console/general/sap_view.php
|
2020-12-23 06:48:22 +01:00 |
daniel
|
76da033775
|
fix legend pdf chart verticals
|
2020-12-17 16:58:20 +01:00 |
|
José González
|
623b729001
|
Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
# pandora_agents/pc/Win32/pandora_agent.conf
# pandora_agents/win32/bin/pandora_agent.conf
# pandora_console/extensions/realtime_graphs.php
# pandora_console/godmode/snmpconsole/snmp_alert.php
# pandora_console/include/functions_ui.php
# pandora_console/install.php
# pandora_console/operation/agentes/realtime_win.php
|
2020-12-14 11:10:35 +01:00 |
Daniel Maya
|
3a0f14e7bd
|
Ent 5835 9693 error al exportar csv el log view parte 2
|
2020-12-02 10:13:22 +01:00 |
|
Jose Gonzalez
|
649442f794
|
Updated copyrights
|
2020-11-27 13:52:35 +01:00 |
fbsanchez
|
7e61465955
|
Avoid erase ALL sessions from tsessions_php (pandora_db)
|
2020-11-26 18:27:11 +01:00 |
marcos
|
13d90bb1c5
|
Merge remote-tracking branch 'origin/develop' into ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario
|
2020-11-18 12:05:57 +01:00 |
|
daniel
|
3455de7f85
|
fixed visual errors and default values
|
2020-10-07 16:03:52 +02:00 |
|
marcos
|
848f60229a
|
updates on 2FA all users feature
|
2020-10-06 17:02:58 +02:00 |
|
daniel
|
1b5ccfb20a
|
Add new token chart fit to content
|
2020-10-05 17:03:30 +02:00 |
|
fbsanchez
|
b07d24ed25
|
Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos
Conflicts:
pandora_console/include/functions_api.php
pandora_console/operation/events/events.php
|
2020-09-30 18:38:27 +02:00 |
|
marcos
|
f8666adf0f
|
F2 feature
|
2020-09-30 14:20:57 +02:00 |
|
Marcos Alconada
|
85a41af644
|
Ent 5296 anadir boton guardar contrasena en active directory
|
2020-09-18 14:50:50 +02:00 |
|
fbsanchez
|
867fccf604
|
Custom id improvements
|
2020-09-17 14:38:01 +02:00 |
|
Daniel Maya
|
cbc8630dfc
|
Ent 5206 9287 exportacion a csv con dato con muchos decimales y miles trae confusion
|
2020-07-23 16:52:24 +02:00 |
alejandro-campos
|
63df6c15f0
|
Merge branch 'develop' into ent-6030-Problema-codificacion
|
2020-07-01 16:39:00 +02:00 |
|
Alejandro Campos
|
a81e4acbb7
|
Merge branch 'develop' into 'ent-6030-Problema-de-codificacion'
# Conflicts:
# pandora_console/include/functions_config.php
|
2020-06-23 09:28:21 +02:00 |
|
alejandro-campos
|
6520ad2107
|
Added setup token
|
2020-06-23 09:21:15 +02:00 |
|
alejandro-campos
|
1243968872
|
Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion
|
2020-06-19 12:12:52 +02:00 |
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 |