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

31093 Commits

Author SHA1 Message Date
José González 1ae6267acc Fix issue with agent_alias 2022-09-27 11:14:18 +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
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
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
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
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
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
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
Diego Muñoz-Reja fd04dda6d8 Merge branch 'ent-8791-base-de-datos-historica-para-metaconsola' into 'develop' 
add historical database setup in metaconsole pandora_enterprise#8791

See merge request artica/pandorafms!5047
 2022-09-21 15:23:38 +00:00
Daniel Barbero f688f73c46 fixed historical database pandora_enterprise#8791 2022-09-21 16:35:36 +02:00
Daniel Rodriguez fe7948294e Merge branch 'ent-8506-hostalive-umbral-inverso' into 'develop' 
Ent 8506 hostalive umbral inverso

See merge request artica/pandorafms!5113
 2022-09-21 13:36:01 +00: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 67509137ab Merge branch 'ent-9455-hacer-script-de-instalacion-online-para-ubuntu-22-04' into 'develop' 
adding autoinstall community script for ubuntu 22.04

See merge request artica/pandorafms!5078
 2022-09-21 08:11:30 +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 Maya 197fa4c69a #9143 Added help tip 2022-09-20 15:16:56 +02:00
Daniel Maya 737f27f782 #9143 Added license_encryption_key 2022-09-20 11:37:07 +02:00
José González 1460e63f22 Fix 2022-09-20 09:20:46 +00:00
José González 2a63f19d38 Fix 2022-09-20 11:13:02 +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
Diego Muñoz-Reja 43a3cf4cac Merge branch 'ent-9432-no-funciona-safe-operation-mode' into 'develop' 
Ent 9432 no funciona safe operation mode

See merge request artica/pandorafms!5096
 2022-09-19 15:27:14 +00: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