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

6407 Commits

Author SHA1 Message Date
Jimmy Olano e8f84e6293 Merge branch 'ent-7683-switch-en-consola-para-desactivar-la-actualizacion-automatica-de-la-ip-principal' into 'develop' 
Added switch to agetn conf to avoid automatic Ip update

ref: pandora_enterprise#7683

See merge request artica/pandorafms!5019
 2022-08-11 14:55:40 +00:00
Jimmy Olano b10b9186bf Merge branch 'ent-9151-Ensanchar-los-boxes-de-agentes-módulos-en-paradas-planificadas' into 'develop' 
Ent 9151 ensanchar los boxes de agentes módulos en paradas planificadas

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9151

See merge request artica/pandorafms!5044
 2022-08-10 11:54:00 +00:00
Luis de1977fec1 Merge branch 'develop' into 'ent-7683-switch-en-consola-para-desactivar-la-actualizacion-automatica-de-la-ip-principal' 
# Conflicts:
#   pandora_console/extras/mr/56.sql
 2022-08-10 11:26:05 +00:00
Diego Muñoz-Reja 23070102bc Merge branch 'ent-8545-gestion-de-agentes-del-satelite-desde-la-consola-consola' into 'develop' 
Ent 8545 gestion de agentes del satelite desde la consola consola

See merge request artica/pandorafms!5043
 2022-08-09 12:44:46 +00:00
Daniel Barbero 743b1c295f Merge remote-tracking branch 'origin/develop' into ent-6367-report-server-gestion-de-informes-extensos-varios-cientos-de-agentes-val 2022-08-08 12:26:27 +02:00
Daniel Maya ea18fda67a #9151 resize multiselect 2022-08-08 12:04:29 +02:00
Calvo ced2a0837c Fix fixed ip switch issues 2022-08-08 10:23:11 +02:00
Calvo 2c8b9b3aa5 Satellite agent management 2022-08-05 21:49:42 +02:00
José González f1979e30c2 Fix URL Typo 2022-08-05 11:03:10 +02:00
alejandro.campos@artica.es 120003ab20 added dynamic token filter to view 2022-08-04 14:05:06 +02:00
alejandro.campos@artica.es af63bfe948 implemented visual editor for satellite conf and added some changes on editor 2022-08-04 09:14:05 +02:00
Daniel Barbero 2a51a448ac Merge remote-tracking branch 'origin/develop' into ent-6367-report-server-gestion-de-informes-extensos-varios-cientos-de-agentes-val 
Conflicts:
	pandora_console/godmode/menu.php
 2022-08-02 10:34:21 +02:00
Luis 33f9972293 Merge branch 'develop' into 'ent-7683-switch-en-consola-para-desactivar-la-actualizacion-automatica-de-la-ip-principal' 
# Conflicts:
#   pandora_console/extras/mr/56.sql
 2022-07-29 11:20:22 +00:00
Daniel Rodriguez 5d674b76b6 Merge branch 'ent-8942-token-para-cambiar-comportamiento-de-la-busqueda-de-grupos-en-filtro-de-eventos' into 'develop' 
new filter search eventspandora_enterprise#8942

See merge request artica/pandorafms!5007
 2022-07-21 10:15:49 +00:00
Jimmy Olano 7f1ecff302 Merge branch 'ent-9062-mensaje-de-advertencia-sin-traducir' into 'develop' 
Add transaltion to discovery message

Ref: pandora_enterprise#9062

See merge request artica/pandorafms!4967
 2022-07-20 22:24:13 +00:00
Daniel Barbero Martin 027f61daff Merge remote-tracking branch 'origin/develop' into ent-8942-token-para-cambiar-comportamiento-de-la-busqueda-de-grupos-en-filtro-de-eventos 
Conflicts:
	pandora_console/extras/mr/56.sql
 2022-07-19 10:18:04 +02:00
Calvo 3ee8f6b431 Added switch to agetn conf to avoid automatic Ip update 2022-07-15 13:40:54 +02:00
Daniel Barbero Martin 8e2b074460 new console report pandora_enterprise#6367 2022-07-11 16:42:20 +02:00
Daniel Barbero Martin 01ba149280 new console report pandora_enterprise#6367 2022-07-08 13:40:20 +02:00
Daniel Maya 86052ff28a #8769 Fixed conflict 2022-07-06 09:49:39 +02:00
Daniel Barbero Martin 12f73d86fd new filter search eventspandora_enterprise#8942 2022-07-05 17:02:40 +02:00
Daniel Maya e839d82e00 resolved conflict 2022-07-04 13:40:06 +02:00
Jimmy Olano 2bf757a364 Merge branch 'ent-8252-12671-ordenar-campos-custom-fields-eventos' into 'develop' 
Ent 8252 12671 ordenar campos custom fields eventos

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/8252

See merge request artica/pandorafms!4948
 2022-07-01 11:01:57 +00:00
Diego Muñoz-Reja 488191d9d8 Merge branch 'ent-9129-ampliar-funcionalidad-de-los-informes-top-n-actuales' into 'develop' 
top n regex pandora_enterprise#9129

See merge request artica/pandorafms!4989
 2022-07-01 10:57:20 +00:00
Jimmy Olano c074cd81bf Merge branch 'ent-8302-Añadir-opción-de-mostrar-solo-grupos-con-datos-en-Group-view' into 'develop' 
Ent 8302 añadir opción de mostrar solo grupos con datos en group view

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/8302

See merge request artica/pandorafms!4949
 2022-07-01 10:47:27 +00:00
