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

304 Commits

Author SHA1 Message Date
Alejandro Fraguas 4c94956b91 Merge branch 'ent-3459-7439-vista-de-edit-item-report-template-muy-lenta-debido-a-query-no-optimizada' into 'develop' 
Fixed slow query in template item

See merge request artica/pandorafms!2151

Former-commit-id: db1f74b219dcac4180690d56310dcc2a11acd14d
 2019-02-14 16:15:01 +01:00
Ramon Novoa fa7f519d34 Merged from develop. 
Former-commit-id: 438c0bfa6cfa77ef0b75df02f3bce020122692b9
 2019-02-12 14:52:18 +01:00
Ramon Novoa 92e2262440 Merge remote-tracking branch 'origin/develop' into ent-3305-pandora-db-esta-reseteando-alertas-incorrectamente 
Former-commit-id: 1e778938d7fc1ac575e110503803d8f3ac6b6e83
 2019-02-07 11:18:15 +01:00
Daniel Maya 152d55fa8c Merge branch 'develop' into 'ent-3459-7439-vista-de-edit-item-report-template-muy-lenta-debido-a-query-no-optimizada' 
# Conflicts:
#   pandora_console/godmode/massive/massive_edit_modules.php

Former-commit-id: 6d14e617f32575291898c9ce1bebde1e8b212691
 2019-02-06 17:04:02 +01:00
Daniel Maya c1ee43a064 resolved conflicts 
Former-commit-id: 6934eb56d50cfaa16a978472de044cfe135e906a
 2019-02-06 17:00:15 +01:00
manuel.montes 0a94ac9eb0 Merge branch 'develop' into ent-3338-Bulk-operations-Module-operations 
Conflicts:
	pandora_console/godmode/massive/massive_operations.php


Former-commit-id: b673fb9521259653d6f0386e6d9ab5add276380f
 2019-02-04 11:00:50 +01:00
artica b3da2803a4 Changed the format of the .php files 
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
 2019-01-30 16:18:44 +01:00
Ramon Novoa 2626605030 Validate alerts at the time agents/modules are modified. 
Former-commit-id: de1f4d5bbf7abda60a99b3a9718727f73657be75
 2019-01-30 12:58:31 +01:00
Daniel Maya 0adf941008 Fixed slow query in template item 
Former-commit-id: 97c9abbd6a4c86bd3de4294e7012ded98ecb5ff1
 2019-01-29 15:44:34 +01:00
manuel.montes e8497bb80c Changed the order of actions 
Former-commit-id: ec733bfcf1705552f6257dc14c5a34e0a3e84e66
 2019-01-22 11:03:52 +01:00
daniel ac228a7fad fixed error in massive operation 
Former-commit-id: 691f3557d44c686645cfa634eab3630d060def33
 2018-12-28 12:14:17 +01:00
daniel 7e2fb25e27 fixed errors in massive operation edit modules 
Former-commit-id: 2d2fa21660369607e6c206d269b12d2041f74a1a
 2018-12-24 08:59:23 +01:00
samucarc 6b940d07d5 Fixed 
Former-commit-id: b22637cf04af8b09c8b274aa0f5a8d2f66e13f7c
 2018-12-13 13:25:37 +01:00
samucarc eab744f65d Fixed minor error 
Former-commit-id: 2af6e231aa20216a4601a8c1a03fa6828c989448
 2018-12-12 20:26:38 +01:00
alejandro-campos a2909db631 Revert "Eliminadas entidades html de vista de auditoria" 
This reverts commit 530017a79d.


Former-commit-id: 7318b00afab9bf394f8095a8193fa35c05e52787
 2018-12-10 13:42:29 +01:00
