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

26778 Commits

Author SHA1 Message Date
artica eb912405a6 Auto-updated build strings. 2021-03-05 01:00:53 +01:00
alejandro.campos@artica.es b117bbfd7e Refactored downtime editor 2021-03-04 16:27:14 +01:00
fbsanchez daa95d40c8 Merge remote-tracking branch 'origin/develop' into ent-6894-uniway-estado-pending-en-server-task-aws 
Conflicts:
	pandora_console/godmode/wizards/DiscoveryTaskList.class.php
 2021-03-04 14:32:01 +01:00
Daniel Rodriguez 2955e14849 Merge branch 'ent-6890-condición-agentes-vista-SAP2' into 'develop' 
Ent 6890 condición agentes vista sap2

See merge request artica/pandorafms!3878
 2021-03-04 12:12:12 +00:00
Daniel Maya aace7344a1 Fixed issue with id_grupo 2021-03-04 12:41:14 +01:00
rafael.ameijeiras ab68bcf1d6 adding permissions to apache group 2021-03-04 12:13:16 +01:00
Daniel Rodriguez 20952fa802 Merge branch 'ent-6890-Condición-agentes-vista-SAP' into 'develop' 
Ent 6890 condición agentes vista sap

See merge request artica/pandorafms!3753
 2021-03-04 10:57:53 +00:00
Daniel Maya 1bbbbcaee1 Ent 6890 condición agentes vista sap 2021-03-04 10:57:52 +00:00
Daniel Rodriguez 6c2a353812 Merge branch 'ent-6839-Crear-llamadas-a-la-api-para-activar-o-parar-una-discovery-task' into 'develop' 
Ent 6839 crear llamadas a la api para activar o parar una discovery task

See merge request artica/pandorafms!3798
 2021-03-04 10:47:20 +00:00
Daniel Rodriguez bf2705f571 Merge branch 'ent-6528-fallo-acl-servicios' into 'develop' 
Fixed services ACL on services treeview

See merge request artica/pandorafms!3685
 2021-03-04 10:46:31 +00:00
Daniel Rodriguez 8281d98f83 Merge branch 'ent-6926-Vista-de-servidores-no-muestra-masters' into 'develop' 
Ent 6926 vista de servidores no muestra masters

See merge request artica/pandorafms!3809
 2021-03-04 10:45:05 +00:00
Daniel Rodriguez d6b7b46139 Merge branch 'ent-6925-vista-previa-en-acciones-de-alertas-recuperadas' into 'develop' 
action_details avoid overlapping colors

See merge request artica/pandorafms!3792
 2021-03-04 10:43:29 +00:00
Daniel Rodriguez c26ba819ce Merge branch 'ent-6887-SAP-view-ACL' into 'develop' 
Added ACL groups in SAP view

See merge request artica/pandorafms!3747
 2021-03-04 10:36:05 +00:00
Daniel Rodriguez 3169492206 Merge branch 'ent-6848-Varios-bugs-en-la-vista-Connected-users' into 'develop' 
changes in connected users view

See merge request artica/pandorafms!3731
 2021-03-04 10:34:30 +00:00
Jose Gonzalez 6ee5b9c3e9 Fix issues 2021-03-04 11:33:21 +01:00
Daniel Rodriguez 94b04a8ef4 Merge branch 'ent-6106-Exportacion-CSV-en-icono-grafica-es-diferente-a-la-exportacion-normal' into 'develop' 
Fix styles file export_data

See merge request artica/pandorafms!3691
 2021-03-04 10:29:52 +00:00
daniel fbf26fab91 Fix styles file export_data 2021-03-04 10:29:52 +00:00
Alejandro Campos d4054f15d0 Merge branch 'develop' into 'ent-6898-Integracion-de-Integria-en-Pandora' 
# Conflicts:
#   pandora_console/extras/mr/45.sql
#   pandora_console/godmode/alerts/configure_alert_action.php
#   pandora_server/util/pandora_db.pl
 2021-03-04 10:27:07 +00:00
Daniel Barbero Martin 90af8824de Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-04 08:18:29 +01:00
artica 4d1cab6b67 Auto-updated build strings. 2021-03-04 01:00:19 +01:00
Daniel Rodriguez 7b4f24dfbf Merge branch 'ent-7101-Problemas-graves-visualizacion-de-Consolas-Visuales-en-Dashboards' into 'develop' 
fixed errors CV dashboards

See merge request artica/pandorafms!3876
 2021-03-03 12:42:02 +00:00
daniel 6db07e5fe0 fixed errors CV dashboards 2021-03-03 12:42:02 +00:00
artica 442d0d440a Auto-updated build strings. 2021-03-03 01:00:23 +01:00
Alejandro Campos 66e4e2b173 Merge branch 'develop' into 'ent-6848-Varios-bugs-en-la-vista-Connected-users' 
# Conflicts:
#   pandora_console/extensions/users_connected.php
 2021-03-02 16:34:10 +00:00
Daniel Rodriguez abdfe6b77f Merge branch 'ent-7064-no-se-muestran-los-mensajes' into 'develop' 
fixed error not show messages

See merge request artica/pandorafms!3859
 2021-03-02 12:50:36 +00:00
Daniel Rodriguez 532c04db39 Merge branch 'ent-6946-bug-en-usuario-con-perfil-group-coordinator-meta' into 'develop' 
fixed error with group cordinator profile with agent management meta

See merge request artica/pandorafms!3842
 2021-03-02 12:48:16 +00:00
