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

24687 Commits

Author SHA1 Message Date
Jimmy Olano 3ec710a62f Merge branch 'ent-9229-revisar-comportamiento-de-widgets-con-elementos-eliminados' into 'develop' 
fixed widget dashboards no exist item pandora_enterprise#9229

pandora_enterprise#9229

See merge request artica/pandorafms!5035
 2022-09-28 00:55:09 +00:00
artica dde27c12b1 Auto-updated build strings. 2022-09-28 01:00:20 +02:00
Alejandro Campos b11839dde5 Merge branch 'develop' into 'ent-9395-14081-Politicas-no-aplican-a-grupos-secundarios' 
# Conflicts:
#   pandora_console/extras/mr/57.sql
 2022-09-27 15:24:28 +00:00
alejandro.campos@artica.es 9c7e70c7de changes to mr 2022-09-27 17:19:10 +02:00
Jimmy Olano 09e934395f Merge branch 'ent-9456-giss-errores-en-la-paginacion-vista-alertas-metaconsola' into 'develop' 
Fix alerts list pagination on meta

Ref: pandora_enterprise#9456

See merge request artica/pandorafms!5095
 2022-09-27 14:10:47 +00:00
Jimmy Olano 84d9b272c3 Merge branch 'ent-8217-Comando-Accion-de-alerta-para-enviar-informes' into 'develop' 
implemented alert commands and actions to send report by email

Ref pandora_enterprise#8217

See merge request artica/pandorafms!5104
 2022-09-27 12:26:24 +00:00
Daniel Rodriguez 5047f8afb9 Merge branch 'ent-8659-mostrar-nombre-completo-del-usuario-para-el-owner-de-un-evento' into 'develop' 
Ent 8659 mostrar nombre completo del usuario para el owner de un evento

See merge request artica/pandorafms!5114
 2022-09-27 10:50:17 +00:00
artica fa8386194c Auto-updated build strings. 2022-09-27 01:00:21 +02:00
Diego Muñoz-Reja 10d97c8cfa Merge branch 'ent-9420-eventos-agrupados-no-muestran-estado-del-ultimo-elemento' into 'develop' 
fixed group by order event_get_all pandora_enterprise#9420

See merge request artica/pandorafms!5106
 2022-09-26 15:16:15 +00:00
Diego Muñoz-Reja 4fba7077ec Merge branch 'ent-9255-error-en-notificacion-consola-php-8-y-mysql-8' into 'develop' 
Ent 9255 error en notificacion consola php 8 y mysql 8

See merge request artica/pandorafms!5081
 2022-09-26 13:07:50 +00:00
Diego Muñoz-Reja aea77db9e9 Merge branch 'ent-7827-Control-de-acceso-a-la-consola-por-IP' into 'develop' 
Ent 7827 control de acceso a la consola por ip

See merge request artica/pandorafms!5098
 2022-09-26 11:03:52 +00:00
Calvo 2a4176085f Fix alerts meta datatables 2022-09-26 09:22:19 +02:00
artica 4db9df6df5 Auto-updated build strings. 2022-09-26 01:00:17 +02:00
artica d7b4a8f248 Auto-updated build strings. 2022-09-25 01:00:16 +02:00
artica 0ce954af56 Auto-updated build strings. 2022-09-24 01:00:20 +02:00
Daniel Rodriguez 30edbc81ad Merge branch 'ent-8934-Macros-para-fechas-en-custom-SQL' into 'develop' 
Added new macros

See merge request artica/pandorafms!5103
 2022-09-23 13:03:48 +00:00
alejandro.campos@artica.es 520a820625 Merge branch 'ent-8217-Comando-Accion-de-alerta-para-enviar-informes' of brutus.artica.es:artica/pandorafms into ent-8217-Comando-Accion-de-alerta-para-enviar-informes 2022-09-23 13:00:40 +02:00
alejandro.campos@artica.es 23bb4d0750 minor fix 2022-09-23 13:00:28 +02:00
alejandro.campos@artica.es 8918682f67 minor change 2022-09-23 09:58:37 +02:00
alejandro.campos@artica.es 3bf2dd1b5c make policy group application optional 2022-09-23 09:50:38 +02:00
Alejandro Campos 9301b46f41 Merge branch 'develop' into 'ent-8217-Comando-Accion-de-alerta-para-enviar-informes' 
# Conflicts:
#   pandora_console/extras/mr/57.sql
 2022-09-23 06:41:57 +00:00
artica d14bcfe616 Auto-updated build strings. 2022-09-23 01:00:20 +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
Daniel Rodriguez fdd6699de5 Merge branch 'ent-9453-limites-tmodule_group-alcanzados-por-cliente' into 'develop' 
fixed size field bbdd tmodule_group pandora_enterprise#9453

See merge request artica/pandorafms!5102
 2022-09-22 13:37:07 +00:00
Daniel Rodriguez ad2425c429 Merge branch 'ent-9269-update-manager-offline-en-la-763-da-errores-aunque-actualiza' into 'develop' 
Ent 9269 update manager offline en la 763 da errores aunque actualiza

See merge request artica/pandorafms!5088
 2022-09-22 13:34:16 +00:00
