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

30536 Commits

Author SHA1 Message Date
alejandro.campos@artica.es 12b0f5cda1 database changes 2022-06-08 11:49:48 +02:00
Daniel Rodriguez a40efcfee5 Merge branch 'ent-9037-controles-pegados-en-agente-detail-view' into 'develop' 
Ent 9037 controles pegados en agente detail view

See merge request artica/pandorafms!4936
 2022-06-08 09:11:54 +00:00
Daniel Rodriguez 1eea27e1f3 Merge branch 'ent-9040-Mejoras-en-la-vista-de-agents-alerts' into 'develop' 
Ent 9040 mejoras en la vista de agents alerts

See merge request artica/pandorafms!4933
 2022-06-08 09:11:19 +00:00
Daniel Rodriguez a2c1b38a3f Merge branch 'ent-9011-Fallo-permisos-en-paradas-planificadas' into 'develop' 
fixed permissions in selectors

See merge request artica/pandorafms!4931
 2022-06-08 09:10:51 +00:00
Daniel Barbero Martin 951a1703bf Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 
Conflicts:
	pandora_console/include/functions_reporting.php
 2022-06-08 08:15:49 +02:00
artica 8a5847a225 Auto-updated build strings. 2022-06-08 01:00:24 +02:00
Daniel Barbero Martin ee2810e680 refactor events meta pandora_enterprise#9086 2022-06-07 17:25:51 +02:00
José González ad00594b1d Set new brand and color for header 2022-06-07 17:21:13 +02:00
José González 4f21402992 Fixed languages files 2022-06-07 16:31:55 +02:00
Daniel Rodriguez fc18c1a168 Merge branch 'ent-9035-Si-no-hay-inventario,-no-deberia-mostrar-la-solapa-de-inventario' into 'develop' 
Hide inventory view if agent dont have inventory modules

See merge request artica/pandorafms!4916
 2022-06-07 11:52:37 +00:00
Daniel Rodriguez 6f5e1c3f94 Merge branch 'ent-8708-Version-mobile-visualiza-alertas-de-agentes-deshabilitados' into 'develop' 
Ent 8708 version mobile visualiza alertas de agentes deshabilitados

See merge request artica/pandorafms!4859
 2022-06-07 11:41:40 +00:00
Daniel Rodriguez 6d2e1a5e95 Merge branch 'ent-8844-delete-group-en-cli-meta' into 'develop' 
Fix CLI delete group on meta

See merge request artica/pandorafms!4842
 2022-06-07 11:18:52 +00:00
Daniel Rodriguez efac993111 Merge branch 'ent-8843-disabled-group-en-cli-meta' into 'develop' 
Meta disable groups CLI

See merge request artica/pandorafms!4833
 2022-06-07 11:14:56 +00:00
Daniel Rodriguez bf7941ddd2 Merge branch 'ent-7757-12115-anadir-ruta-completa-en-nombre-de-servicio-en-consola-visual-dashboard' into 'develop' 
Service tree view with local scope parents

See merge request artica/pandorafms!4826
 2022-06-07 10:47:26 +00:00
Daniel Rodriguez b962afe56d Merge branch 'ent-9078-Gráfica-de-estados-de-módulos' into 'develop' 
Ent 9078 gráfica de estados de módulos

See merge request artica/pandorafms!4924
 2022-06-07 10:46:18 +00:00
alejandro.campos@artica.es 7aa40617f8 fixed macro default value not loading 2022-06-07 11:20:51 +02:00
Daniel Rodriguez c433fcf3f0 Merge branch 'ent-9038-ocultar-opciones-en-la-busqueda-de-vista-de-modulos' into 'develop' 
Ent 9038 ocultar opciones en la busqueda de vista de modulos

See merge request artica/pandorafms!4930
 2022-06-07 09:12:51 +00:00
Daniel Rodriguez 08d8da9c83 Merge branch 'ent-8999-Cambiar-comportamiento-bulk-operations-meta' into 'develop' 
Ent 8999 cambiar comportamiento bulk operations meta

See merge request artica/pandorafms!4904
 2022-06-07 09:06:47 +00:00
artica 851f1a19ce Auto-updated build strings. 2022-06-07 01:00:21 +02:00
Daniel Maya 44748a0f8b #9108 fixed modules_get_table_data 2022-06-06 16:34:16 +02:00
Daniel Rodriguez 5138756525 Merge branch 'ent-8958-13577-Error-al-quitar-un-comando-de-una-acción' into 'develop' 
Ent 8958 13577 error al quitar un comando de una acción

See merge request artica/pandorafms!4878
 2022-06-06 12:16:15 +00:00
Daniel Rodriguez 618ff10fa2 Merge branch 'ent-8153-POST-Campos-extendidos-en-informe-de-eventos' into 'develop' 
Ent 8153 post campos extendidos en informe de eventos

See merge request artica/pandorafms!4830
 2022-06-06 10:52:51 +00:00
Daniel Rodriguez 92fdc9950a Merge branch 'ent-8897-Entities-en-nombre-de-dashboards-2' into 'develop' 
Ent 8897 entities en nombre de dashboards 2

See merge request artica/pandorafms!4911
 2022-06-06 09:35:58 +00:00
