tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
29,175 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

29175 Commits

Author SHA1 Message Date
Calvo 4dd931f277 Modules percentage threshold form 2021-11-24 11:33:36 +01:00
Daniel Rodriguez 07ef0477af Merge branch 'ent-8301-Fallo-pandora-manage-pl' into 'develop' 
minor fix

See merge request artica/pandorafms!4548
 2021-11-24 10:23:48 +00:00
Daniel Barbero Martin 7a5f91188b Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 
Conflicts:
	pandora_console/include/functions_html.php
 2021-11-24 08:39:03 +01:00
artica 98f4bfbcc1 Auto-updated build strings. 2021-11-24 01:00:10 +01:00
fbsanchez ce00d59f00 ncm2 2021-11-23 20:31:04 +01:00
Daniel Barbero Martin e0fec6470d minor fix 2021-11-23 18:04:34 +01:00
alejandro.campos@artica.es 08ad73e34e minor fix 2021-11-23 16:29:25 +01:00
fbsanchez cbbfc337df errata fix 2021-11-23 14:33:59 +01:00
fbsanchez a9485024f4 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-11-23 14:29:23 +01:00
fbsanchez 41dcc95d5a db changes 2021-11-23 14:26:11 +01:00
Daniel Barbero Martin aae0016191 fix chart area 2021-11-23 13:14:56 +01:00
Jose Gonzalez 67f893f4ee Fixed issue 2021-11-23 12:50:12 +01:00
Daniel Maya 90739088f4 #8228 Added centralised node check 2021-11-23 12:43:07 +01:00
Jose Gonzalez 98f519958c Fix merge 2021-11-23 12:25:58 +01:00
Daniel Maya c5588197f2 #8224 centralised node check added 2021-11-23 12:23:27 +01:00
artica fee6b06a2a Updated version and build strings. 2021-11-23 11:28:02 +01:00
Daniel Maya 3bfce928c4 #7902 Fixed add and update actions 2021-11-23 10:53:51 +01:00
Daniel Rodriguez c096a244f6 Merge branch 'ent-8254-filtro-select-grupo-no-busca-sin-permiso-directo' into 'develop' 
Select group search filter working on groups' child

See merge request artica/pandorafms!4535
 2021-11-23 09:38:22 +00:00
Daniel Barbero Martin 02b3bc8574 fix setup centraliced active directory 2021-11-23 10:18:20 +01:00
artica feedce5a61 Auto-updated build strings. 2021-11-23 01:00:18 +01:00
Daniel Rodriguez 688ec5f7f9 Merge branch 'ent-8144-no-se-muestra-completo-el-nombre-de-dashboard-consola-visual-favorito-en-el-menu' into 'develop' 
Ent 8144 no se muestra completo el nombre de dashboard consola visual favorito en el menu

See merge request artica/pandorafms!4505
 2021-11-22 15:54:05 +00:00
Daniel Rodriguez 3efcc8d30f Merge branch 'ent-8146-Bug-en-filtro-de-eventos-de-widget-List-of-latest-events-Dashboard' into 'develop' 
Ent 8146 bug en filtro de eventos de widget list of latest events dashboard

See merge request artica/pandorafms!4504
 2021-11-22 15:53:16 +00:00
Daniel Rodriguez eadb06e131 Merge branch 'ent-7787-Debug-modulos-web-corta-urls' into 'develop' 
Changes in debug_content db field

Closes pandora_enterprise#7787

See merge request artica/pandorafms!4324
 2021-11-22 15:51:34 +00:00
Daniel Rodriguez 60f051dca3 Merge branch 'ent-8143-Buscador-general-Errores-en-resultados-mostrados' into 'develop' 
fixed general search

See merge request artica/pandorafms!4520
 2021-11-22 15:50:25 +00:00
Daniel Maya 131be55be1 #8277 Fixed search by agent 2021-11-22 16:18:53 +01:00
Daniel Rodriguez 13835582d2 Merge branch 'ent-8210-Bug-al-editar-acciones-ya-configuradas-en-alertas' into 'develop' 
Ent 8210 bug al editar acciones ya configuradas en alertas

See merge request artica/pandorafms!4536
 2021-11-22 12:44:51 +00:00
