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

4914 Commits

Author SHA1 Message Date
Luis daa70f84db Merge branch 'develop' into 'ent-3314-Agents/Modules-item-error-on-report' 
# Conflicts:
#   pandora_console/godmode/reporting/reporting_builder.item_editor.php
 2019-09-16 10:09:52 +02:00
Tatiana Llorente ca6fe42298 Merge remote-tracking branch 'origin/ent-4461-Configuracion-integracion-integria' into ent-4642-Listado-de-tickets-integración-Integria 2019-09-13 12:00:04 +02:00
alejandro-campos 2218ad7d60 Added email check functionality 2019-09-12 15:37:16 +02:00
Daniel Maya 482037b378 Fixed file.png in plugin 2019-09-12 15:28:32 +02:00
Tatiana Llorente 33296f448c Hidden field module in edit agent view - #4620 2019-09-12 10:29:14 +02:00
Alejandro Fraguas 3eadb07058 Merge branch 'ent-4166-No-se-añade-module_unit-personalizado' into 'develop' 
Fixed bug in custom unit #4166

See merge request artica/pandorafms!2675
 2019-09-11 16:47:40 +02:00
alejandro-campos 4722d4a08b changed setup option text 2019-09-10 11:38:02 +02:00
alejandro-campos 93b9c76f58 Merge branch 'develop' into ent-4047-Simplificacion-de-la-configuracion-del-sistema-de-email 2019-09-10 10:50:53 +02:00
alejandro-campos c2e47e0ffa Revert "ddded comment" 
This reverts commit 4ec832f523.
 2019-09-10 10:06:33 +02:00
alejandro-campos 4ec832f523 ddded comment 2019-09-10 10:03:30 +02:00
Manuel Montes 90c94e74d9 Fixed bug in list graphs view 2019-09-09 21:02:53 +02:00
Daniel Rodriguez d02f3621f3 Merge branch 'ent-3813-Autocompletado-de-campo-Proxy-auth-server-al-crear-webserver-module' into 'develop' 
Removed autofill proxi in auth server

See merge request artica/pandorafms!2361
 2019-09-05 18:29:43 +02:00
marcos.alconada 9e4b5ca5c8 Merge remote-tracking branch 'origin/develop' into ent-4457-bug-visual-style-font 2019-09-05 12:03:37 +02:00
marcos.alconada c12d672109 Add visual condition for JA and CH Lenguage 2019-09-05 12:01:25 +02:00
manuel e4d014923b Fixed visual bug in item names from report template 2019-09-05 10:44:18 +02:00
Daniel Rodriguez 2f0a19ae6e Merge branch 'ent-4446-Bug-Creacion-filtro-SNMP' into 'develop' 
Fixed bug create snmp filter - #4446

See merge request artica/pandorafms!2638
 2019-09-03 17:07:27 +02:00
Daniel Rodriguez b3b0f082d7 Merge branch 'ent-4484-Acceso-update-manager-offline-en-open' into 'develop' 
Don't allow access to update manager offline in community edition - #4484

See merge request artica/pandorafms!2648
 2019-09-03 13:37:02 +02:00
Daniel Rodriguez 81511d1ac4 Merge branch 'ent-4422-campos-vacios-al-crear-modulos-wb' into 'develop' 
Fixed empty http_auth_user and pass

See merge request artica/pandorafms!2656
 2019-09-03 12:09:04 +02:00
alejandro-campos 11cb53582c backup changes 2019-09-02 17:01:41 +02:00
Daniel Rodriguez 20cc562911 Merge branch 'ent-3895-Pete-permisos-al-intentar-borrar-un-report-sin-seleccionar-ninguno-en-los-checkboxs' into 'develop' 
Fixed bug in report deletions

See merge request artica/pandorafms!2362
 2019-09-02 13:18:20 +02:00
Daniel Rodriguez c47b24d84c Merge branch 'ent-4278-Bug-ACL-al-cargar-o-gestionar-filtros-de-eventos' into 'develop' 
Fixed bug permissions on filter events- 4278

See merge request artica/pandorafms!2671
 2019-08-30 16:07:45 +02:00
Daniel Rodriguez aa383e3f56 Merge branch 'ent-4513-bugs-en-password-policy' into 'develop' 
fixed visual error

See merge request artica/pandorafms!2678
 2019-08-30 14:35:57 +02:00
Daniel Rodriguez ab5ad9a459 Merge branch 'ent-4519-iconos-no-alineados-en-reporting-builder' into 'develop' 
fixed error

See merge request artica/pandorafms!2665
 2019-08-30 14:12:42 +02:00
Daniel Rodriguez 85b7ee034f Merge branch 'ent-4524-Campo-Command-en-respuestas-de-eventos' into 'develop' 
Changed input for textarea in command field - #4524

See merge request artica/pandorafms!2676
 2019-08-30 14:12:21 +02:00
Daniel Rodriguez f292780aa2 Merge branch 'ent-4377-Fallo-al-listar-los-items-de-tipo-text-en-los-reports-de-metaconsola' into 'develop' 
Added item type text to list of items- #4377

See merge request artica/pandorafms!2652
 2019-08-30 14:11:18 +02:00
