Commit Graph

882 Commits

Author SHA1 Message Date
danielmaya 87e2f4f3f9 Fixed filter in gis maps 2017-12-04 11:41:52 +01:00
vgilc 75c8b1ae8f Merge branch '1537-errores-al-reiniciar-el-mapa-de-red-dev' into 'develop'
Added fix to reset map function

See merge request artica/pandorafms!1140
2017-12-01 09:31:21 +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
Arturo Gonzalez 92d054695d Added fix to reset map function 2017-11-30 16:00:32 +01:00
vgilc 6ff9eb054c Merge branch '1083-linea-de-color-cuando-uno-de-los-modulos-de-la-relacion-no-esta-bien-dev' into 'develop'
Added link color

See merge request artica/pandorafms!1049
2017-11-29 13:28:17 +01:00
vgilc 7beb05f8db Merge branch '1369-interface-graphs-when-interface-is-not-init-in-networkmaps-dev' into 'develop'
Fixed filter to show interface graph or not

See merge request artica/pandorafms!957
2017-11-29 13:27:39 +01:00
vgilc 8e71f632e8 Merge branch '1537-new-option-in-networkmaps-to-reset-the-map-dev' into 'develop'
Added new option to networkmap, reset

See merge request artica/pandorafms!1035
2017-11-29 13:27:00 +01:00
Arturo Gonzalez 21bbfb557b Added lost code 2017-11-27 15:00:59 +01:00
vgilc 62ffb46763 Merge branch '1471-fallo-enlace-publico-dashboards' into 'develop'
Fixed public dashboard permissions

See merge request artica/pandorafms!1004
2017-11-23 09:03:07 +01:00
fermin831 0f814c0b63 Added public dashboard authentication to some components 2017-11-21 16:59:49 +01:00
Arturo Gonzalez fa50ac5cdf Added link color 2017-11-10 11:05:53 +01:00
Arturo Gonzalez 7b956e8ef6 Added new option to networkmap, reset 2017-11-07 15:05:31 +01:00
vgilc 2d87172558 Merge branch 'vulnerabilidad-en-consola' into 'develop'
Resolve: Vulnerabilidad en consola

See merge request artica/pandorafms!1020
2017-11-06 17:41:45 +01:00
Alejandro Gallardo Escobar ac70caac71 [Console] Fixed XSS vulnerabilities 2017-11-06 15:20:24 +01:00
danielmaya 7c78cd2a34 Fixed password entities in snmp walk 2017-11-03 13:18:00 +01:00
Arturo Gonzalez 0b63fc22f9 Added lost code in limbo, come back to the heaven darling 2017-10-26 13:28:08 +02:00
Arturo Gonzalez b5faf010b0 Fixed filter to show interface graph or not 2017-10-24 10:07:07 +02:00
daniel a9a817df79 fixed error d3 in firefox 2017-10-23 14:05:21 +02:00
vgilc d181edc471 Merge branch '393-Feature-para-mostrar-los-timesticks-en-Dias-Horas-Minutos-Seg-dev' into 'develop'
New feature. Dynamic units

See merge request !818
2017-10-04 17:41:37 +02:00
Arturo Gonzalez 65bfedf404 Fixed id of pandora node 2017-10-03 10:32:22 +02:00
Daniel Maya d7f3e1ecde New feature. Dynamic units 2017-09-14 12:10:41 +02:00
vgilc 6bf85a0789 Merge branch '1070-disable-interface-links-in-fictional-nodes-dev' into 'develop'
Removed interface link function in fictional nodes

See merge request !644
2017-09-11 09:35:35 +02:00
daniel d74a3f74b4 Merge branch 'develop' into 1056-pandora-wux-grid-server 2017-09-01 10:51:54 +02:00
daniel fe2a2a36e8 fixed minor errors in WUX 2017-08-30 16:09:11 +02:00
daniel b078d48918 fixed errors in wux 2017-08-30 09:47:57 +02:00
Arturo Gonzalez 88834d6ea1 Added a first version of snmp browser with a proxy server 2017-08-24 16:26:58 +02:00
Arturo Gonzalez ffed7359bc Added execution in server proxy to event response commands 2017-08-24 13:25:03 +02:00
daniel c29d8a4fdb Revert "merge develop"
This reverts commit 8232911713, reversing
changes made to f5da86ac0a.
2017-08-23 09:35:17 +02:00
daniel 8232911713 merge develop 2017-08-22 18:39:34 +02:00
daniel 7e649b78b3 wux new form 2017-08-09 11:29:16 +02:00
Arturo Gonzalez 6b30accd11 Added new function to redirect with dbclick when fictinal have a map link 2017-07-25 15:38:28 +02:00
Enrique Camargo 0ff56b0856 Update openlayers.pandora.js 2017-07-13 12:07:53 +02:00
enriquecd c9219107bf Hold mark labels font size when autorefresh and fix drag map font size bug - #1115 2017-07-12 18:49:39 +02:00
Arturo Gonzalez ba829e78ce Removed interface link function in fictional nodes 2017-07-05 09:07:55 +02:00
Arturo Gonzalez 474957249b Added correct button declaration 2017-06-07 10:29:01 +02:00
enriquecd ced8050317 Decode html entities in module plugin selector for edit bulk operation - #959 2017-06-05 12:50:22 +02:00
vgilc 3aa4fc7315 Merge branch '943-header-refresh-no-stops-in-events-view-dev' into 'develop'
Removed old code that breaks the autorefresh pause

See merge request !538
2017-06-01 09:32:42 +02:00
vgilc 1d6747c353 Merge branch '807-module-massive-operations-with-tag-filter-dev' into 'develop'
807 module massive operations with tag filter dev

See merge request !476
2017-05-31 17:42:09 +02:00
Arturo Gonzalez 4ba94f065e Removed old code that breaks the autorefresh pause 2017-05-31 16:40:10 +02:00
artu30 a78b5cc60d Merge branch 'develop' into '777-translations-dev'
# Conflicts:
#   pandora_console/godmode/update_manager/update_manager.offline.php
#   pandora_console/include/functions_update_manager.php
2017-05-22 17:51:21 +02:00
artu30 b5d3893c41 Merge branch 'develop' into '836-fixed-margin-top-images-in-vc-lines-open-dev'
# Conflicts:
#   pandora_console/include/javascript/pandora_visual_console.js
2017-05-22 17:38:49 +02:00
Arturo Gonzalez f58a9151f7 Fixed bad merge, thx branches 2017-05-22 17:37:21 +02:00
Arturo Gonzalez 309e9e900e Added margin top value to images when have lines 2017-05-22 17:31:29 +02:00
vgilc 4cee2eaea8 Merge branch '836-bad-parents-line-position-in-visual-console-dev' into 'develop'
836 bad parents line position in visual console dev

See merge request !448
2017-05-17 17:48:53 +02:00
Arturo Gonzalez d49f1f9916 Added tags filter to mosule massive operations (agent selection first) 2017-05-17 10:41:30 +02:00
Arturo Gonzalez 0346b49f1e Fixed jquery request 2017-05-16 10:42:41 +02:00
Arturo Gonzalez 6f40069aa9 Added a new system to draw lines in visual console when element have an image 2017-05-09 17:29:17 +02:00
Arturo Gonzalez eb1dafe807 Fixed lines in visual console 2017-05-09 12:40:22 +02:00
Arturo Gonzalez ba312476e3 Changed help section in cascade protection help button and fixed help language. 2017-04-27 15:49:23 +02:00
Arturo Gonzalez 6aab4e60ae Added buttons text to translate them 2017-04-26 09:50:42 +02:00