Daniel Maya ea16aac7af #8897 conflict resolved 2022-06-06 11:18:14 +02:00
Daniel Rodriguez 416021bca6 Merge branch 'ent-8822-enlace-web-en-metaconsola-para-nuevas-sugerencias' into 'develop' 
Changed link to Suggest new feature on new installation

See merge request artica/pandorafms!4874
 2022-06-06 08:45:20 +00:00
Daniel Rodriguez d553ab04a9 Merge branch 'ent-8952-13576-quitar-check-a-google-del-script-de-instalacion' into 'develop' 
8952-13576-quitar-check-a-google-del-script-de-instalacion

See merge request artica/pandorafms!4875
 2022-06-06 07:42:17 +00:00
Daniel Barbero Martin 459df79c8b Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-06 08:16:25 +02:00
artica 9712cf6c0f Auto-updated build strings. 2022-06-06 01:00:16 +02:00
artica 05b97a3dbc Auto-updated build strings. 2022-06-05 01:00:16 +02:00
artica 44925ef341 Auto-updated build strings. 2022-06-04 01:00:22 +02:00
edu.corral 9d7b047e72 9037 fixed agent view controls 2022-06-03 14:15:51 +02:00
Daniel Rodriguez b2acb41c10 Merge branch 'ent-8632-colocar-recursion-bien-modificar-agente' into 'develop' 
Fix recursion checkbox position

See merge request artica/pandorafms!4840
 2022-06-03 11:45:15 +00:00
Alejandro Campos 91d949942a Merge branch 'develop' into 'ent-8838-Longitud-id-user-tusuario' 
# Conflicts:
#   pandora_console/extras/mr/55.sql
 2022-06-03 10:26:35 +00:00
alejandro.campos@artica.es 0c9fdf8a18 changed field max length 2022-06-03 12:25:24 +02:00
alejandro.campos@artica.es d0386b17a4 fixed permissions 2022-06-03 11:41:06 +02:00
alejandro.campos@artica.es bf2ef75552 fixed permissions 2022-06-03 11:39:58 +02:00
Daniel Rodriguez 81e7f202c6 Merge branch 'ent-8890-Lista-de-tareas-RECON-con-muchos-targets-sale-horrible' into 'develop' 
Ent 8890 lista de tareas recon con muchos targets sale horrible

See merge request artica/pandorafms!4864
 2022-06-03 09:32:50 +00:00
Daniel Rodriguez 3c9c41942a Merge branch 'ent-8853-fe-de-erratas-en-mensajes-a-los-clientes-en-utilidad-pandora_manage-pl' into 'develop' 
Fix pandora_manage typo

See merge request artica/pandorafms!4863
 2022-06-03 09:16:42 +00:00
Daniel Rodriguez 7f34ec585e Merge branch 'ent-8641-Estilos-rotos-vista-inicial-Manage-Database-HA' into 'develop' 
Fix styles

See merge request artica/pandorafms!4801
 2022-06-03 09:00:57 +00:00
Daniel Rodriguez 1f54d030c7 Merge branch 'ent-8928-Nuevo-widget-OS-Quick-Report' into 'develop' 
Ent 8928 nuevo widget os quick report

See merge request artica/pandorafms!4877
 2022-06-03 08:12:50 +00:00
Daniel Barbero Martin 1cd680a971 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 
Conflicts:
	pandora_console/operation/events/events.php
 2022-06-03 09:28:18 +02:00
Daniel Barbero Martin 8dd9523b40 refactor events meta pandora_enterprise#9086 2022-06-03 09:20:51 +02:00
artica 21399593dd Auto-updated build strings. 2022-06-03 01:00:22 +02:00
Rafael Ameijeiras ba88dcf3d2 merge develop 2022-06-02 16:54:32 +02:00
Daniel Maya 3fb0392d80 #9040 changed table styles 2022-06-02 16:47:48 +02:00
Daniel Rodriguez 8ff75ef34d Merge branch 'ent-9013-anadir-comprobacion-de-suscripcion-de-rh-al-instalador-online-del-agente' into 'develop' 
Ent 9013 anadir comprobacion de suscripcion de rh al instalador online del agente

See merge request artica/pandorafms!4897
 2022-06-02 14:47:01 +00:00
Daniel Rodriguez 1a8e7b87c3 Merge branch 'ent-9042-binario-de-active-perl-no-conecta-por-defecto-con-mysql8' into 'develop' 
9042-binario-de-active-perl-no-conecta-por-defecto-con-mysql8

See merge request artica/pandorafms!4912
 2022-06-02 14:17:35 +00:00
Daniel Rodriguez 7ef4f00aea Merge branch 'ent-8970-bug-en-leyenda-al-generar-grafica-sql-en-plantillas-de-informe' into 'develop' 
fixed visual error sql graph pandora_enterprise#8970

See merge request artica/pandorafms!4888
 2022-06-02 14:16:29 +00:00
Daniel Rodriguez 616c2b776a Merge branch 'ent-8710-Cuadro-eliminar-alertas-masivas-pequeño' into 'develop' 
Fix visual issue

See merge request artica/pandorafms!4844
 2022-06-02 14:00:24 +00:00
Daniel Rodriguez a7791c06fc Merge branch 'ent-8751_espacios_no_mostrados_creando_agentes_en_API' into 'develop' 
Fix x20; chars in alias when create agents with alias with spaces in API

See merge request artica/pandorafms!4804
 2022-06-02 13:55:45 +00:00