Commit Graph

16425 Commits

Author SHA1 Message Date
vgilc d430375826 Merge branch '1413-CARREFOUR-Añadir-macros-en-los-label-de-las-consolas-visuales' into 'develop'
Add visual console macros - #1413

See merge request artica/pandorafms!1019
2017-11-15 09:40:38 +01:00
vgilc fbbd029812 Merge branch 'ent-1493-problemas-con-las-entidades-html-al-crear-eventos-con-el-pandora_server' into 'develop'
Added safe_output to server events

See merge request artica/pandorafms!970
2017-11-15 09:40:10 +01:00
vgilc 1789287673 Merge branch '1539-new-flow-in-networkmaps-when-creates-a-map-dev' into 'develop'
Changed flow

See merge request artica/pandorafms!1031
2017-11-15 09:39:31 +01:00
vgilc 7354ae534b Merge branch 'snmp-browser-safe-output' into 'develop'
Remove HTML entities from the SNMP community.

See merge request artica/pandorafms!1037
2017-11-15 09:36:20 +01:00
vgilc 55ac22055b Merge branch '1457-select-position-and-z-scale-in-networkmaps-dev' into 'develop'
Added the options in networkmap editor

See merge request artica/pandorafms!997
2017-11-15 09:35:19 +01:00
Arturo Gonzalez 4db2493cdd Merge branch 'develop' into 1464-error-in-networkmap-with-weird-agent-names-dev
Conflicts:
	pandora_console/include/functions_networkmap.php
2017-11-15 09:34:19 +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 4cafe69184 Merge branch 'optimizar-vista-de-eventos' into 'develop'
[Console > Events view] Removed the events graph to improve ~75% the render time

See merge request artica/pandorafms!1002
2017-11-15 09:30:38 +01:00
vgilc 90b99c491a Merge branch '1509-calculo-de-estado-en-consola-visual-mediante-el-peso-de-su-padre-dev' into 'develop'
Added new system of calculate status if user set a parent weight

See merge request artica/pandorafms!1043
2017-11-15 09:28:10 +01:00
vgilc 4e09334718 Merge branch '1592-acceso-con-ldap-sin-establecer-pass-dev' into 'develop'
1592 acceso con ldap sin establecer pass dev

See merge request artica/pandorafms!1067
2017-11-15 09:27:39 +01:00
artica e793e3fd4e Auto-updated build strings. 2017-11-15 00:01:16 +01:00
fermin831 ae94be7779 Delete orig repo files 2017-11-14 19:37:00 +01:00
fbsanchez 0ea2475d60 minor fix pandora.flot.js 2017-11-14 19:02:13 +01:00
fermin831 78ef64ead2 Added resize functionality to flot graphs and fix overview in container graphs 2017-11-14 18:44:29 +01:00
Arturo Gonzalez 75cb2a668f Added a lot of changes to save or not user password, only ldap 2017-11-14 16:20:26 +01:00
fbsanchez 722bc86381 Opensource plugins added to pandorafms 2017-11-14 15:17:27 +01:00
enriquecd 36c3f1fef6 Change group items url links in metaconsole - #1253 2017-11-14 13:51:33 +01:00
danielmaya 31d1f80a12 Fixed creating network components by snmpwalk 2017-11-14 13:31:39 +01:00
Arturo Gonzalez 8a1ba7130f Added restriction to no pass token 2017-11-14 13:11:11 +01:00
Arturo Gonzalez efa762626b Changed text to new token 2017-11-14 12:47:23 +01:00
Arturo Gonzalez 861e112cec Added token to pandora auth conf 2017-11-14 12:36:32 +01:00
fermin831 ff58a171e9 Fixed non interactive status graphs 2017-11-14 12:20:28 +01:00
enriquecd 089a0f94ea Change texts in pandora - #1257 2017-11-14 11:37:49 +01:00
fbsanchez 958ef2bd38 Merge branch 'develop' into 1278-extension-vmware-ext-4456-y-4479
Added max/min thresholds to hbar graphs
2017-11-14 10:49:15 +01:00
vgilc 6a71b9a359 Merge branch 'MR-8-dev' into 'develop'
Changed MR