Daniel Rodriguez cbfb8b1e89 Merge branch 'ent-4389-Error-al-mostrar-el-nombre-de-un-agente-en-la-edicion-de-un-item-de-un-report' into 'develop' 
Show alias instead of name - #4389

See merge request artica/pandorafms!2651
 2019-08-30 14:10:52 +02:00
Tatiana Llorente a9a2ca5178 Change label for disabled status - #4573 2019-08-30 11:58:50 +02:00
marcos.alconada d650ff6959 fixed error 2019-08-30 11:28:24 +02:00
manuel 94e377c3c3 Merge branch 'develop' into ent-3813-Autocompletado-de-campo-Proxy-auth-server-al-crear-webserver-module 
Conflicts:
	pandora_console/godmode/agentes/configurar_agente.php
 2019-08-30 09:46:27 +02:00
manuel ce4f4f003d Merge branch 'develop' into ent-3895-Pete-permisos-al-intentar-borrar-un-report-sin-seleccionar-ninguno-en-los-checkboxs 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.php
 2019-08-30 09:30:11 +02:00
Tatiana Llorente 8fd1f3c99e Added compact mode to show timestamp - #4233 2019-08-29 10:07:50 +02:00
Tatiana Llorente d38f1f8aec Fixed bug in unit in massive operations - #4166 2019-08-27 12:21:00 +02:00
Luis Calvo 2dc084da8a Merge remote-tracking branch 'origin/develop' into ent-4132-custom-fields-url 2019-08-27 09:11:45 +02:00
marcos.alconada efd6a72bb8 Merge remote-tracking branch 'origin/develop' into ent-4513-bugs-en-password-policy 2019-08-26 08:09:14 +02:00
marcos.alconada 8d8e08d37b fixed visual error 2019-08-22 15:25:35 +02:00
Tatiana Llorente e8a873de7c Changed input for textarea in command field - #4524 2019-08-22 11:22:40 +02:00
Alejandro Fraguas 1e5b6a8416 Merge branch 'ent-4507-bug-visual-en-version-open' into 'develop' 
fixed visual error in Open

See merge request artica/pandorafms!2670
 2019-08-22 08:43:44 +02:00
Tatiana Llorente b444be87b4 Fixed bug in custom unit #4166 2019-08-21 14:46:58 +02:00
Tatiana Llorente d515e510f3 Fixed bug in custom unit #4166 2019-08-21 13:38:53 +02:00
Luis Calvo a8c351d177 Custom fields type hint BBCode updated 2019-08-21 09:55:53 +02:00
marcos.alconada ff44666e41 fixed visual error2 2019-08-21 09:49:17 +02:00
Tatiana Llorente 32a3776260 Fixed bug permissions on filter events- 4278 2019-08-20 13:46:13 +02:00
Tatiana Llorente 38547052fb Fixed bug permissions on filter events- 4278 2019-08-20 13:42:04 +02:00
marcos.alconada a77a72cea5 fixed visual error on Open 2019-08-20 13:07:47 +02:00
marcos.alconada d46e013567 fixed visual error! 
ç2
 2019-08-19 14:29:04 +02:00
marcos.alconada 44eb8dd3d1 fixed visual error 2019-08-19 12:31:47 +02:00
marcos.alconada e83f001948 fixed error 2019-08-16 13:47:06 +02:00
Tatiana Llorente 747e06c8b0 Added margin - #4300 2019-08-12 12:54:06 +02:00
Luis Calvo db349a4783 Fixed empty http_auth_user and pass 2019-08-12 12:26:00 +02:00
Tatiana Llorente b893d55a49 Added item type text to list of items- #4377 2019-08-09 12:09:49 +02:00
Tatiana Llorente 8bfde74a06 Show alias instead of name - #4389 2019-08-09 11:06:17 +02:00
alejandro-campos 97353bbfed backup changes 2019-08-08 13:36:12 +02:00
Tatiana Llorente 77f57ae87f Don't allow access to update manager offline in community edition - #4484 2019-08-08 09:23:23 +02:00
Tatiana Llorente c32c15ed94 Fixed bug create snmp filter - #4446 2019-08-07 09:35:08 +02:00
marcos.alconada 9cfa8be1e9 font size for jap and chinese adjusted agents 2019-08-06 14:35:15 +02:00
alejandro-campos 9b8e3c540c created integria integration setup 2019-08-05 13:42:01 +02:00
fbsanchez 6ac21acd39 wip agent deployment scan 2019-07-25 18:35:51 +02:00
fbsanchez 8d9c4682c7 WIP Agent repository 2019-07-17 20:37:13 +02:00
fbsanchez 17dc0b82ac Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-17 17:19:58 +02:00
fbsanchez 9b57ab8c13 Review minor 2019-07-17 17:17:54 +02:00
Daniel Barbero Martin 6b6d852ceb Merge remote-tracking branch 'origin/develop' into ent-4205-gigas-proyectos-funcionamiento-incorrecto-del-wizard-snmp-con-exec-server 
Conflicts:
	pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php
 2019-07-17 15:06:38 +02:00
Daniel Rodriguez c97074ea74 Merge branch 'ent-4354-Revision_completa_de_macros_de_reports' into 'develop' 
fixed macros reports

See merge request artica/pandorafms!2595
 2019-07-17 13:49:38 +02:00
