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

17764 Commits

Author SHA1 Message Date
slerena 0520fba0f8 Merge branch '2330-No-funciona-seleccionar-todos-los-objetos-en-plantillas-de-módulos' into 'develop' 
Fixed checkbox select in manage_network_templates.php

See merge request artica/pandorafms!1516
 2018-06-25 19:02:48 +02:00
slerena 2284d6d3fa Merge branch 'ent-2320-pete-grupos-secundarios' into 'develop' 
Fixed secondary groups configuration in agent creation

See merge request artica/pandorafms!1545
 2018-06-25 19:01:58 +02:00
slerena 053f037d0d Merge branch '2312-No-funciona-búsqueda-en-consolas-visuales-dev' into 'develop' 
Changed permission AW for VR in visual console

See merge request artica/pandorafms!1537
 2018-06-25 19:01:21 +02:00
slerena 17cb7337f5 Merge branch '2300-Eventos-de-respuesta-personalizada' into 'develop' 
Fixed bug in ajax/events.php

See merge request artica/pandorafms!1561
 2018-06-25 19:00:58 +02:00
slerena 082e9c6185 Merge branch '1781-Animación-visual-para-ventanas-modales-de-ayuda-2' into 'develop' 
Add visual animation to popup modal windows - #1781

See merge request artica/pandorafms!1284
 2018-06-25 18:59:34 +02:00
slerena 99271a4822 Merge branch '1797-Menú-desplegable-de-gráficas-miniaturizado' into 'develop' 
fixed resize in stat_win.php

See merge request artica/pandorafms!1503
 2018-06-25 18:59:09 +02:00
slerena 8320e5cc53 Merge branch '2128-Botón-de-"Crear-complementos-de-red"-en-SNMP-browser' into 'develop' 
Fixed the online-style of submit

See merge request artica/pandorafms!1496
 2018-06-25 18:58:17 +02:00
slerena c0e63bd1a0 Merge branch '2346-Pequeño-fallo-Consola-VIsual' into 'develop' 
Fixed visual bug

See merge request artica/pandorafms!1566
 2018-06-25 18:57:13 +02:00
slerena 2576d32471 Merge branch '2341-Pequeño-fallo-visual-Real-time-Graph' into 'develop' 
Fixed bug in realtime_graphs.php

See merge request artica/pandorafms!1543
 2018-06-25 18:56:24 +02:00
slerena 79131b938e Merge branch '2410Opción-show-in-two-columns-en-informes' into 'develop' 
Deleted 'show in two columns' option

See merge request artica/pandorafms!1569
 2018-06-25 18:55:47 +02:00
slerena aa540614dd Merge branch 'ent-2409-Agregar-agentes-en-concreto-en-Mapas-Gis' into 'develop' 
Fixed add particular agents to GIS layers

See merge request artica/pandorafms!1568
 2018-06-25 18:55:17 +02:00
slerena b80dc2b1bb Merge branch 'ent-2404-agentes-repetidos-en-el-tree-view-en-los-grupos-secundarios' into 'develop' 
Fixed tree view meta secondary groups repeated agents

See merge request artica/pandorafms!1559
 2018-06-25 18:54:52 +02:00
slerena e2f9e25dd9 Merge branch '2396-fallo-acl-en-vista-de-cluster' into 'develop' 
Fixed bug in cluster view

See merge request artica/pandorafms!1571
 2018-06-25 18:54:26 +02:00
slerena 5d6a10a7a0 Merge branch 'ent-2388-TMB-operacion-masiva-de-eventos-en-proceso' into 'develop' 
Added in progres selected button to events view

See merge request artica/pandorafms!1565
 2018-06-25 18:54:00 +02:00
slerena dddde8fba1 Merge branch '2194-IDs-de-SO-en-Manage-agents' into 'develop' 
Fixed select in modificar_agente.php

See merge request artica/pandorafms!1520
 2018-06-25 18:52:38 +02:00
slerena 288a751417 Merge branch 'pandora_enterprise#2419' into 'develop' 
Added regex to LDAP advanced permissions

See merge request artica/pandorafms!1570
 2018-06-25 18:51:15 +02:00
