Daniel Maya
|
d6dec9d869
|
#9893 merge develop
|
2023-03-09 16:27:47 +01:00 |
Daniel Maya
|
41e255ff9c
|
#9893 added token legacy_database_ha
|
2023-03-09 16:24:43 +01:00 |
Jonathan
|
cf29caedcd
|
Conflict solution
|
2023-03-06 11:04:05 +01:00 |
daniel
|
a758528968
|
Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
pandora_console/extras/mr/62.sql
pandora_console/include/class/AuditLog.class.php
|
2023-03-01 07:56:32 +01:00 |
Daniel Cebrian
|
c8096d73b2
|
Merge branch 'develop' into ent-10253-enforcement-de-opciones-de-configuracion-aviso-en-consola
|
2023-02-27 14:58:25 +01:00 |
Daniel Cebrian
|
2c7d00a664
|
Merge branch 'develop' into ent-10253-enforcement-de-opciones-de-configuracion-aviso-en-consola
|
2023-02-27 13:34:41 +01:00 |
daniel
|
7602ec1bd8
|
fixed styles
|
2023-02-24 14:28:07 +01:00 |
Diego Muñoz-Reja
|
76dbaf46d2
|
Merge branch 'ent-10321-limitacion-del-numero-de-eventos' into 'develop'
Ent 10321 limitacion del numero de eventos
See merge request artica/pandorafms!5513
|
2023-02-24 10:06:44 +00:00 |
Pablo Aragon
|
c30dda1718
|
10519-New login meta
|
2023-02-23 10:32:01 +01:00 |
daniel
|
8230ae616b
|
Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
pandora_console/godmode/users/user_list.php
pandora_console/operation/events/events.php
|
2023-02-22 12:35:34 +01:00 |
Pablo Aragon
|
a065f4578c
|
9662-Login
|
2023-02-17 12:52:13 +01:00 |
alejandro.campos@artica.es
|
d2856e09bd
|
implemented per-task sap license
|
2023-02-13 13:39:20 +01:00 |
Daniel Cebrian
|
5927687ad3
|
#10321 create token events_per_query for limit consult sql
|
2023-02-07 09:49:46 +01:00 |
Daniel Cebrian
|
aedf6986b3
|
#10253 added console alert for control variables performance
|
2023-02-06 15:22:39 +01:00 |
Jose Gonzalez
|
e3b2ec529a
|
Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-03 14:16:47 +01:00 |
Jonathan
|
181b172ba8
|
#9529 timezone visual for new users
|
2023-02-01 16:57:48 +01:00 |
Jose Gonzalez
|
0363a90e1f
|
Resolve merge issues
|
2023-01-31 17:35:44 +01:00 |
Daniel Maya
|
eec87fb2de
|
#10032 Fixed config_update_value
|
2023-01-16 14:51:27 +01:00 |
Jose Gonzalez
|
7277e026cd
|
New notifications and added autoclose function
|
2023-01-13 14:23:48 +01:00 |
Calvo
|
867749f9d3
|
Fix inventory blacklist open
|
2022-12-29 18:14:43 +01:00 |
daniel
|
47c503bdab
|
Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3
|
2022-12-21 12:51:18 +01:00 |
Rafael Ameijeiras
|
5934b02738
|
Merge branch 'ent-10018-Vulnerabilidad-CSRF' into 'develop'
fixed csrf
See merge request artica/pandorafms!5336
|
2022-12-20 17:50:21 +00:00 |
Daniel Barbero
|
3e071a7d33
|
remove phamtomjs pandora_enterprise#9554
|
2022-12-20 12:23:18 +01:00 |
alejandro.campos@artica.es
|
4ca220a3a7
|
Merge remote-tracking branch 'origin/develop' into ent-9323-14021-Modificar-el-display-de-valores-de-informe
|
2022-12-15 15:28:58 +01:00 |
alejandro.campos@artica.es
|
26426c1bfa
|
fixed csrf
|
2022-12-15 08:48:48 +01:00 |
Calvo
|
0eb33032ac
|
Changed eHorus default port
|
2022-12-12 16:17:11 +01:00 |
Daniel Rodriguez
|
a1210c7814
|
Merge branch 'ent-9233-Historico-de-traps' into 'develop'
implemented trap history
See merge request artica/pandorafms!5116
|
2022-10-31 11:17:29 +00:00 |
alejandro.campos@artica.es
|
8d611a8e7f
|
implemented float formatting and option in reports to change visualization format
|
2022-10-26 18:25:16 +02:00 |
Calvo
|
c2c62bae06
|
Fix missing parameter meta on event comments ajax
|
2022-10-25 17:37:56 +02:00 |
Daniel Rodriguez
|
8aa6ea8bc8
|
Merge branch 'ent-8725-lista-exclusion-passwords' into 'develop'
Added exclude words for passwords control
See merge request artica/pandorafms!5174
|
2022-10-25 09:07:08 +00:00 |
Diego Muñoz-Reja
|
92c01531e7
|
Merge branch 'ent-9178-13815-alto-tiempo-de-espera-si-el-ldap-secundario-no-esta-disponible' into 'develop'
Added ldap timeout
See merge request artica/pandorafms!5134
|
2022-10-21 10:28:04 +00:00 |
José González
|
984fd10897
|
Merge branch 'develop' into 'ent-8725-lista-exclusion-passwords'
# Conflicts:
# pandora_console/include/auth/mysql.php
|
2022-10-21 06:44:47 +00:00 |
Daniel Rodriguez
|
6657052308
|
Merge branch 'ent-9631-14357-No-se-guardan-los-cambios-en-Setup-Setup-Performance' into 'develop'
fix several problems in history db settings
See merge request artica/pandorafms!5188
|
2022-10-20 07:21:11 +00:00 |
Daniel Barbero
|
f219a9678f
|
minor fix 500 pandora_enterprise#9667
|
2022-10-18 16:55:05 +02:00 |
Diego Muñoz-Reja
|
dfb5776f68
|
Merge branch 'ent-8648-Improvement-for-SNMP-interface-wizard' into 'develop'
Added default definition for SNMP Interface Wizard
See merge request artica/pandorafms!5168
|
2022-10-18 09:25:17 +00:00 |
Daniel Rodriguez
|
59c53b4668
|
Merge branch 'ent-9492-activar-password-policy-no-funciona' into 'develop'
Fix issue
See merge request artica/pandorafms!5175
|
2022-10-14 10:11:45 +00:00 |
alejandro.campos@artica.es
|
07232d82d1
|
fix several problems in history db settings
|
2022-10-11 13:26:25 +02:00 |
José González
|
b5dcc5936e
|
Fix issue
|
2022-10-04 16:59:25 +02:00 |
José González
|
dc38e2e50a
|
Added exclude words for passwords control
|
2022-10-04 15:12:12 +02:00 |
José González
|
9f800df034
|
Added default definition for SNMP Interface Wizard
|
2022-10-03 12:41:55 +02:00 |
Daniel Barbero
|
4609e141ee
|
remove tmetaconsole_history token pandora_enterprise#9579
|
2022-09-30 08:56:19 +02:00 |
Diego Muñoz-Reja
|
0488eec00d
|
Merge branch 'ent-8775-separar-el-paso-a-historico-de-datos-y-string' into 'develop'
Historic string data separated from normal data
See merge request artica/pandorafms!5093
|
2022-09-22 14:47:23 +00:00 |
Calvo
|
8a1740ddfb
|
Added ldap timeout
|
2022-09-22 09:27:08 +02:00 |
alejandro.campos@artica.es
|
9343796ae1
|
traps history
|
2022-09-20 17:26:29 +02:00 |
alejandro.campos@artica.es
|
91194155b0
|
implemented trap history
|
2022-09-19 11:15:22 +02:00 |
edu.corral
|
544f337181
|
ent 9154 SSL MySQL console connection
|
2022-09-14 14:19:47 +02:00 |
Calvo
|
30ffe64abc
|
Historic string data separated from normal data
|
2022-09-08 14:28:36 +02:00 |
José González
|
b07a161fb0
|
Added control for clean not initialized modules
|
2022-08-29 14:05:30 +02:00 |
Daniel Barbero Martin
|
01ba149280
|
new console report pandora_enterprise#6367
|
2022-07-08 13:40:20 +02:00 |
Jimmy Olano
|
c074cd81bf
|
Merge branch 'ent-8302-Añadir-opción-de-mostrar-solo-grupos-con-datos-en-Group-view' into 'develop'
Ent 8302 añadir opción de mostrar solo grupos con datos en group view
https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/8302
See merge request artica/pandorafms!4949
|
2022-07-01 10:47:27 +00:00 |
Daniel Barbero Martin
|
5328cf21c6
|
Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado
|
2022-06-23 12:51:35 +02:00 |
Daniel Barbero Martin
|
58f5f4e9f1
|
refactor events meta pandora_enterprise#9086
|
2022-06-23 12:47:49 +02:00 |
Daniel Rodriguez
|
4dd65c20a8
|
Merge branch 'ent-8888-consolas-visuales-vista-movil-carrefour' into 'develop'
Not orientation CV view mobile pandora_enterprise#8888
See merge request artica/pandorafms!4886
|
2022-06-23 10:07:24 +00:00 |
Daniel Rodriguez
|
c0509a798c
|
Merge branch 'ent-8812-Adaptar-WMI-Wizard-nuevo-binario-pandorawmic' into 'develop'
Added control for WMI binary
See merge request artica/pandorafms!4884
|
2022-06-23 08:27:11 +00:00 |
Daniel Barbero Martin
|
f3e645146d
|
Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado
|
2022-06-17 08:51:11 +02:00 |
Daniel Rodriguez
|
52cfd6b70a
|
Merge branch 'ent-8899-13499-problema-con-conexion-db-hist-con-contrasenas-con-caracteres-especiales' into 'develop'
Ent 8899 13499 problema con conexion db hist con contrasenas con caracteres especiales
See merge request artica/pandorafms!4852
|
2022-06-16 09:03:28 +00:00 |
Daniel Barbero Martin
|
acef7e6f63
|
Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado
Conflicts:
pandora_console/operation/events/events.php
|
2022-06-16 09:09:49 +02:00 |
Daniel Maya
|
bb01bfe2d0
|
#8899 Fixed history_db_enabled 2
|
2022-06-16 08:44:09 +02:00 |
Daniel Barbero Martin
|
1bf1a83782
|
Merge remote-tracking branch 'origin/develop' into ent-8888-consolas-visuales-vista-movil-carrefour
|
2022-06-15 19:49:31 +02:00 |
Daniel Maya
|
9a7e0e3228
|
#8899 Fixed history_db_enabled
|
2022-06-15 09:37:29 +02:00 |
Daniel Barbero Martin
|
90013603a7
|
refactor events meta pandora_enterprise#9086
|
2022-06-13 17:06:09 +02:00 |
José González
|
dc599d2fe6
|
Handle header image with community and with black theme
|
2022-06-13 16:23:37 +02:00 |
Daniel Maya
|
3e15ed2726
|
#8302 Added show_empty_groups
|
2022-06-08 15:17:03 +02:00 |
José González
|
ad00594b1d
|
Set new brand and color for header
|
2022-06-07 17:21:13 +02:00 |
Daniel Rodriguez
|
1aefe527c4
|
Merge branch 'ent-8723-13221-giss-optimizacion-en-el-despliegue-del-tree-view-de-servicios' into 'develop'
allow disable counters on mc environments
See merge request artica/pandorafms!4814
|
2022-06-02 09:08:08 +00:00 |
Daniel Maya
|
fd026f8cd6
|
#9023 Fixed implode with php8
|
2022-05-24 12:32:08 +02:00 |
Daniel Barbero Martin
|
ececdca0b6
|
Not orientation CV view mobile pandora_enterprise#8888
|
2022-05-13 12:54:58 +02:00 |
José González
|
4589a7c298
|
Added control for WMI binary
|
2022-05-12 18:31:24 +02:00 |
Daniel Maya
|
9fd4e415c0
|
#8899 Fixed pass with entities
|
2022-05-03 10:02:39 +02:00 |
fbsanchez
|
8a221f10b0
|
allow disable counters on mc environments
|
2022-04-11 14:20:17 +02:00 |
Calvo
|
7f0dbb0476
|
Added secondary ldap server
|
2022-03-29 18:59:27 +02:00 |
fbsanchez
|
c5d648677d
|
phantomjs cache auto-clean
|
2022-02-28 18:56:01 +01:00 |
fbsanchez
|
4d912fbd34
|
Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
|
2022-02-11 09:55:34 +01:00 |
Jose Gonzalez
|
351b8fcb97
|
Fix
|
2022-02-07 16:44:21 +01:00 |
Jose Gonzalez
|
2d715827d2
|
Improve doc
|
2022-02-04 13:18:34 +01:00 |
Jose Gonzalez
|
46b115dc3c
|
Audit log improved in Config
|
2022-02-04 13:13:42 +01:00 |
Jose Gonzalez
|
bc6175abad
|
Added audit log in massive operations
|
2022-02-02 12:45:43 +01:00 |
Jose Gonzalez
|
d81e6571ec
|
New audit logs
|
2022-02-01 13:39:18 +01:00 |
fbsanchez
|
7ebd6a5f74
|
php8 warnings cleanup
|
2022-01-11 12:08:41 +01:00 |
Calvo
|
1fca24d8dc
|
Fix ldap auth php function passwords with special chars
|
2021-10-05 18:00:16 +02:00 |
Jose Gonzalez
|
dee81f85ba
|
Fix LDAP authentication failure
|
2021-09-23 11:22:15 +02:00 |
Daniel Rodriguez
|
7673e40613
|
Merge branch 'ent-7737-Pandora-recien-instalado-mensaje-de-advertencia-de-fuente-por-defecto-no-definida' into 'develop'
fixed font reference
See merge request artica/pandorafms!4238
|
2021-08-11 07:12:13 +00:00 |
Daniel Rodriguez
|
ac23d187a1
|
Merge branch 'ent-7589-black-theme-y-edicion-de-usuario' into 'develop'
fixed visual error
See merge request artica/pandorafms!4212
|
2021-08-10 12:23:42 +00:00 |
alejandro.campos@artica.es
|
7fa398b027
|
fixed font reference
|
2021-06-28 11:25:22 +02:00 |
fbsanchez
|
4c2ac234b8
|
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
Conflicts:
pandora_console/extras/mr/48.sql
pandora_console/godmode/servers/plugin.php
|
2021-06-24 14:37:30 +02:00 |
Luis
|
497ecb329d
|
Changed new wiki url on helps
|
2021-06-24 12:31:15 +00:00 |
Daniel Barbero Martin
|
c6877154fb
|
Wip command center, Plugins in meta
|
2021-06-16 17:26:19 +02:00 |
marcos
|
493047ae40
|
fixed visual error
|
2021-06-16 14:17:45 +02:00 |
Daniel Barbero Martin
|
64dd4f2c2b
|
Wip command center, Plugins in meta
|
2021-06-15 17:24:03 +02:00 |
fbsanchez
|
94cd4c96dd
|
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
Conflicts:
pandora_console/extras/delete_files/delete_files.txt
pandora_console/include/javascript/pandora_ui.js
|
2021-06-14 17:37:01 +02:00 |
Daniel Rodriguez
|
08011d60b2
|
Merge branch 'ent-7122-nuevo-update-manager' into 'develop'
Embebed UMC in Pandora FMS
See merge request artica/pandorafms!3894
|
2021-06-14 11:56:43 +00:00 |
fbsanchez
|
cdad04f9cd
|
Update the DB schema when upgrading from RPMs.
Call updateMR.php to update the database schema when manually upgrading
from RPM packages.
|
2021-06-14 11:56:42 +00:00 |
Daniel Barbero Martin
|
a7c1c49636
|
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
|
2021-06-14 08:42:31 +02:00 |
Daniel Rodriguez
|
0adcf5aac2
|
Merge branch 'ent-7671-cambiar-enlaces-a-documentacion' into 'develop'
add new link documentation
See merge request artica/pandorafms!4188
|
2021-06-11 08:32:06 +00:00 |
fbsanchez
|
ae34209f52
|
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
|
2021-06-10 21:45:50 +02:00 |
Marcos Alconada
|
665efa4fb7
|
Ent 7519 cambio de fuentes en la consola a nivel global
|
2021-06-10 08:19:11 +00:00 |
Daniel Rodriguez
|
4b819360ff
|
Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'"
This reverts merge request !4132
|
2021-06-09 18:09:43 +02:00 |
marcos
|
50282dccf4
|
add new link documentation
|
2021-06-09 16:55:25 +02:00 |
Marcos Alconada
|
2334eccd01
|
Ent 7519 cambio de fuentes en la consola a nivel global
|
2021-06-09 13:59:28 +00:00 |
Daniel Barbero Martin
|
3a947d31bd
|
Wip command center, collections merge
|
2021-06-07 17:58:36 +02:00 |
Daniel Maya
|
e6713c2f2c
|
#6917 metaconsole config changes
|
2021-05-25 09:58:18 +00:00 |
Alejandro Campos
|
caaa9c407e
|
Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario'
# Conflicts:
# pandora_console/extras/mr/47.sql
# pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
|
2021-05-13 11:39:24 +00:00 |
Daniel Rodriguez
|
6faefa4afa
|
Merge branch 'ent-7096-unificar-nombres-downtimes' into 'develop'
Unified downtime name as scheduled downtime
See merge request artica/pandorafms!4001
|
2021-05-10 09:06:43 +00:00 |
Luis
|
f25256a74d
|
Unified downtime name as scheduled downtime
|
2021-05-10 09:06:43 +00:00 |
alejandro.campos@artica.es
|
fdeaf52912
|
implemented user level authentication for integria ims integration
|
2021-05-07 14:29:29 +02:00 |
Luis
|
bec8085ca5
|
Added path check to config attachment store
|
2021-04-27 10:34:08 +00:00 |
alejandro.campos@artica.es
|
3ff361977c
|
check page load protocol on integria setup
|
2021-04-16 10:02:34 +02:00 |
Daniel Maya
|
9bbac06771
|
Ent 7161 cambiar opciones de skin en usuarios y grupos
|
2021-04-13 09:26:50 +00:00 |
fbsanchez
|
fdc4133eaa
|
Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
|
2021-03-25 10:20:02 +01:00 |
Daniel Maya
|
79914082e9
|
Ent 6850 quitar nta
|
2021-03-24 15:16:13 +00:00 |
fbsanchez
|
0179e89740
|
Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
|
2021-03-24 13:16:54 +01:00 |
fbsanchez
|
c3232b0f2a
|
Merge remote-tracking branch 'origin/develop' into ent-7010-nexcon-mejoras-widget-de-eventos
Conflicts:
pandora_console/include/class/ConsoleSupervisor.php
|
2021-03-24 09:55:31 +01:00 |
fbsanchez
|
e0aa1bfc68
|
Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
Conflicts:
pandora_console/extras/delete_files/delete_files.txt
pandora_console/include/styles/pandora.css
|
2021-03-22 09:59:07 +01:00 |
Daniel Rodriguez
|
128fabfde2
|
Merge branch 'ent-6648-Añadir-agentes-a-politicas-metaconsola' into 'develop'
Ent 6648 añadir agentes a politicas metaconsola
See merge request artica/pandorafms!3912
|
2021-03-16 16:41:13 +00:00 |
alejandro.campos@artica.es
|
8dc6ec4e07
|
added setup token
|
2021-03-16 09:21:16 +01:00 |
alejandro.campos@artica.es
|
3c5bf3eeef
|
Merge remote-tracking branch 'origin/develop' into temp
|
2021-03-12 12:34:47 +01:00 |
fbsanchez
|
95f1a2abcc
|
Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
Conflicts:
pandora_console/extras/delete_files/delete_files.txt
|
2021-03-11 10:00:17 +01:00 |
Daniel Rodriguez
|
988b6826fc
|
Merge branch 'ent-7065-Modificar-scripts-generacion-y-publicacion-de-paquetes' into 'develop'
cambio de dominio
See merge request artica/pandorafms!3888
|
2021-03-10 16:01:39 +00:00 |
Daniel Rodriguez
|
d992b818b2
|
Merge branch 'ent-6568-setup-module-library-no-se-puede-borrar-usuario' into 'develop'
Module library user pass let empty user/pass
See merge request artica/pandorafms!3706
|
2021-03-09 16:34:22 +00:00 |
Daniel Barbero Martin
|
219ca1914d
|
cambio de dominio
|
2021-03-09 16:02:05 +01:00 |
Alejandro Campos
|
d4054f15d0
|
Merge branch 'develop' into 'ent-6898-Integracion-de-Integria-en-Pandora'
# Conflicts:
# pandora_console/extras/mr/45.sql
# pandora_console/godmode/alerts/configure_alert_action.php
# pandora_server/util/pandora_db.pl
|
2021-03-04 10:27:07 +00:00 |
alejandro.campos@artica.es
|
901d12fec0
|
Integration with Integria
|
2021-02-25 13:18:04 +01:00 |
fbsanchez
|
4b0f96126b
|
minor fix
|
2021-02-22 12:25:24 +01:00 |
fbsanchez
|
85f37a91de
|
Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
Conflicts:
pandora_console/include/functions_ui.php
|
2021-02-22 12:01:29 +01:00 |
fbsanchez
|
0be3e0ab90
|
Event widget and some notices fixed
|
2021-02-10 15:00:23 +01:00 |
Daniel Rodriguez
|
df603853ad
|
Merge branch 'ent-7020-movidas-del-wizard' into 'develop'
Ent 7020 movidas del wizard
See merge request artica/pandorafms!3816
|
2021-02-09 16:25:06 +01:00 |
Marcos Alconada
|
92cf6c60cb
|
Ent 7015 establecer las nuevas consolas visuales habilitadas por defecto en instalaciones nuevas
|
2021-02-05 15:08:58 +01:00 |
fbsanchez
|
5a38d31a6d
|
Wizard (interfaces) backend performance improved
|
2021-02-04 13:11:47 +01:00 |
fbsanchez
|
712079c30e
|
RC1 #4755
|
2021-02-01 15:00:54 +01:00 |
fbsanchez
|
dbc48852aa
|
Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
Conflicts:
pandora_console/extras/delete_files/delete_files.txt
|
2021-01-28 16:12:47 +01:00 |
fbsanchez
|
9fc3856f83
|
WIP historical database automaintenance + minor fixes
|
2021-01-28 13:20:36 +01:00 |
fbsanchez
|
c7706a6bfa
|
WIP Historical database manager (setup)
|
2021-01-27 12:35:37 +01:00 |
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 |
Luis Calvo
|
d0b119c05f
|
Module library user pass let empty user/pass
|
2020-12-10 10:49:13 +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 |