Jimmy Olano fb5dd4d557 Merge branch 'ent-8588-Diferencias-de-filtrado-en-vistas-similares-de-Pandora' into 'develop' 
fixed query filter

Ref pandora_enterprise#8588

See merge request artica/pandorafms!4895
 2022-06-29 23:54:48 +00:00
Jimmy Olano 1e832e9e8d Merge branch 'ent-9172-Edición-de-usuario-superadmin' into 'develop' 
Ent 9172 edición de usuario superadmin

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9172

See merge request artica/pandorafms!4985
 2022-06-29 17:55:51 +00:00
Diego Muñoz-Reja bc6f234029 Merge branch 'ent-9093-Harce-mas-grande-el-selector-acciones-alertas' into 'develop' 
Resized alert action list and refactor

See merge request artica/pandorafms!4980
 2022-06-29 14:50:37 +00:00
Diego Muñoz-Reja 0d8cfc3986 Merge branch 'ent-9147-13774-Lista-elementos-consola-visual-falla-con-muchos-elementos' into 'develop' 
fixed vc elements edition

See merge request artica/pandorafms!4963
 2022-06-29 14:36:41 +00:00
Diego Muñoz-Reja a2125580d9 Merge branch 'ent-9043-cambiar-mensaje-error-no-poder-mostrar-fichero-file-manager' into 'develop' 
Improved error message

See merge request artica/pandorafms!4939
 2022-06-29 14:01:49 +00:00
Daniel Barbero Martin 2ff94b319c Merge remote-tracking branch 'origin/develop' into ent-9129-ampliar-funcionalidad-de-los-informes-top-n-actuales 2022-06-29 13:54:27 +02:00
José González 7edcd3b0a6 Improve code and fix update alerts 2022-06-29 11:05:50 +02:00
Jimmy Olano f48d3a9849 Merge branch 'ent-8984-13630-Cuenta-de-plantillas-de-alerta-no-coincide' into 'develop' 
Ent 8984 13630 cuenta de plantillas de alerta no coincide

See merge request artica/pandorafms!4902
 2022-06-29 02:40:08 +00:00
José González 2d69ea4be5 Merge branch 'develop' into 'ent-9043-cambiar-mensaje-error-no-poder-mostrar-fichero-file-manager' 
# Conflicts:
#   pandora_console/index.php
 2022-06-28 14:39:37 +00:00
Daniel Barbero Martin 2632816e13 top n regex pandora_enterprise#9129 2022-06-28 16:32:37 +02:00
José González b03356cc3c Merge branch 'develop' into 'ent-9089-Mejoras-usabilidad-menu-gestion-eventos' 
# Conflicts:
#   pandora_console/godmode/menu.php
 2022-06-28 14:08:13 +00:00
daniel 867e659118 Merge branch 'ent-1419-umbrales-en-graficas-pdf-4649-com1' into 'develop' 
add treshold pdf pandora_enterprise#1419

See merge request artica/pandorafms!4894
 2022-06-28 13:45:53 +00:00
Daniel Maya 693c5d5044 #9172 Changed configure user 2022-06-27 16:48:00 +02:00
José González 237de0ee97 Resized alert action list and refactor 2022-06-23 12:21:00 +02:00
Daniel Rodriguez 4dd65c20a8 Merge branch 'ent-8888-consolas-visuales-vista-movil-carrefour' into 'develop' 
Not orientation CV view mobile pandora_enterprise#8888

See merge request artica/pandorafms!4886
 2022-06-23 10:07:24 +00:00
Daniel Rodriguez c0509a798c Merge branch 'ent-8812-Adaptar-WMI-Wizard-nuevo-binario-pandorawmic' into 'develop' 
Added control for WMI binary

See merge request artica/pandorafms!4884
 2022-06-23 08:27:11 +00:00
edu.corral 22d9c267af ent-9041 input text style 2022-06-21 13:29:50 +02:00
Daniel Rodriguez bf8cb56895 Merge branch 'ent-8590-indicar-a-que-satelite-pertenece-un-agente' into 'develop' 
Console changes for 8590

See merge request artica/pandorafms!4947
 2022-06-20 15:11:42 +00:00
Daniel Rodriguez 8fb54be1bb Merge branch 'ent-8730-problema-notificacion-consola-con-parches-soporte' into 'develop' 
some fixes in version control and php memory usage

See merge request artica/pandorafms!4803
 2022-06-20 15:07:01 +00:00
José González 275fd2ed19 Fix minor issues related with pandorawmic 2022-06-20 16:20:49 +02:00
Calvo 5a6fc5630e Add transaltion to discovery message 2022-06-20 10:37:25 +02:00
Calvo 0c2823f23f Merge remote-tracking branch 'origin/develop' into ent-8590-indicar-a-que-satelite-pertenece-un-agente 2022-06-17 12:38:11 +02:00
Daniel Maya ad98356957 resolved conflict 2022-06-16 14:21:47 +02:00
Daniel Rodriguez bea57c8991 Merge branch 'ent-8861-wizard-snmp-convierte-valores-hex-string-en-string' into 'develop' 
Changed snmpwalk parameters for wizard

See merge request artica/pandorafms!4872
 2022-06-16 12:17:27 +00:00
Daniel Rodriguez ae5c4dca24 Merge branch 'ent-9026-Buscador-roto-agregar-acciones-a-alerta-SNMP' into 'develop' 
Fix several issues with SNMP Alert view

See merge request artica/pandorafms!4913
 2022-06-16 11:35:40 +00:00