Alejandro Fraguas 657515d79c Merge branch 'ent-2140-Faltan-OIDs-SNMP-Interface-Wizard' into 'develop' 
Added selector for all or common modules- #2140

See merge request artica/pandorafms!2540
 2019-07-17 13:14:39 +02:00
Daniel Barbero Martin 7f4701f22e exec server error wizard 2019-07-17 11:11:38 +02:00
fbsanchez f0bfe6910d WIP agent deployment 2019-07-16 20:56:47 +02:00
Daniel Rodriguez 4dc5ee2fca Merge branch 'ent-4318-Añadir-buscador-en-operaciones-masivas-vol2' into 'develop' 
Added filter by agent - #4318

See merge request artica/pandorafms!2588
 2019-07-16 14:05:39 +02:00
Tatiana Llorente 0fbe7e0128 Merge branch 'develop' into 'ent-2140-Faltan-OIDs-SNMP-Interface-Wizard' 
Conflicts:
  pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php
 2019-07-16 11:57:36 +02:00
Daniel Rodriguez ab7743b578 Merge branch 'ent-4307-No-se-puede-copiar-agent_name-ni-ID-de-agente-en-vista-de-agente-Firefox' into 'develop' 
Changed disabled to readonly in agent name and id- #4307

See merge request artica/pandorafms!2578
 2019-07-16 11:52:12 +02:00
Daniel Rodriguez e69024f4e2 Merge branch 'ent-4267-edicion-text-informes' into 'develop' 
Solved wrong variable rewriting

See merge request artica/pandorafms!2553
 2019-07-16 10:10:53 +02:00
fbsanchez 3bbd01026e WIP agent deployment 2019-07-15 19:37:04 +02:00
Alejandro Fraguas 8c55c1b287 Merge branch 'ent-4094-Error-al-cambiar-intervalo-de-agentes-por-masivas' into 'develop' 
fixed bug: agent interval not being changed in agent config when changing its…

See merge request artica/pandorafms!2601
 2019-07-15 16:56:41 +02:00
Daniel Rodriguez 81c4bd1a76 Merge branch 'ent-3333-etiquetas-a-los-items-en-el-builder-de-consolas-visuales' into 'develop' 
Ent 3333 etiquetas a los items en el builder de consolas visuales

See merge request artica/pandorafms!2344
 2019-07-15 14:12:16 +02:00
Daniel Rodriguez 5f3684fb4e Merge branch 'ent-3786-evitar-cambio-tipo-modulo-politicas' into 'develop' 
Modified control for module edition

See merge request artica/pandorafms!2563
 2019-07-15 14:09:32 +02:00
Daniel Rodriguez 6765544b66 Merge branch 'ent-3382-comprobacion-de-grupos-secundarios-y-primarios-al-creareditar-un-agente' into 'develop' 
Added advice when a primary group will be selected when is currentl a secondary group

See merge request artica/pandorafms!2353
 2019-07-15 13:59:29 +02:00
Alejandro Fraguas 9ea7ac0859 Merge branch 'ent-4080-nombre-agente-lista-modulos' into 'develop' 
Modified agent alias name

See merge request artica/pandorafms!2556
 2019-07-15 13:02:37 +02:00
Daniel Rodriguez ab308b7d10 Merge branch 'ent-4167-cambio-recon-task-listado-servidores' into 'develop' 
Changed link to Discovery task list and added ui_get_full_url function over other links

See merge request artica/pandorafms!2555
 2019-07-15 12:36:52 +02:00
Luis Calvo ef9502a552 Fixed errors on sum report uncompressed checkbox 2019-07-15 11:56:57 +02:00
alejandro-campos 95254341ce add condition to check if agent interval token should be updated in massive operations based on previous result 2019-07-15 11:53:25 +02:00
alejandro-campos eb831dbbcd fixed bug: agent interval not being changed in agent config when changing its value through massive operations 2019-07-15 11:46:35 +02:00
Daniel Barbero Martin 2f110b8e2e Merge remote-tracking branch 'origin/develop' into ent-4354-Revision_completa_de_macros_de_reports 2019-07-15 11:37:02 +02:00
fbsanchez 9fb32c4699 Deployment area single targets 2019-07-12 18:29:58 +02:00
Alejandro Fraguas bfc267691b Merge branch 'ent-3105-comportamiento-public_url' into 'develop' 
Ent 3105 comportamiento public url

See merge request artica/pandorafms!2568
 2019-07-12 13:02:42 +02:00
Luis Calvo a1e2693d4b Merge remote-tracking branch 'origin/develop' into ent-3875-Report-type-summation-not-working-properly 2019-07-12 11:33:27 +02:00
Luis Calvo 41d8afaeea added summation report uncompressed module cehckbox 2019-07-12 11:32:56 +02:00
Daniel Rodriguez 24cbe3bd8e Merge branch 'ent-4347-Desplazamiento-de-un-cuadro-sobre-otro-en-la-configuracion-de-las-visual-styles' into 'develop' 
Ent 4347 desplazamiento de un cuadro sobre otro en la configuracion de las visual styles

See merge request artica/pandorafms!2598
 2019-07-12 10:26:05 +02:00