daniel c4eeb3cc76 fixed error edit modules in massive operation php7 error select 2018-11-02 10:18:33 +01:00
daniel 0978be9b51 fixed errors php7 2018-10-30 14:43:27 +01:00
danielmaya a1f28480ae Fixed force_type check in delete/edit modules in bulk 2018-10-23 15:46:48 +02:00
fermin831 14afe2ff88 Added message 'Please, select an agent first' 2018-10-17 12:35:11 +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
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
Fermin 052d888ac4 Fixed a minor warning 2018-10-08 18:53:21 +02:00
samucarc 530017a79d Eliminadas entidades html de vista de auditoria 2018-10-04 17:02:38 +02:00
fermin831 b277c71c44 [Tags performance] Check massive operations 2018-10-03 13:02:51 +02:00
fermin831 7ffeaaf50b [Tags performance] fermin revision 1 2018-10-03 11:13:52 +02:00
fermin831 28b879f058 [Tags performance] Added TODOS to revise agents_get_modules 2018-10-02 09:48:29 +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
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
danielmaya 8247df6d65 Fixed edit snmp modules in bulk 2018-07-27 10:42:45 +02:00
alejandro-campos e4b74cffc8 fixed bug in modules massive deletion to avoid deletion of modules with the same name in distinct agents regardless of their status when module status filter has been applied 2018-07-24 13:04:31 +02:00
alejandro-campos 213a59d26e fixed bug on bulk delete and bulk update module operation 2018-07-16 18:14:18 +02:00
daniel 85897315cd cascade protection services 2018-06-27 15:03:46 +02:00
daniel 76cd718262 add cps for agent, module, policies and bulk opertaion 2018-06-26 13:23:12 +02:00
vgilc 6152e93a9e Merge branch '1973-Entities-en-op-masivas-plugins' into 'develop' 
Implement function io_safe_output

See merge request artica/pandorafms!1499
 2018-06-05 09:44:00 +02:00
manuel.montes f0e7a59ae7 Implement function io_safe_output 2018-05-25 14:21:52 +02:00
fermin831 43447bbee4 [Rebranding] Minor ended fixed 2018-05-23 18:19:24 +02:00
danielmaya e4f24b2452 Fixed json in audit log 2018-04-05 16:57:26 +02:00
vgilc 7be55b4427 Merge branch '1735-Faltan-campos-en-edición-de-módulos-en-operaciones-masivas' into 'develop' 
Add new fileds to massive module edition - #1735

See merge request artica/pandorafms!1295
 2018-02-26 10:42:55 +01:00
danielmaya 32fa032faa Fixed unit in bulk operations 2018-02-14 12:41:32 +01:00
enriquecd 7f7916a18d Add new fileds to massive module edition - #1735 2018-02-13 12:29:55 +01:00
danielmaya 95c92efc6f Fixed disabled agent in bulk operations 2018-02-12 17:14:54 +01:00
vgilc bc6b660592 Merge branch '1674-Sincronizacion-de-agentes-inmediata-con-metaconsola-en-operación-masiva' into 'develop' 
Update metaconsole after agent bulk operations for update - #1674

See merge request artica/pandorafms!1174
 2018-01-29 13:29:40 +01:00
vgilc 34ccc01c7b Merge branch '1656-Group-recursion-no-funciona-correctamente-en-operaciones-masivas-dev' into 'develop' 
Fixed group recursion in bulk operation

See merge request artica/pandorafms!1133
 2018-01-29 12:52:35 +01:00
daniel d2bc062766 fixed errors extensions agent-modules and recursion groups 2018-01-05 10:29:46 +01:00
vgilc 97fc2dc4d1 Merge branch '1532-edición-de-módulos-a-través-de-operaciones-masivas-dev' into 'develop' 
Hide and show fields in edit modules bulk

See merge request artica/pandorafms!1102
 2017-12-21 10:47:53 +01:00
enriquecd 4ad0085602 Update metaconsole after agent bulk operations for update - #1674 2017-12-12 17:58:06 +01:00
danielmaya caa3539c4f Fixed group recursion in bulk operation 2017-11-29 15:54:00 +01:00