José González b8d884008b Merge branch 'develop' into 'ent-7787-Debug-modulos-web-corta-urls' 
# Conflicts:
#   pandora_console/extras/mr/51.sql
 2021-11-22 11:44:06 +00:00
Jose Gonzalez 3f395f03dc Added sql file 2021-11-22 12:33:31 +01:00
Jose Gonzalez 192237a452 Merge remote-tracking branch 'origin' into ent-7787-Debug-modulos-web-corta-urls 2021-11-22 12:31:24 +01:00
Daniel Maya 79757d8f4b #8278 Fixed graph 2021-11-22 12:12:32 +01:00
artica 9474dc9dbc Auto-updated build strings. 2021-11-22 01:00:09 +01:00
artica 956e1bd82b Auto-updated build strings. 2021-11-21 01:00:14 +01:00
artica 1751faac96 Auto-updated build strings. 2021-11-20 01:00:24 +01:00
Daniel Maya 8ce1a500ea #8210 Fixed dialog 2021-11-19 14:57:56 +01:00
Daniel Rodriguez 7f534a1a14 Merge branch 'ent-8191-Error-linkado-elementos-mapa-de-servicio' into 'develop' 
Ent 8191 error linkado elementos mapa de servicio

See merge request artica/pandorafms!4537
 2021-11-19 13:04:23 +00:00
fbsanchez 3e90bb6490 minor change 2021-11-19 11:53:59 +01:00
Daniel Rodriguez 7b4c6848f7 Merge branch 'ent-8200-Conteos-incorrectos-vista-tactica-en-FENIX-en-v758' into 'develop' 
fixed several counts

See merge request artica/pandorafms!4527
 2021-11-19 10:46:15 +00:00
Daniel Maya c3295b8fd2 #8191 Fixed filter 2021-11-19 11:38:11 +01:00
fbsanchez 582cb9a082 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-11-19 10:51:46 +01:00
Daniel Rodriguez a70661d94e Merge branch 'ent-7503-Calendarios-para-dias-especiales' into 'develop' 
special days template alerts

See merge request artica/pandorafms!4508
 2021-11-19 09:43:36 +00:00
Alejandro Campos 6d1e7121d7 Merge branch 'develop' into 'ent-8200-Conteos-incorrectos-vista-tactica-en-FENIX-en-v758' 
# Conflicts:
#   pandora_console/include/functions_tactical.php
 2021-11-19 08:59:19 +00:00
Daniel Barbero Martin e3183d9e56 fix add file list delete files 2021-11-19 08:19:45 +01:00
Daniel Barbero Martin c52e11e91a Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-11-19 08:12:22 +01:00
artica f18a575b2a Auto-updated build strings. 2021-11-19 01:00:17 +01:00
fbsanchez 8346a233be NCM2 2021-11-18 19:49:57 +01:00
Daniel Rodriguez 04e6e875b3 Merge branch 'ent-8168-La-vista-tactica-de-metaconsola-no-tiene-en-cuenta-el-propagate-ACL-de-los-grupos' into 'develop' 
fixed propagation in agents count

See merge request artica/pandorafms!4529
 2021-11-18 16:36:55 +00:00
Daniel Rodriguez c47c5e34f6 Merge branch 'ent-7892-problemas-en-despliegue-de-agentes-rcmd_timeout' into 'develop' 
set deployment_timeout per agent installation file

See merge request artica/pandorafms!4516
 2021-11-18 16:34:12 +00:00
Daniel Rodriguez 69a7af2131 Merge branch 'ent-7799-jerarquia-fiels-alertas-snmp-accion-comando-de-alerta' into 'develop' 
Ent 7799 jerarquia fiels alertas snmp accion comando de alerta

See merge request artica/pandorafms!4322
 2021-11-18 16:31:50 +00:00
alejandro.campos@artica.es 649fc829fb included secondary groups in tactical count queries 2021-11-18 13:35:27 +01:00
Daniel Rodriguez 5b49372e99 Merge branch 'ent-7839-revision-acl-enterprise-parte-2-introduccion-opciones' into 'develop' 
Added missing sec related to GET params  to ACL enterprise

See merge request artica/pandorafms!4345
 2021-11-18 12:14:12 +00:00