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

1115 Commits

Author SHA1 Message Date
vgilc a69550f79e Merge branch 'fix-warnings-with-php72' into 'develop' 
Fixed warnings and some icons are not shown correctly with php7.2.

See merge request artica/pandorafms!1490
 2018-06-05 10:26:40 +02:00
vgilc e808150f6b Merge branch '2251-Advertencia-al-cambiar-nombre-de-modulo-de-tipo-interfaz' into 'develop' 
Show warning modal window when change snmp or satellite module name - #2251

See merge request artica/pandorafms!1480
 2018-06-04 10:18:44 +02:00
fermin831 a55b829aa1 Fixed a PHP warning 2018-06-01 12:36:34 +02:00
fermin831 88e060893a Merge branch 'develop' into 2106-intracom-rebranding 
Conflicts resolved:
	pandora_console/operation/events/events_rss.php
 2018-05-28 12:12:16 +02:00
fermin831 a54c074b11 [Rebranding] Added hide help on node 2018-05-25 10:29:40 +02:00
fermin831 43447bbee4 [Rebranding] Minor ended fixed 2018-05-23 18:19:24 +02:00
Alejandro Gallardo Escobar 9d558fb7cb Removed some duplicated html entities 2018-05-22 16:30:33 +02:00
Junichi Satoh cb10d6d4a4 Fixed warnings and some icons are not shown correctly with php7.2. 2018-05-22 20:18:49 +09:00
enriquecd deb1cebeca Show warning modal window when change snmp or satellite module name - #2251 2018-05-11 16:13:56 +02:00
fermin831 d663553e8d [Rebranding] Open godmode/agentes 2018-05-10 13:08:34 +02:00
vgilc 6eea48dccf Merge branch 'ent-2057-modulos-prediction-se-crean-en-otro-agente' into 'develop' 
Fixed module prediction agent creation

See merge request artica/pandorafms!1435
 2018-05-09 10:26:16 +02:00
enriquecd d92dc1a2b0 Change API and flags in cluster manager - #2007 2018-04-27 11:06:29 +02:00
enriquecd b4b6852e27 Change id_os number refence and add get_cluster status function in api and CLI - #2007 2018-04-23 13:52:16 +02:00
vgilc 5ee01aa70f Merge branch '2007-Monitorizacion-de-cluster-fase-2' into 'develop' 
Cluster monitoring 2 - #2007

See merge request artica/pandorafms!1378
 2018-04-20 10:31:57 +02:00
fermin831 fdc70572ff Fixed module prediction agent creation 2018-04-18 15:00:56 +02:00
fermin831 60f7a0ab79 Merge branch 'develop' into 2015-implementacion-de-grupos-secundarios 
Conflicts:
	pandora_console/include/class/Tree.class.php
 2018-04-10 09:29:14 +02:00
fermin831 88375a2460 [Secondary groups] Fixed some problems in agent view 2018-03-27 16:38:17 +02:00
fermin831 db16a797f3 [Secondary Groups] Assign secondary groups by AJAX on agent edit view 2018-03-22 13:34:15 +01:00
vgilc d5cd5963d7 Merge branch '2081-Enlace-de-ayuda-mal-en-edicion-de-agente' into 'develop' 
Help icon in module creator - #2081

See merge request artica/pandorafms!1388
 2018-03-22 10:10:49 +01:00
enriquecd f5e8d4f90f Help icon in module creator - #2081 2018-03-21 19:18:24 +01:00
fermin831 26da63610a [Secondary Groups] Change secondary groups from selected to non selected in agent edit view 2018-03-21 18:32:14 +01:00
fermin831 efe420edfb [Secondary groups] Added view in agent edition 2018-03-21 16:27:01 +01:00
enriquecd 8690aa908a Cluster monitoring 2 - #2007 2018-03-19 10:05:29 +01:00
fermin831 1001240cf4 [SNMP] Fixed translation of custom mibs, added custom description data and change style of OID details 2018-03-15 16:03:46 +01:00
KIKUCHI Koichiro 022eddf43f Make change of "modules selection mode" updates module list 2018-03-01 19:56:38 +09:00
enriquecd 1a50cdf950 Change web module options for curl commandos - #1903 2018-02-16 15:35:46 +01:00
daniel 615c61bfb2 fixed error acl perm PM in view agent 2018-02-12 11:14:04 +01:00
enriquecd ab24c3bf80 Merge branch 'develop' into 1571-Auditoría-del-sistema-información-de-los-cambios-4850-com1 
Conflicts:
	pandora_console/include/functions.php
	pandora_console/include/styles/pandora.css
 2018-02-06 10:46:59 +01:00