Daniel Rodriguez 51404eda8d Merge branch 'ent-7077-no-funciona-doble-auth-meta' into 'develop' 
Ent 7077 no funciona doble auth meta

See merge request artica/pandorafms!3866
 2021-03-02 12:24:03 +00:00
Luis 93a4a90dd6 Ent 7077 no funciona doble auth meta 2021-03-02 12:24:03 +00:00
Daniel Rodriguez 8c730f7a0c Merge branch 'ent-6522-fallo-visual-vista-ficheros-colecciones' into 'develop' 
Added infobox for empty folder on collections

See merge request artica/pandorafms!3717
 2021-03-02 12:21:13 +00:00
Luis 28b8092669 Added infobox for empty folder on collections 2021-03-02 12:21:13 +00:00
Daniel Rodriguez f9faac8abd Merge branch 'ent-6710-instalacion-desatendida-agente-windows' into 'develop' 
Fixed issue

Closes pandora_enterprise#6710

See merge request artica/pandorafms!3871
 2021-03-02 12:18:48 +00:00
Daniel Barbero Martin da263b23d2 WIP Command center 2021-03-02 11:09:55 +01:00
alejandro.campos@artica.es 9b3f6f1efb added option to disable selected agents massively 2021-03-02 10:42:08 +01:00
fbsanchez c5b2b90476 Merge remote-tracking branch 'origin/develop' into ent-6232-nt-incluir-ifspeed-como-custom-macro-en-ifoperstatus 
Conflicts:
	pandora_console/extras/mr/45.sql
 2021-03-02 09:48:33 +01:00
fbsanchez d96590aea5 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/include/functions_ui.php
	pandora_console/include/styles/pandora.css
 2021-03-02 09:40:15 +01:00
Daniel Barbero Martin 12b63b8a7a Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-02 08:33:20 +01:00
Daniel Barbero Martin 2ea6c9dbda WIP Command center 2021-03-02 08:32:59 +01:00
artica 19ab53cfb8 Auto-updated build strings. 2021-03-02 01:00:21 +01:00
Daniel Rodriguez 23cddae261 Merge branch 'ent-5229-filtro-event-report' into 'develop' 
Added string exclude filter to events reports

See merge request artica/pandorafms!3748
 2021-03-01 15:28:18 +00:00
alejandro.campos@artica.es af680b5d92 permissions limitation for command management 2021-03-01 13:58:04 +01:00
Daniel Rodriguez 001c7aaba9 Merge branch 'ent-6950-selector-de-grupos-xxl-en-creacion-de-netflow-filter-y-gis-maps' into 'develop' 
fixed select style

See merge request artica/pandorafms!3835
 2021-03-01 12:24:48 +00:00
Daniel Rodriguez 2ef8bc2178 Merge branch 'ent-6877-Aumentar-el-limite-de-caracteres-de-la-etiqueta-en-contenedore-de-Gráficas' into 'develop' 
Ent 6877 aumentar el limite de caracteres de la etiqueta en contenedore de gráficas

See merge request artica/pandorafms!3791
 2021-03-01 12:24:17 +00:00
Daniel Rodriguez 4fbfc14479 Merge branch 'ent-6817-Meter-spinning-Loading-en-la-visualizacion-de-graficas-de-modulos' into 'develop' 
Fix loading charts modules and interfaces

See merge request artica/pandorafms!3700
 2021-03-01 12:16:27 +00:00
Daniel Rodriguez 23edf2f11f Merge branch 'ent-6751-Al-poner-en-unidades-distintas-del-selector-no-se-puede-volver-a-dejar-en-blanco' into 'develop' 
Ent 6751 al poner en unidades distintas del selector no se puede volver a dejar en blanco

See merge request artica/pandorafms!3695
 2021-03-01 12:14:54 +00:00
Daniel Rodriguez 341fc212d5 Merge branch 'ent-6610-links-ayuda-configuración-metaconsola' into 'develop' 
Removed metaconsole empty help links

See merge request artica/pandorafms!3702
 2021-03-01 10:59:50 +00:00
Daniel Rodriguez 72ecb53412 Merge branch 'ent-6602-AXA-Recursividad-de-grupos-no-funciona-en-operaciones-masivas' into 'develop' 
fix recursivity check

See merge request artica/pandorafms!3711
 2021-03-01 10:57:45 +00:00
Daniel Rodriguez f6d9997b16 Merge branch 'ent-6547-Visual-styles-cambio-de-tamaño-agente-modulo-y-descripcion' into 'develop' 
Ent 6547 visual styles cambio de tamaño agente modulo y descripcion

See merge request artica/pandorafms!3707
 2021-03-01 10:57:08 +00:00
Daniel Rodriguez f74b73cbb5 Merge branch 'ent-6492-Tokens-que-no-corresponden-en-el-item-SQL-Query-de-informes' into 'develop' 
Fix item sql query remove fields

See merge request artica/pandorafms!3690
 2021-03-01 10:52:28 +00:00
Daniel Rodriguez 4de4709f9f Merge branch 'ent-6401-Espacio-entre-label-e-ID-en-actualización-de-usuario-metaconsola' into 'develop' 
Ent 6401 espacio entre label e id en actualización de usuario metaconsola

See merge request artica/pandorafms!3701
 2021-03-01 10:50:39 +00:00
Daniel Rodriguez a8150f94cb Merge branch 'ent-6386-snmp-trap-tabla-filtros-descolocados' into 'develop' 
SNMP trap filter colocado

See merge request artica/pandorafms!3705
 2021-03-01 10:50:09 +00:00