Daniel Maya 28b31d730d #9269 Fixed deny 2022-09-22 11:44:41 +02:00
Daniel Rodriguez c34328583f Merge branch 'ent-8978-derivado-del-trabajo-q-a-762-lts-servidores-pfms-sin-dig-ni-y-o-whois-instalado' into 'develop' 
Ent 8978 derivado del trabajo q a 762 lts servidores pfms sin dig ni y o whois instalado

See merge request artica/pandorafms!5082
 2022-09-22 08:21:41 +00:00
Daniel Barbero 3a43ee73bc fixed widget groups status pandora_enterprise#9229 2022-09-22 08:39:12 +02:00
artica b7bef2dd58 Auto-updated build strings. 2022-09-22 01:00:20 +02:00
Daniel Barbero f688f73c46 fixed historical database pandora_enterprise#8791 2022-09-21 16:35:36 +02:00
alejandro.campos@artica.es 2af04e7de0 change mr 2022-09-21 15:22:20 +02:00
Daniel Barbero 2343456113 Merge remote-tracking branch 'origin/develop' into ent-8791-base-de-datos-historica-para-metaconsola 2022-09-21 15:20:30 +02:00
Diego Muñoz-Reja 158af125e2 Merge branch 'ent-9169-13822-error-al-actualizar-informacion-de-un-agente-cuando-se-llega-al-maximo-de-agentes-de-un' into 'develop' 
Fix edit agent when group limit is reached

See merge request artica/pandorafms!5085
 2022-09-21 11:03:29 +00:00
Daniel Rodriguez c556c7f505 Merge branch 'ent-9149-13753-incidencia-validacion-password-mail' into 'develop' 
Ent 9149 13753 incidencia validacion password mail

See merge request artica/pandorafms!5108
 2022-09-21 08:10:09 +00:00
Daniel Rodriguez d83ada6164 Merge branch 'ent-9262-13905-time-in-warning-status-informacion-incorrecta-en-informe' into 'develop' 
fixed error massive services operations pandora_enterprise#9262

See merge request artica/pandorafms!5099
 2022-09-21 08:08:39 +00:00
artica 4c8b907590 Auto-updated build strings. 2022-09-21 01:00:21 +02:00
Daniel Barbero b16c07fdb5 Merge remote-tracking branch 'origin/develop' into ent-9229-revisar-comportamiento-de-widgets-con-elementos-eliminados 
Conflicts:
	pandora_console/include/lib/Dashboard/Widgets/system_group_status.php
 2022-09-20 09:10:25 +02:00
Daniel Barbero 9ac30676b6 fixed widget alert pandora_enterprise#9229 2022-09-20 09:05:13 +02:00
artica 9ae4c7ca67 Auto-updated build strings. 2022-09-20 01:00:21 +02:00
Daniel Rodriguez fcca522b0c Merge branch 'ent-9384-14062-Problema-con-onclick-en-la-lista-de-eventos' into 'develop' 
fixed 500

See merge request artica/pandorafms!5109
 2022-09-19 14:47:44 +00:00
alejandro.campos@artica.es 2852311cf7 fix 2022-09-19 15:42:43 +02:00
Daniel Rodriguez 9877d59ea6 Merge branch 'ent-9159-Discovery-Host-devices-Meter-lista-de-host-por-nombre' into 'develop' 
changed help tip

See merge request artica/pandorafms!5083
 2022-09-19 13:05:22 +00:00
Diego Muñoz-Reja 0e06996336 Merge branch 'ent-9342-modo-slide-no-amplia-los-dashboard-en-caso-de-consolas-visuales' into 'develop' 
fixed visual errors slides dashboards#9342

See merge request artica/pandorafms!5097
 2022-09-19 12:32:11 +00:00
Calvo 522607ec40 Fix meta alert datatable order 2022-09-19 14:14:33 +02:00
Calvo bc5f1d0dce Fix meta alert datatable order 2022-09-19 14:02:50 +02:00
Daniel Rodriguez 2657faab02 Merge branch 'ent-9381-13999-problema-tactical-view-causada-por-grupos-secundarios' into 'develop' 
Fix tactical view counting duplicated modules when agents have secodary groups

See merge request artica/pandorafms!5100
 2022-09-19 11:10:16 +00:00
Diego Muñoz-Reja c9712a81db Merge branch 'ent-8281-anadir-recursion-de-grupos-a-los-widgets-de-dashboards-groups-status-y-general-group-status' into 'develop' 
Added recursion to widgets Group status and General group status

See merge request artica/pandorafms!5094
 2022-09-19 10:47:26 +00:00
Diego Muñoz-Reja ffc51471d0 Merge branch 'ent-9444-no-existe-la-consola-sonora-en-acl-enterprise' into 'develop' 
Ent 9444 no existe la consola sonora en acl enterprise

See merge request artica/pandorafms!5086
 2022-09-19 10:07:44 +00:00
artica 4a7b11395a Auto-updated build strings. 2022-09-19 01:00:16 +02:00
artica 30395efe83 Auto-updated build strings. 2022-09-18 01:00:16 +02:00