Daniel Barbero ecaba5ebd3 fixed errorsr macros reports 2019-07-12 10:24:46 +02:00
fbsanchez c386a29b80 Merge remote-tracking branch 'origin/develop' into ent-3105-comportamiento-public_url 2019-07-12 09:38:28 +02:00
fbsanchez 1e05f9a396 WIP agent deployment 2019-07-11 19:25:49 +02:00
Alejandro Fraguas 99a219aa64 Merge branch 'ent-3545-8250-7558-7882-monitorizar-servicios-de-azure' into 'develop' 
Ent 3545 8250 7558 7882 monitorizar servicios de azure

See merge request artica/pandorafms!2591
 2019-07-11 18:28:34 +02:00
fbsanchez 5fd7b87a06 Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-11 18:27:49 +02:00
Tatiana Llorente f701bcb44e Fixed several minor visual bugs - #4347 2019-07-11 17:00:50 +02:00
Daniel Rodriguez cdf7c84b81 Merge branch 'ent-4302-Opcion_para_deshabilitar_aviso_de_suscripcion_a_newsletter' into 'develop' 
new tocken user edit newslatter info

See merge request artica/pandorafms!2589
 2019-07-11 15:36:56 +02:00
Tatiana Llorente fd24398219 Fixed several minor visual bugs - #4347 2019-07-11 14:46:41 +02:00
fbsanchez 7c8cb75faf WIP discovery agent deployment 2019-07-11 13:25:29 +02:00
fbsanchez 518443ea4e Improved menus 2019-07-11 12:32:48 +02:00
fbsanchez 9548cd4028 Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-11 11:14:34 +02:00
Daniel Rodriguez f0c539cfcf Merge branch 'ent-4203-Meter-submenus-de-discovery' into 'develop' 
Added discovery submenus to main menu - #4203

See merge request artica/pandorafms!2571
 2019-07-11 11:14:24 +02:00
fbsanchez 47cc0d9d6e WIP: Agent deployment center 2019-07-10 23:59:09 +02:00
fbsanchez 58465090b2 Merge remote-tracking branch 'remotes/origin/ent-3545-8250-7558-7882-monitorizar-servicios-de-azure' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-10 22:05:02 +02:00
Daniel Barbero Martin ed0688f853 fixed macros reports 2019-07-10 18:20:43 +02:00
Tatiana Llorente 3b23810323 Added filter by agent in massive copy - #4318 2019-07-10 16:37:24 +02:00
Daniel Rodriguez 96fbca35a4 Merge branch 'ent-4194-Revision-de-CSS-alternativos' into 'develop' 
Created black theme - #4194

See merge request artica/pandorafms!2564
 2019-07-10 11:47:21 +02:00
Daniel Rodriguez f864573486 Merge branch 'ent-4252-Ampliacion_del_informe_de_disponibilidad_para_fuentes_secundarias' into 'develop' 
Ent 4252 ampliacion del informe de disponibilidad para fuentes secundarias

See merge request artica/pandorafms!2577
 2019-07-10 09:33:41 +02:00
fbsanchez cab4a6dc03 Merge remote-tracking branch 'origin/develop' into 3545-8250-7558-7882-monitorizar-servicios-de-azure 2019-07-09 17:28:14 +02:00
Tatiana Llorente eaf29b798a Fixed minor visual bugs in black theme- #4194 2019-07-09 15:03:38 +02:00
Daniel Barbero ab3cfd4cc9 new tocken user edit newslatter info 2019-07-09 14:08:06 +02:00
fbsanchez 0cabc4d4da Azure discovery task form completed 2019-07-09 12:02:29 +02:00
Daniel Rodriguez 7fa79f2043 Merge branch 'ent-4227-Componentes_de_red_no_funcionan_bien' into 'develop' 
fixed error network component plugin

See merge request artica/pandorafms!2581
 2019-07-09 10:27:08 +02:00
Daniel Rodriguez 972e7447ea Merge branch 'ent-4195-Status-sets-Visual' into 'develop' 
Changed default images status set for css - #4195

See merge request artica/pandorafms!2530
 2019-07-09 10:01:09 +02:00
fbsanchez 297bd7c107 Merge remote-tracking branch 'origin/develop' into 3545-8250-7558-7882-monitorizar-servicios-de-azure 2019-07-09 09:53:04 +02:00
Tatiana Llorente 0f280494a0 Changed images for divs to show preview in visual styles - #4195 2019-07-09 09:33:49 +02:00
Daniel Barbero 127f67f2ac fixed error in network component 2019-07-08 19:33:54 +02:00
Tatiana Llorente 6d6c8fe197 Added filter by agent - #4318 2019-07-08 17:57:23 +02:00
Daniel Barbero 6e7dfb38fd fixed error network component plugin 2019-07-05 13:46:48 +02:00
Daniel Barbero 7175d716f0 fixed translate 2019-07-05 10:32:10 +02:00
Alejandro Fraguas d269f3b69c Merge branch 'ent-3714-Eliminar-opciones-template-y-wizard-en-la-visual-console-open' into 'develop' 
Hidden buttons template and wizard in the open visual console

See merge request artica/pandorafms!2264
 2019-07-04 17:10:05 +02:00
