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

31285 Commits

Author SHA1 Message Date
Diego Muñoz-Reja 099bfe2e61 Merge branch 'ent-9395-14081-Politicas-no-aplican-a-grupos-secundarios' into 'develop' 
make policy group application optional

See merge request artica/pandorafms!5138
 2022-09-27 16:16:36 +00: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
Diego Muñoz-Reja 35ee6936d6 Merge branch 'ent-9124-paradas-planificadas-no-se-borran-de-db' into 'develop' 
Delete old data from tplanned_downtime.

See merge request artica/pandorafms!5091
 2022-09-27 14:11:39 +00: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
Daniel Rodriguez c10f020b1b Merge branch 'ent-7146-parametros-para-el-control-de-ficheros-de-buffer-xml' into 'develop' 
Add support for temporal_max_size and temporal_max_files.

See merge request artica/pandorafms!5110
 2022-09-27 14:02:48 +00:00
Daniel Barbero 9e2c6edfeb new group by events for extraid pandora_enterprise#9425 2022-09-27 15:08:09 +02: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
Daniel Rodriguez 5d0a40f790 Merge branch 'ent-8359-casque-de-web-server-cuando-no-hay-memoria' into 'develop' 
Improved error detection when calling curl.

See merge request artica/pandorafms!5146
 2022-09-27 10:49:41 +00:00
José González 1ae6267acc Fix issue with agent_alias 2022-09-27 11:14:18 +02:00
Daniel Barbero 7bedb8ecf7 Merge remote-tracking branch 'origin/develop' into ent-9423-respuestas-de-evento-en-metaconsola-usan-configuracion-de-nodo 2022-09-27 09:52:24 +02:00
Daniel Barbero fbce8b7533 fixed response events pandora_enterprise#9423 2022-09-27 09:51:37 +02: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
alejandro.campos@artica.es 7e85bea0f4 added change to allow inventory modules to load script from a path 2022-09-26 15:30:31 +02: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 bf5a5e16dc Fix agent edtion unique ip issues 2022-09-26 12:49:00 +02:00
Daniel Maya c58cf09d62 #9252 Added images of spain, europe and world 2022-09-26 12:45:35 +02:00
Calvo 8174925a91 Delete favourite vc from menu when vc is deleted 2022-09-26 11:32:07 +02:00
Daniel Maya 67c8a945bf resolved conflict 2022-09-26 11:08:18 +02:00
Daniel Rodriguez e5cd925925 Merge branch 'ent-9167-cepsa-error-modulo-plugin-server-masivas-y-actualizar-modulo' into 'develop' 
Ent 9167 cepsa error modulo plugin server masivas y actualizar modulo

See merge request artica/pandorafms!5101
 2022-09-26 08:41:26 +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
Daniel Barbero 225646cd9d fixed response events pandora_enterprise#9423 2022-09-23 13:55:01 +02:00
Daniel Maya 795308367f #9254 load password with ajax 2022-09-23 13:24:46 +02: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
José González e14240cca7 Merge branch 'ent-9119-Metaconsola-Error-paginacion-vista-monitores' of https://brutus.artica.es:8081/artica/pandorafms into ent-9119-Metaconsola-Error-paginacion-vista-monitores 2022-09-23 12:55:25 +02:00
José González 09c6c5a0f9 Fix 2022-09-23 12:54:51 +02:00
Ramon Novoa 6c506e9dd0 Improved error detection when calling curl. 
Ref. pandora_enterprise#8359.
 2022-09-23 11:36:44 +02:00
edu.corral 6a93b4d554 ent 9303 audit log extended info 2022-09-23 11:35:17 +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
Daniel Maya 96f81475f7 resolved conflict 2022-09-23 09:20:59 +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
Calvo eed28bc668 Fix user form reset if profile fails 2022-09-22 17:07:43 +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
alejandro 938ebb6de7 changed single quotes to double quotes in the variable of the transfer_xml function of plugintools, to fix a bug, which prevented sending the file 2022-09-22 12:39:45 +02:00
Calvo 9499da3176 API and LDAP remote user fix with login error fix 2022-09-22 12:34:40 +02: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
Calvo 8a1740ddfb Added ldap timeout 2022-09-22 09:27:08 +02:00