daniel 7dc60b65a2 Merge remote-tracking branch 'origin/develop' into 2075-Proteccion_en_cascada_de_servicios 2018-06-25 15:46:36 +02:00
nramon 35d9082a1c Merge branch '2423-Se_toman_como_data_las_graficas_boleanas' into 'develop' 
fixed error in zoom graphs boolean

See merge request artica/pandorafms!1572
 2018-06-25 15:41:26 +02:00
daniel eaf5abd476 fixed keep alive bool type module 100 2018-06-25 15:35:12 +02:00
daniel 6be7881514 fixed error in zoom graphs boolean 2018-06-25 15:09:57 +02:00
daniel ff934e28fa fixed minor error 2018-06-25 15:09:01 +02:00
daniel 36293cba3a Revert "fixed error ingraph bool zoom" 
This reverts commit 1ca35be41e.
 2018-06-25 15:07:12 +02:00
daniel 1ca35be41e fixed error ingraph bool zoom 2018-06-25 15:05:07 +02:00
manuel.montes 6f25c229e3 Fixed bug in cluster view 2018-06-25 12:35:39 +02:00
daniel e39b03511d Merge remote-tracking branch 'origin/develop' into 2075-Proteccion_en_cascada_de_servicios 2018-06-25 08:29:45 +02:00
artica 17e5c39a67 Auto-updated build strings. 2018-06-25 00:01:24 +02:00
artica 5d4a4eebc4 Auto-updated build strings. 2018-06-24 00:01:25 +02:00
Kike 7ed5077c01 Added regex to LDAP advanced permissions 2018-06-23 14:24:32 +02:00
artica b467eea16b Auto-updated build strings. 2018-06-23 00:01:25 +02:00
daniel 92fbc86ed9 add cascade protection in services 2018-06-22 14:59:17 +02:00
fermin831 dcb73f844e Revert "Revert "Recover critical status the SNMPTrap on SNMP console actions"" 
This reverts commit 16cff75242.
 2018-06-22 13:37:36 +02:00
fermin831 2719cadc61 Revert "Fixed agents display on GIS maps" 
This reverts commit 6a53e924bb.
 2018-06-22 13:37:17 +02:00
manuel.montes 02822bcfd6 Deleted 'show in two columns' option 2018-06-22 13:36:38 +02:00
fermin831 e19f116637 Fixed add particular agents to GIS layers 2018-06-22 13:33:04 +02:00
fermin831 16cff75242 Revert "Recover critical status the SNMPTrap on SNMP console actions" 
This reverts commit 8ef8f31f67.
 2018-06-22 13:30:10 +02:00
fermin831 6a53e924bb Fixed agents display on GIS maps 2018-06-22 13:28:39 +02:00
artica 0a61a5f5d3 Auto-updated build strings. 2018-06-22 00:01:24 +02:00
fermin831 8ef8f31f67 Recover critical status the SNMPTrap on SNMP console actions 2018-06-21 19:27:33 +02:00
manuel.montes 09ed3fa7c3 Fixed visual bug 2018-06-21 14:21:22 +02:00
daniel 17b726d7a0 changes bd for mr, schema and migrate and update tocken mr 2018-06-21 14:15:27 +02:00
artica f40e3883ec Auto-updated build strings. 2018-06-21 00:01:26 +02:00
fermin831 288d2bafb6 Added in progres selected button to events view 2018-06-20 18:56:44 +02:00
fermin831 251c308d8c Fixed new servers (migration and autoprovision) icons 2018-06-20 18:31:52 +02:00
fermin831 1ccd7d1fd7 Modified set create_snmp_module to permit create remote_snmp_proc modules 2018-06-20 17:07:13 +02:00
nramon ebfbc59055 Merge branch '2407-anadir_phantomjs_docker' into 'develop' 
add phantomjs to docker

See merge request artica/pandorafms!1562
 2018-06-20 16:08:43 +02:00
daniel e7cbd4604e add phantomjs to docker 2018-06-20 16:04:07 +02:00
artica c97530a4ee Updated version and build strings. 2018-06-20 15:19:39 +02:00
Ramon Novoa dc103988ae Fix the current enterprise package number. 2018-06-20 15:18:50 +02:00
Ramon Novoa 7a026bd1c0 Update the MR version. 2018-06-20 14:40:47 +02:00
manuel.montes 11dc746eca Fixed bug in ajax/events.php 2018-06-20 13:31:23 +02:00