Tatiana Llorente de6a0c2192 Changed disabled to readonly in agent name and id- #4307 2019-07-04 16:20:01 +02:00
Daniel Barbero Martin 22734a4ea2 WIP failover 2019-07-03 17:51:47 +02:00
Alejandro Fraguas 04cd368410 Merge branch 'ent-4152-excec-satellite-serever-warn-remote-conf-needed' into 'develop' 
Added satellite remote conficg check in snmp wizard

See merge request artica/pandorafms!2539
 2019-07-03 16:54:39 +02:00
fbsanchez 18d8f90f90 Credential store upgrade Azure 2019-07-03 16:04:40 +02:00
Tatiana Llorente c7e410b16d Added discovery submenus to main menu - #4203 2019-07-03 11:08:17 +02:00
Alejandro Campos ffbaac6edc Merge branch 'develop' into 'ent-3742-Perdida-de-recursion-en-paginacion-inferior' 
# Conflicts:
#   pandora_console/godmode/agentes/modificar_agente.php
 2019-07-02 18:22:49 +02:00
Alejandro Fraguas 86610ebe96 Merge branch 'ent-4294-7984-Desplegable-de-grupos-desordenados' into 'develop' 
Fixed unordered groups

See merge request artica/pandorafms!2559
 2019-07-02 16:06:33 +02:00
fbsanchez eb01e9baaf public_url with force option 2019-07-02 14:17:53 +02:00
Daniel Barbero 209681e4c2 ADD failover option availability_graph 2019-07-02 11:50:58 +02:00
Alejandro Fraguas 3a76f331c8 Merge branch 'ent-2094-Añadir-buscador-en-operaciones-masivas' into 'develop' 
Add module filter by text -#2094

See merge request artica/pandorafms!2520
 2019-07-02 11:37:01 +02:00
Daniel Barbero Martin 0064bc0cba fixed errors 2019-07-01 17:07:39 +02:00
Jose Gonzalez 52025efbee Modified control for module edition 2019-07-01 13:55:44 +02:00
Alejandro Fraguas eb94438c7f Merge branch 'ent-3541-7513-nuevo-modificar-informe-de-eventos-por-grupo' into 'develop' 
Show new filters for group events reports

See merge request artica/pandorafms!2534
 2019-07-01 12:38:48 +02:00
Alejandro Fraguas 1ee2e94766 Merge branch 'ent-3748-component-group-creation-not-working-after-delete-component' into 'develop' 
Fixed create from bug: added action with refresh url

See merge request artica/pandorafms!2284
 2019-07-01 10:19:44 +02:00
Alejandro Fraguas 39ac83ae5e Merge branch 'ent-4250-Cambios-de-estilo-pendientes_2' into 'develop' 
Style changes - #4250

See merge request artica/pandorafms!2557
 2019-07-01 10:02:02 +02:00
Alejandro Fraguas 47838a1134 Merge branch 'ent-4213-SNMP-Walk-dede-modulo-creado-no-muestra-parametros-v3' into 'develop' 
Ent 4213 snmp walk dede modulo creado no muestra parametros v3

See merge request artica/pandorafms!2511
 2019-07-01 09:48:33 +02:00
Daniel Maya 63e0df4434 Fixed unordered groups 2019-06-28 12:11:25 +02:00
Tatiana Llorente 52f391667a Style changes - #4250 2019-06-28 10:24:53 +02:00
Jose Gonzalez 03edb75b7c Modified agent alias name 2019-06-27 17:19:48 +02:00
Jose Gonzalez 411e62fb0d Changed link to Discovery task list and added ui_get_full_url function over other links 2019-06-27 16:38:00 +02:00
Jose Gonzalez a2877b46f3 Solved wrong variable rewriting 2019-06-27 14:58:57 +02:00
fbsanchez 470e399f50 Fixed url edit task in RDS 2019-06-26 19:34:34 +02:00
Daniel Rodriguez 321ea717af Merge branch 'ent-3644-bug-redireccion-de-static-graph' into 'develop' 
Changed js

See merge request artica/pandorafms!2544
 2019-06-26 13:02:50 +02:00
marcos.alconada c223e0bdad Changed js 2019-06-26 12:50:19 +02:00
marcos.alconada 006e0cd4ec Changed js 2019-06-26 12:31:47 +02:00
Daniel Rodriguez d68617eda1 Merge branch 'ent-4265-array-en-valor-min' into 'develop' 
Changed variable that modify min values

See merge request artica/pandorafms!2538
 2019-06-26 12:04:41 +02:00
Daniel Rodriguez 0ea5b7ff1b Merge branch 'ent-4196-Eliminar-funcionalidad-QR-Code-in-header' into 'develop' 
Removed option to show qr code in header - #4196

See merge request artica/pandorafms!2494
 2019-06-26 12:04:00 +02:00
Daniel Rodriguez 6976ba9c8e Merge branch 'ent-3800-mal-enrutamiento-discovery' into 'develop' 
Ent 3800 mal enrutamiento discovery

See merge request artica/pandorafms!2350
 2019-06-26 12:02:43 +02:00
Alejandro Fraguas 7224974520 Merge branch 'ent-3980-7966-aws-multicuenta-y-mejora-monitorizacion' into 'develop' 
first steps credential store

See merge request artica/pandorafms!2523
 2019-06-26 11:21:49 +02:00