daniel 0d0b7ada48 Merge branch 'develop' into 1749-sistena-cache-de-acl-s-de-la-consola 
Conflicts:
	pandora_console/include/functions_users.php
 2018-01-30 17:56:30 +01:00
daniel ad0b463d13 fixed errors acl 2018-01-30 17:44:51 +01:00
danielmaya c7c31a308c Changed explode in wizard snmp interface explorer 2018-01-18 13:44:38 +01:00
enriquecd 52aaad1499 Fix POST HEADER error and post process string errors - #1574 2018-01-08 12:10:03 +01:00
daniel 955c183cd8 fixed error ip validate 2018-01-08 11:12:07 +01:00
enriquecd 26d115a84e Merge branch 'develop' into 1470-Editar-modulo-web-analysis 
Conflicts:
	pandora_console/include/functions_ui.php
 2017-12-21 14:37:55 +01:00
vgilc c8b8f147e9 Merge branch '1572-Descripción-de-interfaces-en-switch-dell-powerconnect-Wizard-SNMP-interfaces-dev' into 'develop' 
Fixed snmp interface wizard for switch dell powerconnect

See merge request artica/pandorafms!1094
 2017-12-21 10:47:31 +01:00
enriquecd 0473bda9b5 Fix os sorting in manage agents when use pagination - #1412 2017-12-14 17:28:33 +01:00
daniel 08797d9cc9 fixed minor error 2017-12-14 10:21:24 +01:00
danielmaya 6d4f460ef8 Fixed get oid 2017-12-05 12:13:38 +01:00
enriquecd a97c8dde6d Fix agent sinchronization from node to metaconsole when enable/disable and have same id_agent in their nodes - #1669 2017-12-04 13:50:13 +01:00
daniel a0bdab9b83 Merge branch 'develop' into 1483-Cuadro_de_umbrales 
Conflicts:
	pandora_console/godmode/agentes/module_manager_editor_common.php
	pandora_console/godmode/modules/manage_network_components_form_common.php
 2017-11-30 16:29:00 +01:00
vgilc 0e4c17cf1e Merge branch '1412-Filtro-por-más-campos-en-Manage-agents-2' into 'develop' 
Add new fields to filter in search input text and operative selector filter - #1412

See merge request artica/pandorafms!972
 2017-11-29 16:59:27 +01:00
vgilc 86051a861f Merge branch '1458-Error-al-actualizar-custom-fields' into 'develop' 
Not show error when only update custom fields in agents - #1458

See merge request artica/pandorafms!929
 2017-11-29 15:42:03 +01:00
enriquecd afd84ce74d Change system audit log extended info to table format with change info - #1571 2017-11-24 10:59:44 +01:00
fermin831 34da44f9fb Added cron help 2017-11-23 17:00:59 +01:00
vgilc 0de711e633 Merge branch '1486-4739-Aumentar-caja-donde-se-muestran-los-nombre-de-las-interfaces-en-el-SNMP-Interface-Wizard' into 'develop' 
Change width of snmp interface wizard select box - #1486

See merge request artica/pandorafms!962
 2017-11-22 10:13:16 +01:00
danielmaya 18ba88dae2 Fixed snmp interface wizard for switch dell powerconnect 2017-11-20 10:28:08 +01:00
enriquecd 213e8e6d18 Fix Run performance tests checkbox in web analysis module updater - #1470 2017-11-16 11:52:51 +01:00
vgilc b12d529578 Merge branch '1276-Cascade-protection-a-nivel-de-módulo-dev' into 'develop' 
1276 cascade protection a nivel de módulo dev

See merge request artica/pandorafms!933
 2017-11-15 09:31:05 +01:00
vgilc bbecd1af09 Merge branch '1534-No-se-inicializan-módulos-SNMPv3-con-caracteres-especiales-dev' into 'develop' 
Fixed password entities in snmp walk

See merge request artica/pandorafms!1014
 2017-11-03 13:49:40 +01:00
danielmaya 7c78cd2a34 Fixed password entities in snmp walk 2017-11-03 13:18:00 +01:00