Jonathan
|
d323ab7fe5
|
Timezonevisual correction and fix conflict
|
2023-03-15 09:06:07 +01:00 |
|
Daniel Cebrian
|
d315d4cda7
|
#10633 added token for control check conexion interval
|
2023-03-14 13:16:58 +01:00 |
|
Daniel Cebrian
|
ca78f069f6
|
#9624 added support sflow
|
2023-03-10 17:12:38 +01:00 |
|
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 |
|