fbsanchez f66e5b5ef8 Fix class names to avoid addblock hide them 2019-06-26 11:11:21 +02:00
fbsanchez 4754e20784 Merge remote-tracking branch 'origin/develop' into ent-3980-7966-aws-multicuenta-y-mejora-monitorizacion 2019-06-26 09:52:22 +02:00
Daniel Rodriguez 61e07abf3a Merge branch 'ent-4238-eventos-csv-e-historico' into 'develop' 
Ent 4238 eventos csv e historico

See merge request artica/pandorafms!2515
 2019-06-25 18:33:49 +02:00
fbsanchez e1bf12a1fb Credential store 2019-06-25 18:21:23 +02:00
fbsanchez 22d936d4f3 credential store some js controls 2019-06-25 16:43:38 +02:00
Tatiana Llorente 04d3f315b0 Added selector for all or common modules- #2140 2019-06-25 15:19:40 +02:00
Luis Calvo f69fea81c2 Added satellite remote conficg check in snmp wizard 2019-06-25 14:28:33 +02:00
Daniel Rodriguez 63eca254f6 Merge branch 'ent-3888-cambio-titulo-plugin-creation' into 'develop' 
changed title plugin creation to plugin registration

See merge request artica/pandorafms!2358
 2019-06-25 14:25:34 +02:00
fbsanchez 1966c81f2d Merge remote-tracking branch 'origin/develop' into ent-4238-eventos-csv-e-historico 2019-06-25 14:10:32 +02:00
Jose Gonzalez afd72eff42 Changed variable that modify min values 2019-06-25 13:37:44 +02:00
Daniel Rodriguez 2ab7e26d07 Merge branch 'ent-3821-Option-servers-operator-read' into 'develop' 
Deleted Servers menu option for operator(read)

See merge request artica/pandorafms!2328
 2019-06-25 13:09:23 +02:00
Daniel Rodriguez c5be8e55ae Merge branch 'ent-3807-html-special-chars-conversion' into 'develop' 
Ent 3807 html special chars conversion

See merge request artica/pandorafms!2320
 2019-06-25 12:19:01 +02:00
Daniel Rodriguez 569bfa2329 Merge branch 'ent-3697-no-hay-opcion-a-ver-todos-los-grupos-con-permisos-correctos' into 'develop' 
Pending Q&A

See merge request artica/pandorafms!2262
 2019-06-25 12:06:07 +02:00
fbsanchez 2a95fbb87a Merge remote-tracking branch 'origin/develop' into ent-3980-7966-aws-multicuenta-y-mejora-monitorizacion 2019-06-24 19:58:33 +02:00
fbsanchez c1ac6b7ed6 mini_severity virtual column added 2019-06-24 19:23:41 +02:00
marcos.alconada 280459dc1a Show new filters for group events reports 2019-06-24 17:28:46 +02:00
Alejandro Fraguas ce1231eae6 Merge branch 'ent-3916-bulk-operation-alerts-no-entuentra-alertas' into 'develop' 
Added option in massive delete alerts to show alerts on disabled modules

See merge request artica/pandorafms!2396
 2019-06-24 09:55:44 +02:00
fbsanchez 38f72bed8d AWS multi account 2019-06-22 13:11:35 +02:00
fbsanchez c11cd556ce WIP: AWS CS controller 2019-06-22 01:10:05 +02:00
fbsanchez 5658b98f0b intuitive credential store 2019-06-21 23:51:22 +02:00
fbsanchez e9ef9b64a3 credential_store 2019-06-21 19:34:47 +02:00
fbsanchez 6682bad19f first steps credential store 2019-06-21 12:03:25 +02:00
fbsanchez 9fa9a346ca Merge remote-tracking branch 'origin/develop' into ent-4238-eventos-csv-e-historico 2019-06-20 19:23:39 +02:00
fbsanchez 8671c7c88c events qa adjustments 2019-06-20 19:23:13 +02:00
Daniel Rodriguez 265202f1ed Merge branch 'ent-4136-button-styles' into 'develop' 
Review 1

See merge request artica/pandorafms!2470
 2019-06-20 16:35:12 +02:00
Alejandro Fraguas 4660ca286f Merge branch 'ent-4225-No-se-pueden-crear-componentes-de-red-en-la-meta' into 'develop' 
Ent 4225 no se pueden crear componentes de red en la meta

See merge request artica/pandorafms!2516
 2019-06-20 11:41:21 +02:00
Tatiana Llorente c084adfa27 Add module filter by text -#2094 2019-06-20 09:31:36 +02:00
Tatiana Llorente 988eb2e257 Add module filter by text -#2094 2019-06-19 17:36:55 +02:00
alejandro-campos 45d544ca5d remove typo error in commit 2019-06-19 15:14:41 +02:00
alejandro-campos 5503abc8e1 fix bug in metaconsoles network component creation 2019-06-19 15:12:17 +02:00
fbsanchez 24025ebb74 Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-18 17:48:03 +02:00
fbsanchez d290b91b28 RC1 event viewer v2 2019-06-18 16:07:53 +02:00
Alejandro Fraguas 10b337f713 Merge branch 'ent-4001-se-pueden-crear-reportes-de-tipo-general-sin-nombre' into 'develop' 
Add javascript for insert name to reports

See merge request artica/pandorafms!2424
 2019-06-18 13:53:52 +02:00