See merge request artica/pandorafms!1061
2017-11-14 10:47:39 +01:00
danielmaya e6d5adbf22 Changed MR 2017-11-14 10:38:50 +01:00
danielmaya 16eaf31c70 Added Autodisable mode in bulk operation 2017-11-14 10:21:55 +01:00
vgilc 0f34ff8292 Merge branch '1416-cambios-visuales-en-la-grafica-de-barras-en-consola-visual-dev' into 'develop'
Added height to bars graph

See merge request artica/pandorafms!1059
2017-11-14 09:03:03 +01:00
vgilc c65841938a Merge branch '182-fallo-instalador-pwrd' into 'develop'
Fixed install_pwrd (added logrotate)

Closes #182

See merge request artica/pandorafms!1058
2017-11-14 08:59:01 +01:00
Arturo Gonzalez 274c551671 Added height to bars graph 2017-11-14 08:50:12 +01:00
artica 69aff8a420 Auto-updated build strings. 2017-11-14 00:01:10 +01:00
fbsanchez d60f35e083 Fixed install_pwrd (added logrotate) 2017-11-13 19:12:56 +01:00
enriquecd 2f9f2ddf90 Metaconsole synchronization for api - #979 2017-11-13 16:37:08 +01:00
vgilc fa82e0317a Merge branch '1378-cambios-visuales-en-la-grafica-de-donut-en-consola-visual-dev' into 'develop'
Added visual changes to donut graph

See merge request artica/pandorafms!1056
2017-11-13 13:02:52 +01:00
Arturo Gonzalez 833983e34e Added visual changes to donut graph 2017-11-13 12:54:28 +01:00
danielmaya 14fe06e536 Fixed pagination errors with free search 2017-11-13 12:07:53 +01:00
Alejandro Gallardo Escobar 47cf03950a [Console] Changed the authentication method of the eHorus integration 2017-11-13 12:03:01 +01:00
Alejandro Gallardo Escobar b38c557491 [Console] Updated the eHorus client 2017-11-13 12:02:01 +01:00
Alejandro Gallardo Escobar d0ec4bb4bc [Console] Changed the link to the eHorus page into the setup 2017-11-13 11:32:14 +01:00
fermin831 6c519ff08a Removed last value on visual console boolean static graphs 2017-11-13 11:13:42 +01:00
vgilc 3493b9c15c Revert "code backup"
This reverts commit b9851a3a71
2017-11-13 10:21:38 +01:00
vgilc 86a5599aad Revert "Fixed traces"
This reverts commit 173efae22d
2017-11-13 10:20:58 +01:00
vgilc 319db7709a Merge branch '1416-grafica-de-barras-en-consola-visual-dev' into 'develop'
Added changes from donut graph

See merge request artica/pandorafms!1052
2017-11-13 10:20:00 +01:00
Arturo Gonzalez 49df1e448a Added changes from donut graph 2017-11-13 09:59:00 +01:00
vgilc 67373e39ac Merge branch '1378-grafica-donut-en-consola-visual-dev' into 'develop'
1378 grafica donut en consola visual dev

See merge request artica/pandorafms!1051
2017-11-13 09:39:43 +01:00
Arturo Gonzalez 110945bccf Added the last change to load string modules 2017-11-13 09:35:24 +01:00
vgilc 95ab2701c7 Merge branch '1550-Gráfica-de-eventos-24h-de-vista-de-agente-muy-pequeña' into 'develop'
Change agent events bar height - #1550

See merge request artica/pandorafms!1028
2017-11-13 08:47:13 +01:00
artica 301795af83 Auto-updated build strings. 2017-11-13 00:01:08 +01:00
artica 2e6e46c10c Auto-updated build strings. 2017-11-12 00:01:08 +01:00
artica b8e6d7927e Auto-updated build strings. 2017-11-11 00:01:10 +01:00