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

3811 Commits

Author SHA1 Message Date
daniel c3bcb84293 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 2018-10-15 08:58:55 +02:00
vgilc f3c8b14b32 Merge branch '2457-Formulario-de-creacion-repetido' into 'develop' 
added check to prevent alert creation form from being printed in alert cluster for step 5

See merge request artica/pandorafms!1854
 2018-10-15 00:06:41 +02:00
alejandro-campos aa33522670 added check to prevent alert creation form from being printed in alert cluster for step 5 2018-10-11 15:22:36 +02:00
daniel 16be9488c8 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 
Conflicts:
	pandora_console/include/functions_graph.php
 2018-10-11 13:06:17 +02:00
daniel 1f56054f6c fixed changes php7 2018-10-11 12:57:48 +02:00
vgilc edadc60957 Merge branch '2737-Optimización-de-tags-dev' into 'develop' 
2737 optimización de tags dev

See merge request artica/pandorafms!1815
 2018-10-11 12:14:10 +02:00
fermin831 2693bbe209 Merge remote-tracking branch 'origin/develop' into 2737-Optimización-de-tags-dev 
Conflicts:
	pandora_console/godmode/massive/massive_delete_modules.php
	pandora_console/operation/agentes/ver_agente.php
 2018-10-10 19:39:27 +02:00
alejandro-campos 7fcbc6ece9 added check whto skip alert creation table printing in cluster alert only when step is 5 2018-10-10 18:54:46 +02:00
fermin831 de10de03f7 [Tags performance] Fixed edit and delete massive delete and edit modules in bulk selecting modules first 2018-10-10 17:42:33 +02:00
danielmaya 8339eecacc Merge branch '2737-Optimización-de-tags-dev' of https://192.168.50.5:8081/artica/pandorafms into 2737-Optimización-de-tags-dev 2018-10-10 16:57:15 +02:00
danielmaya 4558c909ef Changed source filter in event list 2018-10-10 16:57:04 +02:00
daniel fd13e33259 fixed minor error input max-length in plugin network component 2018-10-09 10:51:03 +02:00
Fermin 052d888ac4 Fixed a minor warning 2018-10-08 18:53:21 +02:00
danielmaya f952d5c70e tags_get_acl_tags revision 2018-10-08 17:45:26 +02:00
Fermin 198eb1bbc3 [Tags performance] Fixed parent module select 2018-10-05 10:12:40 +02:00
danielmaya 5fd76bf8cb Merge branch '2737-Optimización-de-tags-dev' of https://192.168.50.5:8081/artica/pandorafms into 2737-Optimización-de-tags-dev 2018-10-05 09:42:09 +02:00
danielmaya e8621e54e5 Updated tags optimization 2018-10-05 09:40:08 +02:00
Fermin 1278f03fd9 [Tags performance] agents_get_modules misc checks 2018-10-04 19:08:01 +02:00
samucarc 530017a79d Eliminadas entidades html de vista de auditoria 2018-10-04 17:02:38 +02:00
vgilc 21c9a7ee4a Merge branch '2127-Paginacion-en-busqueda-de-modulos' into 'develop' 
added hidden input to policy modules filters form

See merge request artica/pandorafms!1597
 2018-10-04 14:16:22 +02:00
daniel e2f7157545 fixed php7 2018-10-04 11:43:08 +02:00
fermin831 0ca13b8e98 Removed unused code 2018-10-03 15:04:45 +02:00
fermin831 7bd0615681 [Tags performace] Check visual consoles 2018-10-03 13:53:59 +02:00
fermin831 b277c71c44 [Tags performance] Check massive operations 2018-10-03 13:02:51 +02:00
fermin831 3d1e2e4c79 Removed unused code 2018-10-03 11:14:11 +02:00
fermin831 7ffeaaf50b [Tags performance] fermin revision 1 2018-10-03 11:13:52 +02:00
vgilc 46830a4cbe Merge branch '2778-Mostrar-valor-numerico-en-el-tooltip-dev' into 'develop' 
fixed issue with string data in visual map

See merge request artica/pandorafms!1811
 2018-10-03 09:31:02 +02:00