Daniel Rodriguez c68f2ada94 Merge branch 'ent-4085-no-se-muestra-lista-de-modulos-con-licencia-invalida' into 'develop' 
Fixed module_manager with Agent limit surpassed or license expired

See merge request artica/pandorafms!2475
 2019-06-18 13:02:43 +02:00
Daniel Maya 8f2feac676 Added DESTDIR in license.php 2019-06-18 11:35:59 +02:00
Luis Calvo 9bdf048fae Fixed and refactored duplicated functions SNMP Browser not showing v3 paramethers 2019-06-17 16:39:27 +02:00
Daniel Rodriguez 2401ac5c6e Merge branch 'ent-4138-7696-Tipo-erróneo-módulos-Ifoperstatus-desde-satélite' into 'develop' 
Change module type ifOperStatus on Interface Wizard

See merge request artica/pandorafms!2473
 2019-06-17 16:34:14 +02:00
fbsanchez 132076198d minor fixes and event ACL - groups 2019-06-14 13:20:34 +02:00
Daniel Rodriguez 4362bf3131 Merge branch 'ent-3429-event-report-options-saving' into 'develop' 
Added missing options parameters

See merge request artica/pandorafms!2173
 2019-06-14 13:19:43 +02:00
Daniel Rodriguez 5c7b45173b Merge branch 'ent-4185-Problema-editar-item-availability-en-report-metaconsole' into 'develop' 
fix bug in item edition in metaconsole

See merge request artica/pandorafms!2500
 2019-06-14 13:05:27 +02:00
alejandro-campos 8554baef20 fix bug in item edition in metaconsole 2019-06-13 11:11:39 +02:00
Tatiana Llorente af62bb1ae3 Fixed visual bug in discovery vmware - #4199 2019-06-12 16:47:53 +02:00
Tatiana Llorente 7d54a37e13 Fixed visual bug in discovery vmware - #4199 2019-06-12 16:44:09 +02:00
Daniel Rodriguez f399023d46 Merge branch 'ent-3644-bug-redireccion-de-static-graph' into 'develop' 
Solucionado pantalla en blanco

See merge request artica/pandorafms!2269
 2019-06-12 14:25:58 +02:00
Alejandro Fraguas b930588f84 Merge branch 'ent-3892-bug-en-bulk-operations-de-plugins' into 'develop' 
Ent 3892 bug en bulk operations de plugins

See merge request artica/pandorafms!2389
 2019-06-12 13:54:09 +02:00
fbsanchez 4bb300889d Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-12 13:17:36 +02:00
Alejandro Fraguas 1305e267de Merge branch 'ent-3437-Guardar-user-password-modulos-WMI' into 'develop' 
Remove autocomplete user and password in the form to create wmi modules - #3437

See merge request artica/pandorafms!2485
 2019-06-12 13:03:56 +02:00
marcos.alconada c1d1c23a4f Merge remote-tracking branch 'origin/develop' into ent-3644-bug-redireccion-de-static-graph 2019-06-12 12:37:52 +02:00
marcos.alconada 608f079ca0 now you need put an agent or visual console, else you cant create or update a Static Grap 2019-06-12 12:36:56 +02:00
Alejandro Fraguas fdce139f84 Merge branch 'ent-4186-Error-en-add-map-connection-al-crear-mapas-gis' into 'develop' 
fix bug when adding connection maps in gis map builder

See merge request artica/pandorafms!2490
 2019-06-11 18:01:54 +02:00
Tatiana Llorente e4139874dd Removed option to show qr code in header - #4196 2019-06-11 18:00:41 +02:00
Alejandro Campos cc9a7553bc Merge branch 'develop' into 'ent-3300-Error-borrado-masivo-de-informes' 
# Conflicts:
#   pandora_console/godmode/reporting/reporting_builder.php
 2019-06-11 16:18:29 +02:00
alejandro-campos 577ddef8b3 fix bug when adding connection maps in gis map builder 2019-06-10 17:04:36 +02:00
fbsanchez ef3d299d58 wip event view 2019-06-10 15:18:35 +02:00
alejandro-campos 89ff40e2b9 moved mail server setup to general setup 2019-06-10 09:43:27 +02:00
fbsanchez 23e6711f09 WIP Events 2019-06-06 17:50:47 +02:00
Tatiana Llorente 4f9f9e65c2 Remove autocomplete user and password in the form to create wmi modules - #3437 2019-06-06 16:51:11 +02:00
Luis Calvo c6d1bb6533 Fixed fields not saving in event reports 2019-06-06 10:33:46 +02:00
Luis Calvo 3475684cdc Merge remote-tracking branch 'origin/develop' into ent-3429-event-report-options-saving 2019-06-05 09:36:57 +02:00
fbsanchez a1be1e7332 styles review 2019-06-04 22:16:58 +02:00
fbsanchez 2f5265fcbb color updates 2019-06-04 14:08:07 +02:00
fbsanchez c741020538 styles review 2019-06-04 13:57:55 +02:00
fbsanchez 974db824a8 style review 2019-06-03 19:13:29 +02:00
Daniel Rodriguez efd7abfc66 Merge branch 'ent-3581-proyectos-bug-deshabilitar-agente-software' into 'develop' 
ticket resolved

See merge request artica/pandorafms!2207
 2019-06-03 18:16:32 +02:00
fbsanchez 31257c02a4 style review 2019-06-03 14:50:22 +02:00
fbsanchez 7a09a80ace style review 2019-06-03 14:30:23 +02:00
fbsanchez b4dcf4a6f1 style review 2019-06-03 11:55:56 +02:00
fbsanchez ddf3b7a258 Review 1 2019-06-03 11:21:44 +02:00
fbsanchez 9de5dadbf2 style review 2019-06-03 11:16:51 +02:00
fbsanchez 88b0802472 style review 2019-06-03 10:46:52 +02:00
ismael.moreno 1aa6d8c298 Change module type ifOperStatus on Interface Wizard 2019-05-31 10:39:48 +02:00
fbsanchez 69054571ab Style review 2019-05-31 09:50:59 +02:00
fbsanchez 40cca5e1e3 BIG style change, erased all important flags 2019-05-30 18:21:13 +02:00
Daniel Rodriguez 16d34bf584 Merge branch 'ent-3643-mensaje-duplicado-con-info-de-la-db_history-en-performance' into 'develop' 
ticket resolved, duplicated sentece

See merge request artica/pandorafms!2239
 2019-05-30 15:33:27 +02:00
fbsanchez 94153b823f Help links 2019-05-30 11:25:09 +02:00
fbsanchez 30320b7897 Fixed login button style and removed help icons from agent_management 2019-05-30 11:12:37 +02:00
Alejandro Fraguas bc279e99b0 Merge branch 'fix/styles' into 'develop' 
Fix/styles

See merge request artica/pandorafms!2461
 2019-05-29 18:31:43 +02:00
fbsanchez f16f35ad10 Changes styles 2019-05-29 17:49:09 +02:00
fbsanchez 3c730fbedf BC updated 2019-05-29 17:10:21 +02:00
fbsanchez 47c9220cbb clippy positions and control overflow 2019-05-29 17:02:01 +02:00
fbsanchez 8c0bfd72a8 avoid icon overlap report view lsit 2019-05-29 16:52:38 +02:00
fbsanchez e9198af17c multiple changes 2019-05-29 16:45:53 +02:00
Alejandro Fraguas 2e3338b595 Merge branch 'ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual' into 'develop' 
Ent 3961 añadir caché para los elementos de la consola visual

See merge request artica/pandorafms!2443
 2019-05-29 15:48:45 +02:00
fbsanchez 4a42756ec6 group_management styles profiles 2019-05-29 15:44:51 +02:00
fbsanchez 5131c24772 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-29 12:24:28 +02:00
fbsanchez 487ff53825 Min. fields lenght headers 2019-05-29 12:09:45 +02:00
Daniel Rodriguez ee7cd68d39 Merge branch 'ent-1668-update-manager' into 'develop' 
UM register, UM newsletter flow improved

See merge request artica/pandorafms!2463
 2019-05-29 11:55:34 +02:00
fbsanchez c8649a8dc4 Styles 2019-05-29 11:21:57 +02:00
Daniel Maya 552467286c Merge branch 'develop' into 'ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual' 
# Conflicts:
#   pandora_console/extras/mr/28.sql
 2019-05-29 11:10:31 +02:00
Alejandro Fraguas c0763b86d2 Merge branch 'ent-3924-eHorus-settings' into 'develop' 
Ent 3924 e horus settings

See merge request artica/pandorafms!2417
 2019-05-29 10:51:59 +02:00
fbsanchez 32424ddae1 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-29 10:50:38 +02:00
fbsanchez 5e3ca1664f UM unregister restriction, only admins 2019-05-29 10:37:02 +02:00
fbsanchez 4a60dbe415 Unregistration form 2019-05-29 10:27:28 +02:00
fbsanchez 28555e09de Unregistration form 2019-05-29 10:26:53 +02:00
Daniel Rodriguez 9096444f8f Merge branch 'ent-1480-4731-deshabilitado-de-modulos-agencia_aadcm' into 'develop' 
Do not add disabled modules to the execution queue.

See merge request artica/pandorafms!2456
 2019-05-29 09:53:38 +02:00
Daniel Barbero Martin c35cb56699 fixed errors 2019-05-29 08:50:46 +02:00
Alejandro Gallardo Escobar f5d5cbf5b8 VC item cache improvements. 
-Added a default value to the configuration.
-Changed the control to edit the cache expiration.
- Added the cache to more items.
 2019-05-28 18:34:07 +02:00
Luis Calvo 6fdd88ab65 Fixed errors on eHorus user level conf 2019-05-28 17:19:13 +02:00
Daniel Barbero Martin 3b943ae902 fixed errors disabled/enabled module from list agents because not write in conf 2019-05-28 17:11:14 +02:00
fbsanchez 348f0c2a65 agent view styling 2019-05-28 13:27:17 +02:00
Luis Calvo 5966367f8f eHorus user level login conf added in user editor 2019-05-28 13:14:42 +02:00
fbsanchez 9a12b34847 Updates styling 2019-05-28 12:13:29 +02:00
fbsanchez 92ca217800 minor fixes in style view tasklist 2019-05-28 10:57:36 +02:00
fbsanchez e338d5ba95 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-27 22:40:11 +02:00
fbsanchez f1499082fa agent view rebuilt 2019-05-27 21:30:46 +02:00