fermin831 28b879f058 [Tags performance] Added TODOS to revise agents_get_modules 2018-10-02 09:48:29 +02:00
vgilc 17b183a6eb Merge branch '1807-Entities-en-el-nombre-de-modulo' into 'develop' 
fixed minor bug: entities in module name

See merge request artica/pandorafms!1592
 2018-10-01 15:16:03 +02:00
vgilc a7421fc385 Merge branch '1805_Campo_vacio_Informes_personalizados' into 'develop' 
Added title in custom reports

See merge request artica/pandorafms!1632
 2018-10-01 15:15:38 +02:00
vgilc 4b583c7477 Merge branch '2303_Aparecen_entidades_html_en_las_vistas_de_auditoria' into 'develop' 
Removed html entities in the audit views

See merge request artica/pandorafms!1631
 2018-10-01 12:37:52 +02:00
vgilc e979de64b3 Merge branch '2454-Borrado-de-modulos-masivo-filtrado-por-no-inicilizado-elimina-todos-los-modulos-con-el-mismo-nombre' into 'develop' 
fixed bug in modules massive deletion to avoid deletion of modules with the same…

See merge request artica/pandorafms!1629
 2018-10-01 10:58:06 +02:00
vgilc 2dac09435a Merge branch '2040-Tags-en-operaciones-masivas' into 'develop' 
fixed bug on bulk delete and bulk update module operation

See merge request artica/pandorafms!1613
 2018-09-28 11:05:34 +02:00
vgilc d5b9ddec46 Merge branch '2457-No-permite-editar-ni-eliminar-alertas-de-cluster' into 'develop' 
Added new funcionality to cluster alert configuration: update alert

See merge request artica/pandorafms!1634
 2018-09-28 10:50:44 +02:00
vgilc 429c670743 Merge branch '2639-Visualizacion-campo-personalizado-eventos' into 'develop' 
Fixed bug in Fields Selected (Custom Events)

See merge request artica/pandorafms!1704
 2018-09-28 10:30:05 +02:00
vgilc 796e7ee06f Merge branch '6338_Visualizacion_erronea_de_advertencia' into 'develop' 
Fixed visual error in module agent

See merge request artica/pandorafms!1705
 2018-09-28 10:23:54 +02:00
vgilc 6a6bae10b1 Merge branch 'ent-2782-ue-agente-software-en-modo-standby' into 'develop' 
Ent 2782 ue agente software en modo standby

See merge request artica/pandorafms!1800
 2018-09-28 10:04:12 +02:00
vgilc ddd799c926 Merge branch '2579-version-open-enterprise-borrado-de-modulo' into 'develop' 
added redirection after module deletion on agent modules view

See merge request artica/pandorafms!1663
 2018-09-28 10:01:57 +02:00
danielmaya 453fb3f67b TODO List 2018-09-27 13:30:32 +02:00
danielmaya 896ba6051b fixed issue with string data in visual map 2018-09-26 11:00:44 +02:00
fermin831 8fe3e1606f Fixed string (avoiding macaronic English) 2018-09-26 10:50:16 +02:00
fermin831 90bbd31b66 Added tip to disabled radiobutton in agent edition and massive operations 2018-09-25 16:00:37 +02:00
fermin831 823b32ac63 Added update standby token in massive operations 2018-09-24 17:32:58 +02:00
fermin831 9cf578e1f6 Update configuration files when disabled is modified on agents editing 2018-09-24 16:54:53 +02:00
Alejandro Gallardo Escobar 2c88d33709 Merge branch 'develop' into ent-2588-service-like-visual-console-status 2018-09-18 15:35:56 +02:00
Alejandro Gallardo Escobar e5ff2b956c Bugfixes 2018-09-18 15:33:14 +02:00
manuel.montes 65010d7080 Merge remote-tracking branch 'origin/develop' into 2497-Especificar-version-SNMP-en-tarea-de-reconocimiento-Lead-21487 
Conflicts:
	pandora_console/extras/mr/20.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb.sql
 2018-09-18 11:17:47 +02:00
manuel.montes 40bf163fed Disabled vlan vhen SNMP version is v3 2018-09-18 11:03:30 +02:00
daniel 0c853a83d1 add new tree view edition group 2018-09-18 09:28:22 +02:00
manuel.montes cfec231107 Especified SNMP version in recon task 2018-09-17 12:48:08 +02:00